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/moyo_1.png b/moyo_1.png new file mode 100644 index 0000000000..6ee5ec2537 Binary files /dev/null and b/moyo_1.png differ 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..2fe1a26771 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://anastasiiadns.github.io/layout_moyo-header/) +- [TEST REPORT LINK](https://anastasiiadns.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/images/Menu/moyo_1.png b/src/images/Menu/moyo_1.png new file mode 100644 index 0000000000..6ee5ec2537 Binary files /dev/null and b/src/images/Menu/moyo_1.png differ diff --git a/src/index.html b/src/index.html index b39fe97123..83d229036f 100644 --- a/src/index.html +++ b/src/index.html @@ -1,6 +1,19 @@ + + + -

Moyo header

+
+ logo + +
diff --git a/src/style.css b/src/style.css index 293d3b1f13..780df9b795 100644 --- a/src/style.css +++ b/src/style.css @@ -1,3 +1,67 @@ +* { + margin: 0; + padding: 0; +} + body { margin: 0; + font-family: Roboto, sans-serif; +} + +.header { + display: flex; + padding: 0 50px; + align-items: center; +} + +.image { + width: 40px; + height: 40px; + display: block; +} + +nav { + display: block; + font-size: 12px; + font-weight: 500; + line-height: 60px; + text-transform: uppercase; +} + +nav ul { + list-style: none; + display: flex; +} + +nav ul li a { + display: flex; + text-decoration: none; + color: #000; + margin-right: 20px; +} + +nav ul li:last-child a { + margin-right: 0; +} + +nav ul li a.is-active { + color: #00acdc; +} + +nav ul li a.is-active::after { + content: ''; + position: absolute; + height: 4px; + width: 37px; + top: 56px; + background-color: #00acdc; + border-radius: 8px; +} + +nav ul li a:hover { + color: #00acdc; +} + +.flex-text { + margin-left: auto; }