Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .linthtmlrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"attr-name-ignore-regex": "viewBox",
"attr-no-dup": true,
"attr-quote-style": "double",
"attr-req-value": true,
"attr-req-value": false,
"class-no-dup": true,
"doctype-first": true,
"doctype-html5": true,
Expand Down
170 changes: 5 additions & 165 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 12 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"keywords": [],
"author": "Mate Academy",
"license": "GPL-3.0",
"dependencies": {},
"devDependencies": {
"@linthtml/linthtml": "^0.9.6",
"@mate-academy/backstop-config": "latest",
Expand All @@ -28,7 +27,7 @@
"backstopjs": "6.3.23",
"jest": "^29.7.0",
"parcel": "^2.12.0",
"prettier": "^3.3.2",
"prettier": "^3.8.1",
"stylelint": "^16.7.0",
"stylelint-scss": "^6.4.1"
},
Expand All @@ -38,5 +37,15 @@
"javascript": false,
"bem": false
}
}
},
"main": ".eslintrc.js",
"repository": {
"type": "git",
"url": "git+https://github.com/maykonfox/layout_moyo-header-fox.git"
},
"type": "commonjs",
"bugs": {
"url": "https://github.com/maykonfox/layout_moyo-header-fox/issues"
},
"homepage": "https://github.com/maykonfox/layout_moyo-header-fox#readme"
}
8 changes: 4 additions & 4 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ The page should match the design Pixel Perfect: all the sizes, colors and distan

❗️ Replace `<your_account>` with your GitHub username and copy the links to the `Pull Request` description:

- [DEMO LINK](https://<your_account>.github.io/layout_moyo-header/)
- [TEST REPORT LINK](https://<your_account>.github.io/layout_moyo-header/report/html_report/)
- [DEMO LINK](https://github.com/maykonfox/layout_moyo-header-fox)
- [TEST REPORT LINK](https://https://github.com/mate-academy/layout_moyo-header/pull/7481)

❗️ Copy this `Checklist` to the `Pull Request` description after links, and put `- [x]` before each point after you checked it.

Expand All @@ -39,5 +39,5 @@ The page should match the design Pixel Perfect: all the sizes, colors and distan
- [ ] **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)
- [ ] The Google Fonts Configuration follows requirements.
![alt text](./assets/image.png)
- [ ] The Google Fonts Configuration follows requirements.
![alt text](./assets/image.png)
104 changes: 98 additions & 6 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,111 @@
<meta charset="UTF-8" />
<meta
name="viewport"
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"
/>
<meta
http-equiv="X-UA-Compatible"
content="ie=edge"
content="width=device-width, initial-scale=1.0"
/>
<title>Moyo header</title>

<link
rel="preconnect"
href="https://fonts.googleapis.com"
/>
<link
rel="preconnect"
href="https://fonts.gstatic.com"
crossorigin="anonymous"
/>
<link
href="https://fonts.googleapis.com/css2?family=Roboto:wght@500&display=swap"
rel="stylesheet"
/>

<link
rel="stylesheet"
href="./style.css"
/>
</head>
<body>
<h1>Moyo header</h1>
<header class="header">
<a
href="#"
class="logo"
>
<img
class="logo_image"
src="images/logo.png"
alt="Logotipo da empresa Moyo"
/>
</a>
<nav class="nav">
<ul class="nav_list">
<li class="nav_item">
<a
href="#"
class="nav_link is-active"
aria-current="page"
data-qa="hover"
>
Apple
</a>
</li>
<li class="nav_item">
<a
href="#"
class="nav_link"
>
Samsung
</a>
</li>
<li class="nav_item">
<a
href="#"
class="nav_link"
>
Smartphones
</a>
</li>
<li class="nav_item">
<a
href="#"
Comment on lines +71 to +72

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to the Figma mockup, the "Smartphones" link should be the active one. To match the design perfectly, please move the is-active class and the aria-current="page" attribute from this link to the <a> tag for "Smartphones". The data-qa="hover" attribute should remain on this link as required.

class="nav_link"
>
Laptops & computers
</a>
</li>
<li class="nav_item">
<a
href="#"
class="nav_link"
>
Gadgets
</a>
</li>
<li class="nav_item">
<a
href="#"
class="nav_link"
>
Tablets
</a>
</li>
<li class="nav_item">
<a
href="#"
class="nav_link"
>
Photos
</a>
</li>
<li class="nav_item">
<a
href="#"
class="nav_link"
>
Video
</a>
</li>
</ul>
</nav>
</header>
</body>
</html>
Loading
Loading