Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Frontend practice with catalog page using grid
Replace `<your_account>` with your Github username and copy the links to Pull Request description:
- [DEMO LINK](https://<your_account>.github.io/layout_catalog_grid/)
- [DEMO LINK](https://Kacper-Leman.github.io/layout_catalog_grid/)

> Follow [this instructions](https://github.com/mate-academy/layout_task-guideline#how-to-solve-the-layout-tasks-on-github)

Expand Down
19 changes: 10 additions & 9 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,35 +17,35 @@
</head>
<body>
<header class="header">
<a class="header__logo" href="">
<a class="header__logo" href="#moyo-logo">
<img src="./images/logo.png" alt="Moyo logo">
</a>

<nav class="nav">
<ul class="nav__list">
<li class="nav__item nav__item--is-active">
<a href="" class="nav__link">Apple</a>
<a href="#apple" class="nav__link">Apple</a>
</li>
<li class="nav__item">
<a href="" class="nav__link">Samsung</a>
<a href="#samsung" class="nav__link">Samsung</a>
</li>
<li class="nav__item">
<a href="" class="nav__link">Smartphones</a>
<a href="#smartphones" class="nav__link">Smartphones</a>
</li>
<li class="nav__item">
<a href="" class="nav__link">Laptops & computers</a>
<a href="#laptops" class="nav__link">Laptops & computers</a>
</li>
<li class="nav__item">
<a href="" class="nav__link">Gadgets</a>
<a href="#gadgets" class="nav__link">Gadgets</a>
</li>
<li class="nav__item">
<a href="" class="nav__link">Tablets</a>
<a href="#tablets" class="nav__link">Tablets</a>
</li>
<li class="nav__item">
<a href="" class="nav__link">Photo</a>
<a href="#photo" class="nav__link">Photo</a>
</li>
<li class="nav__item">
<a href="" class="nav__link">Video</a>
<a href="#video" class="nav__link">Video</a>
</li>
</ul>
</nav>
Expand Down Expand Up @@ -76,3 +76,4 @@
</main>
</body>
</html>

31 changes: 18 additions & 13 deletions src/styles/_catalog.scss
Original file line number Diff line number Diff line change
@@ -1,22 +1,27 @@
.catalog {
display: flex;
flex-wrap: wrap;

max-width: 944px;
display: grid;
gap: 48px;
justify-content: center;
margin: 0 auto;

@media (min-width: 488px) {
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally good practice is to use whole styling properties for each class in one place. So those breakpoints are for .catalog class so move them up before &__card and not behind as you do now

grid-template-columns: repeat(2, $cardWidth);
}

@media (min-width: 768px) {
grid-template-columns: repeat(3, $cardWidth);
}

@media (min-width: 1024px) {
grid-template-columns: repeat(4, $cardWidth);
}

&__card {
display: flex;
justify-content: center;
align-items: center;
width: 200px;
display: grid;
place-items: center;
width: $cardWidth;
height: 300px;
border: 1px solid #ccc;
border-radius: 5px;
margin-bottom: 48px;
}

&__card:not(:nth-child(4n)) {
margin-right: 48px;
}
}
2 changes: 1 addition & 1 deletion src/styles/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ body {
* {
box-sizing: border-box;
}

@import "./utils/variables";
@import "_header.scss";
@import "_catalog.scss";
1 change: 1 addition & 0 deletions src/styles/utils/_variables.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$cardWidth: 200px;