From 17b51b76b8b916a4b432c142c146697aa818dea3 Mon Sep 17 00:00:00 2001 From: Haluk Joshua Gurel Date: Mon, 23 Oct 2023 09:42:21 +0200 Subject: [PATCH 1/2] catalog_grid 1 --- readme.md | 2 +- src/index.html | 20 +++++----- src/styles/_catalog.scss | 28 +++++++++---- src/styles/main.css | 86 ++++++++++++++++++++++++++++++++++++++++ src/styles/main.css.map | 1 + 5 files changed, 118 insertions(+), 19 deletions(-) create mode 100644 src/styles/main.css create mode 100644 src/styles/main.css.map diff --git a/readme.md b/readme.md index 3a460b48..cd0762b2 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,6 @@ # Frontend practice with catalog page using grid Replace `` with your Github username and copy the links to Pull Request description: -- [DEMO LINK](https://.github.io/layout_catalog_grid/) +- [DEMO LINK](https://usernameluke.github.io/layout_catalog_grid/) > Follow [this instructions](https://github.com/mate-academy/layout_task-guideline#how-to-solve-the-layout-tasks-on-github) diff --git a/src/index.html b/src/index.html index af41a22d..5a8d01b6 100644 --- a/src/index.html +++ b/src/index.html @@ -13,39 +13,39 @@ > - +
- diff --git a/src/styles/_catalog.scss b/src/styles/_catalog.scss index a63c46d7..c96b934b 100644 --- a/src/styles/_catalog.scss +++ b/src/styles/_catalog.scss @@ -1,9 +1,8 @@ .catalog { - display: flex; - flex-wrap: wrap; - - max-width: 944px; - margin: 0 auto; + display: grid; + gap: 48px; + grid-template-columns: 200px 200px 200px 200px; + justify-content: center; &__card { display: flex; @@ -13,10 +12,23 @@ height: 300px; border: 1px solid #ccc; border-radius: 5px; - margin-bottom: 48px; } +} + +@media (max-width: 487px) { + .catalog { + grid-template-columns: auto; + } +} + +@media (min-width: 488px) and (max-width: 767px) { + .catalog { + grid-template-columns: 200px 200px; + } +} - &__card:not(:nth-child(4n)) { - margin-right: 48px; +@media (min-width: 768px) and (max-width: 1023px) { + .catalog { + grid-template-columns: 200px 200px 200px; } } diff --git a/src/styles/main.css b/src/styles/main.css new file mode 100644 index 00000000..63ed18a7 --- /dev/null +++ b/src/styles/main.css @@ -0,0 +1,86 @@ +html { + font-family: Roboto, sans-serif; +} + +body { + margin: 0; +} + +* { + box-sizing: border-box; +} + +.header { + display: flex; + align-items: center; + justify-content: space-between; + height: 60px; + padding: 0 50px; + margin-bottom: 50px; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05); + overflow: hidden; +} + +.header__logo { + height: 40px; +} + +.nav__list { + display: flex; + margin: 0; + padding: 0; +} + +.nav__item { + position: relative; + color: #060b35; + list-style: none; + line-height: 60px; +} + +.nav__item:not(:last-child) { + margin-right: 20px; +} + +.nav__link { + color: inherit; + text-decoration: none; + text-transform: uppercase; + font-size: 12px; + font-weight: 500; +} + +.catalog { + display: grid; + gap: 48px; + grid-template-columns: 200px 200px 200px 200px; + justify-content: center; +} + +.catalog__card { + display: flex; + justify-content: center; + align-items: center; + width: 200px; + height: 300px; + border: 1px solid #ccc; + border-radius: 5px; +} + +@media (max-width: 487px) { + .catalog { + grid-template-columns: auto; + } +} +@media (min-width: 488px) and (max-width: 767px) { + .catalog { + grid-template-columns: 200px 200px; + } +} +@media (min-width: 768px) and (max-width: 1023px) { + .catalog { + grid-template-columns: 200px 200px 200px; + } +} + +/*# sourceMappingURL=main.css.map */ diff --git a/src/styles/main.css.map b/src/styles/main.css.map new file mode 100644 index 00000000..99f36973 --- /dev/null +++ b/src/styles/main.css.map @@ -0,0 +1 @@ +{"version":3,"sourceRoot":"","sources":["main.scss","_header.scss","_catalog.scss"],"names":[],"mappings":"AAAA;EACE;;;AAGF;EACE;;;AAGF;EACE;;;ACTF;EACE;EACA;EACA;EACA;EACA;EACA;EAEA;EAEA;;AAEA;EACE;;;AAKF;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAGF;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;;;ACxCJ;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAIJ;EACE;IACE;;;AAIJ;EACE;IACE;;;AAIJ;EACE;IACE","file":"main.css"} \ No newline at end of file From d46e8daf619c88e01ffc68d69dee748fbde0555c Mon Sep 17 00:00:00 2001 From: Haluk Joshua Gurel Date: Mon, 23 Oct 2023 10:30:23 +0200 Subject: [PATCH 2/2] catalog_grid 2 --- src/styles/_catalog.scss | 12 ++++++------ src/styles/main.css | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/styles/_catalog.scss b/src/styles/_catalog.scss index c96b934b..e28d82a5 100644 --- a/src/styles/_catalog.scss +++ b/src/styles/_catalog.scss @@ -1,7 +1,7 @@ .catalog { display: grid; gap: 48px; - grid-template-columns: 200px 200px 200px 200px; + grid-template-columns: repeat(4, 200px); justify-content: center; &__card { @@ -15,20 +15,20 @@ } } -@media (max-width: 487px) { +@media (min-width: 768px) and (max-width: 1023px) { .catalog { - grid-template-columns: auto; + grid-template-columns: repeat(3, 200px); } } @media (min-width: 488px) and (max-width: 767px) { .catalog { - grid-template-columns: 200px 200px; + grid-template-columns: repeat(2, 200px); } } -@media (min-width: 768px) and (max-width: 1023px) { +@media (max-width: 487px) { .catalog { - grid-template-columns: 200px 200px 200px; + grid-template-columns: auto; } } diff --git a/src/styles/main.css b/src/styles/main.css index 63ed18a7..846025cb 100644 --- a/src/styles/main.css +++ b/src/styles/main.css @@ -53,7 +53,7 @@ body { .catalog { display: grid; gap: 48px; - grid-template-columns: 200px 200px 200px 200px; + grid-template-columns: repeat(4, 200px); justify-content: center; } @@ -67,19 +67,19 @@ body { border-radius: 5px; } -@media (max-width: 487px) { +@media (min-width: 768px) and (max-width: 1023px) { .catalog { - grid-template-columns: auto; + grid-template-columns: repeat(3, 200px); } } @media (min-width: 488px) and (max-width: 767px) { .catalog { - grid-template-columns: 200px 200px; + grid-template-columns: repeat(2, 200px); } } -@media (min-width: 768px) and (max-width: 1023px) { +@media (max-width: 487px) { .catalog { - grid-template-columns: 200px 200px 200px; + grid-template-columns: auto; } }