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..590d8fbcd0 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,9 +1211,9 @@ "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, "dependencies": { "@octokit/rest": "^17.11.2", 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..174120545c 100644 --- a/readme.md +++ b/readme.md @@ -27,15 +27,15 @@ 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://KalianaBueno.github.io/layout_moyo-header/) +- [TEST REPORT LINK](https://KalianaBueno.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. -- [ ] Header height is set in 1 place (for the links) -- [ ] Content is vertically centered (for any header height) -- [ ] CSS is used to show all letters in Uppercase (don't type them in HTML) -- [ ] Logo is an image wrapped with a link -- [ ] **CSS Variable** is used for a blue color -- [ ] Pseudo-element is used for a blue line below the active link -- [ ] Code follows all the [Code Style Rules ❗️](./checklist.md) +- [x] Header height is set in 1 place (for the links) +- [x] Content is vertically centered (for any header height) +- [x] CSS is used to show all letters in Uppercase (don't type them in HTML) +- [x] Logo is an image wrapped with a link +- [x] **CSS Variable** is used for a blue color +- [x] Pseudo-element is used for a blue line below the active link +- [x] Code follows all the [Code Style Rules ❗️](./checklist.md) diff --git a/src/index.html b/src/index.html index b39fe97123..f82f8423a9 100644 --- a/src/index.html +++ b/src/index.html @@ -11,12 +11,52 @@ content="ie=edge" /> Moyo header + + + + + + -

Moyo header

+
+ + logo da empresa moyo + + +
diff --git a/src/style.css b/src/style.css index 293d3b1f13..69d1937093 100644 --- a/src/style.css +++ b/src/style.css @@ -1,3 +1,75 @@ -body { +* { margin: 0; + font-family: Roboto, serif; +} + +.header { + display: flex; + justify-content: space-between; + align-items: center; + padding: 0 50px; + background: #fff; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05); +} + +.nav--bar { + display: flex; + align-items: center; + justify-content: space-between; +} + +img { + width: 100%; + height: 100%; + + /* display: inline-block; */ +} + +.nav--links { + display: flex; + list-style: none; + padding: 0; + margin: 0; +} + +.nav--link { + margin-left: 20px; + position: relative; +} + +.nav--link a { + text-decoration: none; + color: #000; + text-transform: uppercase; + font-size: 12px; + line-height: 60px; + font-weight: 500; +} + +/* .is-active a { + color: rgba(0, 172, 220, 1); + +} */ + +.is-active a { + color: rgba(0, 172, 220, 1); + + /* position: relative; */ +} + +.is-active a::after { + content: ''; + display: block; + width: 100%; + height: 4px; + background-color: rgba(0, 172, 220, 1); + position: absolute; + left: 0; + right: 0; + bottom: 0; + border-radius: 8px; +} + +.nav--link a:hover { + color: rgba(0, 172, 220, 1); }