From b6e0fd237e09bb552c0aec950c32c2af45cc4cc2 Mon Sep 17 00:00:00 2001 From: Ivan Date: Sat, 7 Dec 2024 19:38:56 +0200 Subject: [PATCH 1/5] Normalize line endings to CRLF --- package-lock.json | 9 +++++---- package.json | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7eef7e5ecc..3738cb1849 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@mate-academy/backstop-config": "latest", "@mate-academy/bemlint": "latest", "@mate-academy/linthtml-config": "latest", - "@mate-academy/scripts": "^1.8.6", + "@mate-academy/scripts": "^1.9.12", "@mate-academy/stylelint-config": "latest", "backstopjs": "6.3.23", "jest": "^29.7.0", @@ -1211,10 +1211,11 @@ "dev": true }, "node_modules/@mate-academy/scripts": { - "version": "1.8.6", - "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-1.8.6.tgz", - "integrity": "sha512-b4om/whj4G9emyi84ORE3FRZzCRwRIesr8tJHXa8EvJdOaAPDpzcJ8A0sFfMsWH9NUOVmOwkBtOXDu5eZZ00Ig==", + "version": "1.9.12", + "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-1.9.12.tgz", + "integrity": "sha512-/OcmxMa34lYLFlGx7Ig926W1U1qjrnXbjFJ2TzUcDaLmED+A5se652NcWwGOidXRuMAOYLPU2jNYBEkKyXrFJA==", "dev": true, + "license": "MIT", "dependencies": { "@octokit/rest": "^17.11.2", "@types/get-port": "^4.2.0", diff --git a/package.json b/package.json index 45fd6b0d41..2e364031a8 100644 --- a/package.json +++ b/package.json @@ -17,13 +17,12 @@ "keywords": [], "author": "Mate Academy", "license": "GPL-3.0", - "dependencies": {}, "devDependencies": { "@linthtml/linthtml": "^0.9.6", "@mate-academy/backstop-config": "latest", "@mate-academy/bemlint": "latest", "@mate-academy/linthtml-config": "latest", - "@mate-academy/scripts": "^1.8.6", + "@mate-academy/scripts": "^1.9.12", "@mate-academy/stylelint-config": "latest", "backstopjs": "6.3.23", "jest": "^29.7.0", @@ -38,5 +37,6 @@ "javascript": false, "bem": false } - } + }, + "main": ".eslintrc.js" } From b6742d96d2db7c883d30ecb5e679382196a051a2 Mon Sep 17 00:00:00 2001 From: Ivan Date: Sat, 7 Dec 2024 19:43:13 +0200 Subject: [PATCH 2/5] Normalize line endings to CRLF and add untracked files --- .github/workflows/test.yml-template | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/test.yml-template diff --git a/.github/workflows/test.yml-template b/.github/workflows/test.yml-template new file mode 100644 index 0000000000..8b5743ecb4 --- /dev/null +++ b/.github/workflows/test.yml-template @@ -0,0 +1,29 @@ +name: Test + +on: + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [20.x] + + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - run: npm install + - run: npm test + - name: Upload HTML report(backstop data) + if: ${{ always() }} + uses: actions/upload-artifact@v2 + with: + name: report + path: backstop_data From 245ad285d57f89ce962fa0f801129df97ace9cae Mon Sep 17 00:00:00 2001 From: Ivan Date: Sun, 8 Dec 2024 21:40:54 +0200 Subject: [PATCH 3/5] add task solution --- readme.md | 4 +- src/index.html | 101 ++++++++++++++++++++++++++++++++++++++++++++++++- src/style.css | 74 ++++++++++++++++++++++++++++++++++++ 3 files changed, 175 insertions(+), 4 deletions(-) diff --git a/readme.md b/readme.md index e72b8051e7..739533239a 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://veneracode.github.io/layout_moyo-header/) +- [TEST REPORT LINK](https://veneracode.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..564baf7f39 100644 --- a/src/index.html +++ b/src/index.html @@ -10,13 +10,110 @@ http-equiv="X-UA-Compatible" content="ie=edge" /> - Moyo header + + + + + Moyo Header -

Moyo header

+
+ + +
diff --git a/src/style.css b/src/style.css index 293d3b1f13..675d6ab2d9 100644 --- a/src/style.css +++ b/src/style.css @@ -1,3 +1,77 @@ body { + padding: 0; + box-sizing: border-box; margin: 0; + font-family: Roboto, sans-serif; +} + +header { + box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.18); + height: 60px; + width: 100%; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; +} + +.box { + text-align: center; + position: relative; + font-size: 12px; + text-decoration: none; + color: black; + padding: 20px 0; + height: 60px; +} + +nav ul { + list-style: none; + display: flex; + margin: 0; +} + +.container { + position: relative; + margin-right: 40px; +} + +.logo { + height: 40px; + width: 40px; + + margin-left: 50px; +} + +nav ul li { + position: relative; + margin: 0 10px; +} + +nav ul li:first-child { + margin-left: 0; +} + +nav ul li:last-child { + margin-right: 0; +} + +.is-active::after { + content: ''; + position: absolute; + bottom: 0; + left: 0; + width: 100%; + height: 5px; + background-color: rgba(0, 150, 200, 1); + border-radius: 5px; + color: rgba(0, 150, 200, 1); +} + +.box:hover { + color: rgba(0, 150, 200, 1); +} + +[data-qa='hover']:hover { + color: rgba(0, 172, 220, 1); } From 7555d7d34c9a7d9399895a30122d2192813a4d90 Mon Sep 17 00:00:00 2001 From: Ivan Date: Sun, 8 Dec 2024 22:22:08 +0200 Subject: [PATCH 4/5] add task solution --- src/style.css | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/style.css b/src/style.css index 675d6ab2d9..1f2a3ca9f7 100644 --- a/src/style.css +++ b/src/style.css @@ -1,3 +1,7 @@ +:root { + --blue-color: rgba(0, 172, 220, 1); /* CSS-змінна для синього кольору */ +} + body { padding: 0; box-sizing: border-box; @@ -7,7 +11,6 @@ body { header { box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.18); - height: 60px; width: 100%; display: flex; flex-direction: row; @@ -21,8 +24,8 @@ header { font-size: 12px; text-decoration: none; color: black; - padding: 20px 0; - height: 60px; + height: 60px; /* Висота посилання */ + line-height: 60px; /* Вирівнювання тексту вертикально */ } nav ul { @@ -39,7 +42,6 @@ nav ul { .logo { height: 40px; width: 40px; - margin-left: 50px; } @@ -59,19 +61,18 @@ nav ul li:last-child { .is-active::after { content: ''; position: absolute; - bottom: 0; + bottom: -22px; /* Лінія точно внизу посилання */ left: 0; width: 100%; - height: 5px; - background-color: rgba(0, 150, 200, 1); - border-radius: 5px; - color: rgba(0, 150, 200, 1); + height: 4px; /* Висота лінії */ + background-color: var(--blue-color); /* Колір лінії */ + border-radius: 2px; /* Згладжені краї */ } .box:hover { - color: rgba(0, 150, 200, 1); + color: var(--blue-color); /* Зміна кольору тексту на hover */ } [data-qa='hover']:hover { - color: rgba(0, 172, 220, 1); + color: var(--blue-color); /* Зміна кольору тексту для data-qa */ } From 4a1dc557a6633944e59cc5a850e29e6e15684dff Mon Sep 17 00:00:00 2001 From: Ivan Date: Sun, 8 Dec 2024 22:34:18 +0200 Subject: [PATCH 5/5] add task solution --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index 564baf7f39..07d3221d3f 100644 --- a/src/index.html +++ b/src/index.html @@ -58,7 +58,7 @@
  • SAMSUNG