From b92e5b660bdda069a78f4fc2371f6d179ed7f1b8 Mon Sep 17 00:00:00 2001 From: inikiforov Date: Thu, 29 Aug 2024 17:48:34 +0200 Subject: [PATCH 1/6] moyo header task --- readme.md | 4 +-- src/index.html | 47 ++++++++++++++++++++++++-- src/style.css | 91 +++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 136 insertions(+), 6 deletions(-) diff --git a/readme.md b/readme.md index e72b8051e7..59c4c34194 100644 --- a/readme.md +++ b/readme.md @@ -27,8 +27,8 @@ The page should match the design Pixel Perfect: all the sizes, colors and distan ❗️ Replace `` with your Github username and copy the links to `Pull Request` description: -- [DEMO LINK](https://.github.io/layout_moyo-header/) -- [TEST REPORT LINK](https://.github.io/layout_moyo-header/report/html_report/) +- [DEMO LINK](https://ievgen-nikiforov.github.io/layout_moyo-header/) +- [TEST REPORT LINK](https://ievgen-nikiforov.github.io/layout_moyo-header/report/html_report/) ❗️ Copy this `Checklist` to the `Pull Request` description after links, and put `- [x]` before each point after you checked it. diff --git a/src/index.html b/src/index.html index b39fe97123..c548e139da 100644 --- a/src/index.html +++ b/src/index.html @@ -10,13 +10,54 @@ http-equiv="X-UA-Compatible" content="ie=edge" /> + Moyo header - -

Moyo header

- +
+
+ + +
+
+ + diff --git a/src/style.css b/src/style.css index 293d3b1f13..cb95ec89c2 100644 --- a/src/style.css +++ b/src/style.css @@ -1,3 +1,92 @@ -body { +:root { + --accent-color: #00acdc; +} + +body, +ul { margin: 0; + font-family: Roboto, sans-serif; +} + +img { + width: 40px; + height: 40px; + margin: 10px 0 10px 50px; + + @media screen and (min-width: 1024px) { + margin-right: 419px; + } + + @media screen and (max-width: 1024px) { + margin-right: 243px; + } +} + +.header-flex, +.nav-flex { + display: flex; + flex-direction: row; +} + +li { + list-style-type: none; + height: 100%; + display: flex; + align-items: center; + position: relative; + margin: 0 10px; +} + +li:last-child { + margin-right: 0; +} + +li:first-child { + margin-left: 0; +} + +a { + height: 100%; + text-decoration: none; + text-transform: uppercase; + color: #000; + font-weight: 500; + font-size: 12px; + display: flex; + align-items: center; + line-height: 15px; +} + +a:hover, +.is-active { + color: var(--accent-color); +} + +.nav-flex { + height: 100%; +} + +ul { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + margin: 0; + padding: 0; + height: 100%; +} + +.is-active { + position: relative; +} + +.is-active::after { + content: ''; + position: absolute; + left: 0; + bottom: 0; + width: 100%; + height: 4px; + background-color: var(--accent-color); + border-radius: 8px; } From b0c29f45d511fa9ac8fafab304d6be522c064a71 Mon Sep 17 00:00:00 2001 From: inikiforov Date: Fri, 30 Aug 2024 09:23:28 +0200 Subject: [PATCH 2/6] changes css --- src/index.html | 80 ++++++++++++++++++++++++++------------------------ src/style.css | 23 +++++++-------- 2 files changed, 51 insertions(+), 52 deletions(-) diff --git a/src/index.html b/src/index.html index c548e139da..a54ede36d6 100644 --- a/src/index.html +++ b/src/index.html @@ -12,51 +12,53 @@ /> Moyo header +
-
- - -
+ +
diff --git a/src/style.css b/src/style.css index cb95ec89c2..2412d340de 100644 --- a/src/style.css +++ b/src/style.css @@ -6,33 +6,30 @@ body, ul { margin: 0; font-family: Roboto, sans-serif; + font-weight: 500; } img { width: 40px; height: 40px; - margin: 10px 0 10px 50px; - - @media screen and (min-width: 1024px) { - margin-right: 419px; - } - - @media screen and (max-width: 1024px) { - margin-right: 243px; - } } -.header-flex, -.nav-flex { +header { + padding: 10px 50px; display: flex; + justify-content: space-between; flex-direction: row; } +nav { + display: flex; + justify-content: space-between; + align-items: center; +} + li { list-style-type: none; - height: 100%; display: flex; - align-items: center; position: relative; margin: 0 10px; } From 75c051c565b39b9b4bb7587c52b1ace5293ff064 Mon Sep 17 00:00:00 2001 From: inikiforov Date: Fri, 30 Aug 2024 09:30:30 +0200 Subject: [PATCH 3/6] changes css --- src/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/style.css b/src/style.css index 2412d340de..885ff27cc2 100644 --- a/src/style.css +++ b/src/style.css @@ -32,6 +32,7 @@ li { display: flex; position: relative; margin: 0 10px; + height: 100%; } li:last-child { From ab4cfb23d446c87b4b086791619e07135e00c502 Mon Sep 17 00:00:00 2001 From: inikiforov Date: Fri, 30 Aug 2024 11:21:49 +0200 Subject: [PATCH 4/6] changes css --- src/style.css | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/style.css b/src/style.css index 885ff27cc2..f7402d781a 100644 --- a/src/style.css +++ b/src/style.css @@ -15,7 +15,7 @@ img { } header { - padding: 10px 50px; + padding: 0 50px; display: flex; justify-content: space-between; flex-direction: row; @@ -28,11 +28,11 @@ nav { } li { + height: 60px; list-style-type: none; display: flex; position: relative; margin: 0 10px; - height: 100%; } li:last-child { @@ -88,3 +88,9 @@ ul { background-color: var(--accent-color); border-radius: 8px; } + +.logo { + display: flex; + align-items: center; + height: 60px; +} From bbb842181fb6dd75f715f7b22d39512efa2e6bbc Mon Sep 17 00:00:00 2001 From: inikiforov Date: Fri, 30 Aug 2024 12:29:25 +0200 Subject: [PATCH 5/6] change according to PR comment --- src/index.html | 78 ++++++++++++++++++++++++++++++++++++++------------ src/style.css | 24 +++++++--------- 2 files changed, 70 insertions(+), 32 deletions(-) diff --git a/src/index.html b/src/index.html index a54ede36d6..6052d789ba 100644 --- a/src/index.html +++ b/src/index.html @@ -21,42 +21,84 @@ href="./style.css" /> -
+
-
diff --git a/src/style.css b/src/style.css index f7402d781a..b4162c47e8 100644 --- a/src/style.css +++ b/src/style.css @@ -3,31 +3,31 @@ } body, -ul { +.nav__list { margin: 0; font-family: Roboto, sans-serif; font-weight: 500; } -img { +.img { width: 40px; height: 40px; } -header { +.header { padding: 0 50px; display: flex; justify-content: space-between; flex-direction: row; } -nav { +.nav { display: flex; justify-content: space-between; align-items: center; } -li { +.nav__item { height: 60px; list-style-type: none; display: flex; @@ -35,15 +35,15 @@ li { margin: 0 10px; } -li:last-child { +.nav__item:last-child { margin-right: 0; } -li:first-child { +.nav__item:first-child { margin-left: 0; } -a { +.nav__link { height: 100%; text-decoration: none; text-transform: uppercase; @@ -55,23 +55,19 @@ a { line-height: 15px; } -a:hover, +.nav__link:hover, .is-active { color: var(--accent-color); } -.nav-flex { +.nav__list { height: 100%; -} - -ul { display: flex; flex-direction: row; justify-content: space-between; align-items: center; margin: 0; padding: 0; - height: 100%; } .is-active { From 68995929eaddbaed83fe219a1afd8c83c31db1f2 Mon Sep 17 00:00:00 2001 From: inikiforov Date: Fri, 30 Aug 2024 12:39:11 +0200 Subject: [PATCH 6/6] changes css --- src/index.html | 8 +++++--- src/style.css | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/index.html b/src/index.html index 6052d789ba..477e865282 100644 --- a/src/index.html +++ b/src/index.html @@ -23,8 +23,8 @@