From 969f7de289e20e1c2ebe656b1aad67a080e93dbd Mon Sep 17 00:00:00 2001 From: Roman Date: Tue, 3 Dec 2024 19:09:48 +0200 Subject: [PATCH 1/3] 03.12.2024 19:09 --- .github/workflows/test.yml-template | 29 ++++++++++ package-lock.json | 9 +-- package.json | 3 +- src/index.html | 90 +++++++++++++++++++++++++++++ src/style.css | 50 ++++++++++++++++ 5 files changed, 175 insertions(+), 6 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/src/index.html b/src/index.html index b39fe97123..545f43363a 100644 --- a/src/index.html +++ b/src/index.html @@ -11,6 +11,18 @@ content="ie=edge" /> Moyo header + + +

Moyo header

+
+ + +
diff --git a/src/style.css b/src/style.css index 293d3b1f13..363eb559f6 100644 --- a/src/style.css +++ b/src/style.css @@ -1,3 +1,53 @@ +html { + --nav-hover-color: #00acdc; + --nav-color: black; + --header-bg-color: #fff +} + body { + font-family: Roboto, sans-serif; + margin: 0; + padding: 0; + font-size: 12px; + font-weight: 500; +} + +.container { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + width: 100%; +} + +.nav__list { + display: flex; + list-style: none; + padding: 0; margin: 0; } + +.nav__link { + text-decoration: none; + color: #000; + padding: 10px; +} + +.nav__logo { + width: 40px; + height: 40px; + padding-left: 50px; + padding-top: 10px; + padding-bottom: 10px; +} + +nav { + display: flex; + justify-content: space-between; + align-items: center; + padding-right: 50px; +} + +.is-active { + color: var(--nav-hover-color); +} From 5f9b84b947b55d1bcb19b97e030ce57855cb1477 Mon Sep 17 00:00:00 2001 From: Roman Date: Tue, 3 Dec 2024 19:34:31 +0200 Subject: [PATCH 2/3] Updated header --- src/index.html | 61 ++++++++++++++++++++++---------------------- src/style.css | 69 +++++++++++++++++++++++++++++++------------------- 2 files changed, 74 insertions(+), 56 deletions(-) diff --git a/src/index.html b/src/index.html index 545f43363a..e49c82fd9e 100644 --- a/src/index.html +++ b/src/index.html @@ -1,7 +1,7 @@ - + -

Moyo header

-
- +
+ + moyo_logo +