From 03d2ca6ed41040f4f77caa3e3f56c19c6ee8080d Mon Sep 17 00:00:00 2001 From: Haluk Joshua Gurel Date: Wed, 4 Oct 2023 10:53:55 +0200 Subject: [PATCH 1/3] catalog_hover --- readme.md | 2 +- src/index.html | 2 +- src/styles/blocks/catalog.scss | 7 +++ src/styles/blocks/header.scss | 5 ++ src/styles/main.css | 83 ++++++++++++++++++++++++++++++++++ src/styles/main.css.map | 1 + 6 files changed, 98 insertions(+), 2 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 d2eb319ba..a3408f728 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,6 @@ # Frontend practice with catalog page and hovers Replace `` with your Github username and copy the links to Pull Request description: -- [DEMO LINK](https://.github.io/layout_catalog_hovers/) +- [DEMO LINK](https://usernameluke.github.io/layout_catalog_hovers/) > 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 044119cfc..7ae7bc763 100644 --- a/src/index.html +++ b/src/index.html @@ -13,7 +13,7 @@ > - +
diff --git a/src/styles/blocks/catalog.scss b/src/styles/blocks/catalog.scss index ffb6b2ccc..2c39ab26a 100644 --- a/src/styles/blocks/catalog.scss +++ b/src/styles/blocks/catalog.scss @@ -18,6 +18,13 @@ border-radius: 5px; margin-bottom: 48px; + transition-duration: 300ms; + + &:hover { + transform: scale(120%); + color: #34568b; + } + &:not(:nth-child(4n)) { margin-right: 48px; } diff --git a/src/styles/blocks/header.scss b/src/styles/blocks/header.scss index 638a10fef..99be85eca 100644 --- a/src/styles/blocks/header.scss +++ b/src/styles/blocks/header.scss @@ -38,5 +38,10 @@ text-transform: uppercase; font-size: 12px; font-weight: 500; + transition-duration: 300ms; + + &:hover { + color: #00acdc; + } } } diff --git a/src/styles/main.css b/src/styles/main.css new file mode 100644 index 000000000..bfe263a20 --- /dev/null +++ b/src/styles/main.css @@ -0,0 +1,83 @@ +.page { + font-family: Roboto, sans-serif; +} + +.page__body { + margin: 0; +} + +.header { + display: flex; + align-items: center; + justify-content: space-between; + box-sizing: border-box; + height: 60px; + padding: 0 50px; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05); +} + +.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; + transition-duration: 300ms; +} + +.nav__link:hover { + color: #00acdc; +} + +.catalog { + display: flex; + flex-wrap: wrap; + max-width: 944px; + margin: 0 auto; + padding: 50px 0; +} + +.catalog__card { + display: flex; + justify-content: center; + align-items: center; + box-sizing: border-box; + width: 200px; + height: 300px; + border: 1px solid #ccc; + border-radius: 5px; + margin-bottom: 48px; + transition-duration: 300ms; +} + +.catalog__card:hover { + transform: scale(120%); + color: #34568b; +} + +.catalog__card:not(:nth-child(4n)) { + margin-right: 48px; +} + +/*# sourceMappingURL=main.css.map */ diff --git a/src/styles/main.css.map b/src/styles/main.css.map new file mode 100644 index 000000000..45dbf8825 --- /dev/null +++ b/src/styles/main.css.map @@ -0,0 +1 @@ +{"version":3,"sourceRoot":"","sources":["blocks/page.scss","blocks/header.scss","blocks/catalog.scss"],"names":[],"mappings":"AAAA;EACE;;AAEA;EACE;;;ACJJ;EACE;EACA;EACA;EACA;EAEA;EACA;EAEA;;AAEA;EACE;;;AAKF;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAEA;EACE;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;;AC3CN;EACE;EACA;EAEA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EAEA;;AAEA;EACE;EACA;;AAGF;EACE","file":"main.css"} \ No newline at end of file From c209f17fcc9a962f28ee84e27cd6ecaf510b0adb Mon Sep 17 00:00:00 2001 From: Haluk Joshua Gurel Date: Thu, 5 Oct 2023 09:10:28 +0200 Subject: [PATCH 2/3] catalog_hover 2 --- src/styles/blocks/catalog.scss | 1 + src/styles/blocks/header.scss | 1 + 2 files changed, 2 insertions(+) diff --git a/src/styles/blocks/catalog.scss b/src/styles/blocks/catalog.scss index 2c39ab26a..710994897 100644 --- a/src/styles/blocks/catalog.scss +++ b/src/styles/blocks/catalog.scss @@ -19,6 +19,7 @@ margin-bottom: 48px; transition-duration: 300ms; + transition-property: transform, color; &:hover { transform: scale(120%); diff --git a/src/styles/blocks/header.scss b/src/styles/blocks/header.scss index 99be85eca..04ba5f2b6 100644 --- a/src/styles/blocks/header.scss +++ b/src/styles/blocks/header.scss @@ -39,6 +39,7 @@ font-size: 12px; font-weight: 500; transition-duration: 300ms; + transition-property: color; &:hover { color: #00acdc; From 5c275bf6ab490ddb694649e90d8229f33e8491aa Mon Sep 17 00:00:00 2001 From: Haluk Joshua Gurel Date: Mon, 9 Oct 2023 10:46:25 +0200 Subject: [PATCH 3/3] Catalog_Hover 2 --- src/styles/blocks/catalog.scss | 4 +--- src/styles/blocks/header.scss | 3 +-- src/styles/main.css | 4 ++-- src/styles/main.css.map | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/styles/blocks/catalog.scss b/src/styles/blocks/catalog.scss index 710994897..d3435ebe3 100644 --- a/src/styles/blocks/catalog.scss +++ b/src/styles/blocks/catalog.scss @@ -17,9 +17,7 @@ border: 1px solid #ccc; border-radius: 5px; margin-bottom: 48px; - - transition-duration: 300ms; - transition-property: transform, color; + transition: transform 300ms, color 300ms; &:hover { transform: scale(120%); diff --git a/src/styles/blocks/header.scss b/src/styles/blocks/header.scss index 04ba5f2b6..78560242d 100644 --- a/src/styles/blocks/header.scss +++ b/src/styles/blocks/header.scss @@ -38,8 +38,7 @@ text-transform: uppercase; font-size: 12px; font-weight: 500; - transition-duration: 300ms; - transition-property: color; + transition: color 300ms; &:hover { color: #00acdc; diff --git a/src/styles/main.css b/src/styles/main.css index bfe263a20..fea3c027a 100644 --- a/src/styles/main.css +++ b/src/styles/main.css @@ -43,7 +43,7 @@ text-transform: uppercase; font-size: 12px; font-weight: 500; - transition-duration: 300ms; + transition: color 300ms; } .nav__link:hover { @@ -68,7 +68,7 @@ border: 1px solid #ccc; border-radius: 5px; margin-bottom: 48px; - transition-duration: 300ms; + transition: transform 300ms, color 300ms; } .catalog__card:hover { diff --git a/src/styles/main.css.map b/src/styles/main.css.map index 45dbf8825..a3739dffe 100644 --- a/src/styles/main.css.map +++ b/src/styles/main.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["blocks/page.scss","blocks/header.scss","blocks/catalog.scss"],"names":[],"mappings":"AAAA;EACE;;AAEA;EACE;;;ACJJ;EACE;EACA;EACA;EACA;EAEA;EACA;EAEA;;AAEA;EACE;;;AAKF;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAEA;EACE;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;;AC3CN;EACE;EACA;EAEA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EAEA;;AAEA;EACE;EACA;;AAGF;EACE","file":"main.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["blocks/page.scss","blocks/header.scss","blocks/catalog.scss"],"names":[],"mappings":"AAAA;EACE;;AAEA;EACE;;;ACJJ;EACE;EACA;EACA;EACA;EAEA;EACA;EAEA;;AAEA;EACE;;;AAKF;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAEA;EACE;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;;AC3CN;EACE;EACA;EAEA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE","file":"main.css"} \ No newline at end of file