Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #4870

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Develop #4870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e8c0953
add solution
maristella12 Apr 22, 2024
f468ff6
add solution
maristella12 Apr 22, 2024
1654344
novas correções
maristella12 Apr 22, 2024
b0e9a07
add task solution
maristella12 Apr 22, 2024
093538a
nova alteração
maristella12 Apr 22, 2024
46108f7
novo commit
maristella12 Apr 22, 2024
18ff201
codigo corrigido
maristella12 Apr 25, 2024
5acd780
correção do nome de usuário do github
maristella12 May 2, 2024
6f9df5f
modificação do readme.md
maristella12 May 2, 2024
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
Empty file added npm
View file
Open in desktop
Empty file.
6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@mate-academy/backstop-config": "latest",
"@mate-academy/bemlint": "latest",
"@mate-academy/linthtml-config": "latest",
"@mate-academy/scripts": "^1.7.3",
"@mate-academy/scripts": "^1.8.1",
"@mate-academy/stylelint-config": "latest",
"backstopjs": "6.2.2",
"jest": "^29.7.0",
Expand Down
4 changes: 2 additions & 2 deletions readme.md
View file
Open in desktop
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 `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://maristella12.github.io/layout_moyo-header/)
- [TEST REPORT LINK](https://maristella12.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.

Expand Down
103 changes: 102 additions & 1 deletion src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,109 @@
rel="stylesheet"
href="./style.css"
/>
<link
rel="preconnect"
href="https://fonts.googleapis.com"
/>
<link
rel="stylesheet"
href="https://fonts.googleapis.com/css2?family=Roboto:wght@500&display=swap"
crossorigin="anonymous"
/>
<link
href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap"
rel="stylesheet"
/>
</head>
<body>
<h1>Moyo header</h1>
""
<header class="header">
<a
href="#page-top"
class="nav__logo"
>
<img
src="images/logo.png"
alt="moyo-logo"
/>
</a>

<nav class="nav">
<ul class="nav__list">
<li class="nav__item">
<a
href="#apple"
class="is-active nav__link"
>
Apple
</a>
</li>

<li class="nav__item">
<a
href="#samsung"
class="nav__link"
>
Samsung
</a>
</li>

<li class="nav__item">
<a
href="#smartphones"
class="nav__link"
>
Smartphones
</a>
</li>

<li class="nav__item">
<a
href="#laptops"
class="nav__link"
data-qa="hover"
>
Laptops & Computers
</a>
</li>

<li class="nav__item">
<a
href="#gadgets"
class="nav__link"
>
Gadgets
</a>
</li>

<li class="nav__item">
<a
href="#tablets"
class="nav__link"
>
Tablets
</a>
</li>

<li class="nav__item">
<a
href="#photo"
class="nav__link"
>
Photo
</a>
</li>

<li class="nav__item">
<a
href="#video"
class="nav__link"
>
Video
</a>
</li>
</ul>
</nav>
</header>
</body>
</html>
93 changes: 93 additions & 0 deletions src/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,96 @@
html {
--bluecolor: #00acdc;
--blackcolor: #000;
}

body {
margin: 0 auto;
font-family: Roboto, sans-serif;
font-size: 12px;
font-style: normal;
font-weight: 500;
line-height: normal;
text-transform: uppercase;
}

.header {
maristella12 marked this conversation as resolved.
Show resolved Hide resolved
display: flex;
min-width: 1024px;
align-items: center;
justify-content: space-between;
margin: 0;
}

.nav {
Copy link

Choose a reason for hiding this comment

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

I think that is just nav instead of .nav here too.

margin-right: 50px;
}

.nav__logo {
height: 40px;
margin-left: 50px;
}

.nav__list {
display: flex;
list-style-type: none;
margin: 0;
padding: 0;
}

.nav__item {
margin: 0 0 0 20px;
}

.nav__item:first-child {
margin-left: 0;
}

Copy link

Choose a reason for hiding this comment

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

You can remove this blank line to keep the pattern on file.

.nav__item:last-child {
margin-right: 0;
}

.nav__link {
text-decoration: none;
display: inline-block;
height: 60px;
line-height: 60px;
}

.nav__link:link {
color: var(--blackcolor);
}

.nav__link:visited {
color: var(--blackcolor);
}

.nav__link:hover {
color: var(--bluecolor);
}

.nav__link:active {
color: var(--bluecolor);
}

.is-active {
position: relative;
color: var(--bluecolor);
}

.is-active:link {
color: var(--bluecolor);
}

.is-active:visited {
color: var(--bluecolor);
}

.is-active::after {
content: '';
display: block;
position: relative;
bottom: 4px;
height: 4px;
border-radius: 8px;
background-color: var(--bluecolor);
}
Loading