Skip to content

Commit

Permalink
css grid update
Browse files Browse the repository at this point in the history
  • Loading branch information
yankovalenko94 committed Aug 11, 2020
1 parent 290697c commit 2713c21
Show file tree
Hide file tree
Showing 1,575 changed files with 124,991 additions and 5 deletions.
2 changes: 2 additions & 0 deletions Grid_step_1/css/style.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Grid_step_1/css/style.min.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Grid_step_1/img/arabian-horse.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Grid_step_1/img/cat.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Grid_step_1/img/cherries.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Grid_step_1/img/fog.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Grid_step_1/img/kyrgyzstan.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Grid_step_1/img/mushroom.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Grid_step_1/img/switzerland.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 42 additions & 0 deletions Grid_step_1/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@500&display=swap" rel="stylesheet">
<link rel="stylesheet" href="css/style.min.css">
</head>
<body>
<div class="grid-container">
<div class="news-item">
<img src="img/cherries.jpg" alt="img" class="news-item__img">
<div class="news-item__descr">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation.</div>
</div>
<div class="news-item">
<img src="img/kyrgyzstan.jpg" alt="img" class="news-item__img">
<div class="news-item__descr">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation.</div>
</div>
<div class="news-item">
<img src="img/cat.jpg" alt="img" class="news-item__img">
<div class="news-item__descr">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation.</div>
</div>
<div class="news-item">
<img src="img/fog.jpg" alt="img" class="news-item__img">
<div class="news-item__descr">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation.</div>
</div>
<div class="news-item">
<img src="img/switzerland.jpg" alt="img" class="news-item__img">
<div class="news-item__descr">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation.</div>
</div>
<div class="news-item">
<img src="img/mushroom.jpg" alt="img" class="news-item__img">
<div class="news-item__descr">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation.</div>
</div>
<div class="news-item">
<img src="img/arabian-horse.jpg" alt="img" class="news-item__img">
<div class="news-item__descr">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation.</div>
</div>
</div>
</body>
</html>
28 changes: 28 additions & 0 deletions Grid_step_1/sass/style.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
* {
box-sizing: border-box;
margin: 0;
padding: 0;
font-family: 'Roboto', sans-serif;
}

.grid-container {
width: 1140px;
margin: 82px auto 0 auto;
display: grid;
grid-template-columns: repeat(4, 240px);
grid-template-rows: repeat(2, 260px);
grid-auto-rows: 260px;
gap: 60px;
}

.news-item {
&__img {
width: 100%;
}
&__descr {
margin-top: 15px;
font-weight: 500;
font-size: 14px;
line-height: 16px;
}
}
21 changes: 21 additions & 0 deletions Portfolio_step_1/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# dependencies
/node_modules

# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*
7 changes: 7 additions & 0 deletions Portfolio_step_1/dist/css/style.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2713c21

Please sign in to comment.