From 27797ad079853b81a94cd6fb735916011d9df1de Mon Sep 17 00:00:00 2001 From: bbbozhena Date: Wed, 27 Nov 2024 19:33:28 +0100 Subject: [PATCH 1/2] add header moyo --- .github/workflows/test.yml-template | 29 +++++++++ package-lock.json | 9 +-- package.json | 3 +- readme.md | 4 +- src/index.html | 91 ++++++++++++++++++++++++++++- src/style.css | 63 ++++++++++++++++++++ 6 files changed, 190 insertions(+), 9 deletions(-) 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 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..ef9b108584 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", diff --git a/readme.md b/readme.md index e72b8051e7..889ab3f949 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://bbbozhena.github.io/layout_moyo-header/) +- [TEST REPORT LINK](https://bbbozhena.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..8c2be7ce45 100644 --- a/src/index.html +++ b/src/index.html @@ -15,8 +15,97 @@ rel="stylesheet" href="./style.css" /> + + + -

Moyo header

+
+ + logo + + +
diff --git a/src/style.css b/src/style.css index 293d3b1f13..4b2dee76c3 100644 --- a/src/style.css +++ b/src/style.css @@ -1,3 +1,66 @@ +:root { + --blue-color: #00acdc; +} + body { margin: 0; + font-family: Roboto, sans-serif; +} + +.header { + display: flex; + justify-content: space-between; + align-items: center; + padding: 0 50px; +} + +.logo-img { + height: 40px; + width: 40px; +} + +.nav-list { + display: flex; + list-style: none; + font-size: 12px; + margin: 0; + padding: 23px 0; +} + +.nav-item { + margin-right: 20px; +} + +.nav-item:last-child { + margin-right: 0; +} + +.nav-item-link { + padding: 23px 0; + text-decoration: none; + color: black; + text-align: center; + text-transform: uppercase; + font-weight: 500; +} + +.is-active { + position: relative; + color: var(--blue-color); +} + +.is-active::after { + content: ''; + position: absolute; + left: 0; + bottom: 0; + width: 100%; + height: 4px; + border: none; + border-radius: 2px; + background-color: var(--blue-color); +} + +.nav-item-link:hover { + color: var(--blue-color); } From 8a96ee2b0b2b5cdfd3dc5c3588b0d841014325cd Mon Sep 17 00:00:00 2001 From: bbbozhena Date: Wed, 27 Nov 2024 19:55:16 +0100 Subject: [PATCH 2/2] fix issues --- src/index.html | 6 +++++- src/style.css | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/index.html b/src/index.html index 8c2be7ce45..cde459bcd2 100644 --- a/src/index.html +++ b/src/index.html @@ -30,8 +30,12 @@ /> +

Moyo header

- +