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.

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

Правки по замечаниям #2

Merged
2 changes: 1 addition & 1 deletion source/catalog.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</a>
<button class="header__toggle header__toggle--open header__toggle--nojs" type="button"><span class="visually-hidden">Управление меню</span></button>
</div>
<nav class="navigation navigation--inner navigation--closed navigation--nojs">
<nav class="navigation navigation--closed navigation--nojs">
<div class="navigation__wrapper">
<ul class="navigation__list navigation-list">
<li class="navigation-list__item">
Expand Down
3 changes: 0 additions & 3 deletions source/styles/blocks/benefits.scss
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,6 @@
@media (min-width: $desktop-width) {
grid-template-columns: repeat(4, 1fr);
gap: 37px 79px;
// display: flex;
// flex-flow: row wrap;
//gap: 37px 79px;
}
}

Expand Down
7 changes: 6 additions & 1 deletion source/styles/blocks/button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
align-items: center;
justify-content: center;
font-family: $secondary-font;
font-size: 20px;
font-size: 16px;
line-height: 20px;
font-weight: 400;
text-transform: uppercase;
Expand All @@ -28,6 +28,11 @@
background-color: $bg-basic-green-2;
color: rgba(255, 255, 255, 0.3);
}

@media (min-width: $tablet-width) {
font-size: 20px;
line-height: 26px;
}
}

.button--more {
Expand Down
18 changes: 18 additions & 0 deletions source/styles/blocks/card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,15 @@ $card-top-offset: 81px;
place-self: start center;
align-content: center;

&:focus,
&:hover {
opacity: 0.8;
}

&:active {
opacity: 0.3;
}

@media (min-width: $tablet-width) {
height: 210px;
}
Expand Down Expand Up @@ -88,6 +97,15 @@ $card-top-offset: 81px;
text-decoration: none;
text-transform: uppercase;

&:focus,
&:hover {
opacity: 0.6;
}

&:active {
opacity: 0.3;
}

@media (min-width: $tablet-width) {
font-size: 20px;
line-height: 24px;
Expand Down
25 changes: 18 additions & 7 deletions source/styles/blocks/designed-by.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,24 @@
align-items: center;
width: 168px;
}
}

&:focus,
&:hover {
color: $text-color-basic-green;
}
.designed-by__link:focus .designed-by__text,
.designed-by__link:hover .designed-by__text {
color: $text-color-special-grey-6;
}

&:active {
opacity: 0.3;
}
.designed-by__link:active .designed-by__text {
color: $text-color-special-grey-6;
opacity: 0.3;
}

.designed-by__link:focus .designed-by__image,
.designed-by__link:hover .designed-by__image {
color: $text-color-basic-green;
}

.designed-by__link:active .designed-by__image {
color: $text-color-basic-green;
opacity: 0.3;
}
6 changes: 3 additions & 3 deletions source/styles/blocks/hero.scss
Original file line number Diff line number Diff line change
Expand Up @@ -134,20 +134,20 @@
}

.hero__link {
min-width: 280px;
width: 100%;
min-height: 40px;

@media (min-width: $tablet-width) {
position: absolute;
top: 266px;
left: 120px;
min-width: 242px;
width: 242px;
min-height: 54px;
}

@media (min-width: $desktop-width) {
position: static;
min-width: 244px;
width: 244px;
margin: 52px 0 0 80px;
}
}
26 changes: 13 additions & 13 deletions source/styles/blocks/navigation-list.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.navigation-list {
width: 100%;
display: flex;
flex-direction: column;
flex-flow: column wrap;
align-items: center;
background-color: $bg-basic-white;

Expand All @@ -24,7 +24,7 @@
word-break: break-all;
width: 100%;
text-align: center;
padding: 23px 0 19px;
padding: 23px 20px 19px;
margin: 0;

@media (min-width: $tablet-width) {
Expand All @@ -35,6 +35,12 @@
}
}

.navigation--nojs .navigation-list__item:last-of-type {
@media (min-width: $tablet-width) {
padding-bottom: 0;
}
}

.navigation-list__item--current {
position: relative;

Expand All @@ -49,22 +55,16 @@
background-color: $text-color-basic-green;
}
}
}

.header--main .navigation-list__item--current {
@media (min-width: $desktop-width) {
&::after {
background-color: $text-color-basic-white;
}
}
}

.navigation--inner .navigation-list__item--current {
@media (min-width: $tablet-width) {
&::after {
background-color: $text-color-basic-green;
}
}
}

.navigation-list__link {
font-family: $secondary-font;
font-size: 20px;
Expand All @@ -91,14 +91,14 @@
}

@media (min-width: $desktop-width) {
color: $text-color-basic-white;
color: $text-color-special-black-1;
font-size: 20px;
line-height: 20px;
}
}

.navigation--inner .navigation-list__link {
.header--main .navigation-list__link {
@media (min-width: $desktop-width) {
color: $text-color-special-black-1;
color: $text-color-basic-white;
}
}
14 changes: 13 additions & 1 deletion source/styles/blocks/navigation.scss
Original file line number Diff line number Diff line change
@@ -1,24 +1,36 @@
.navigation {
position: relative;
width: 100%;

@media (min-width: $desktop-width) {
max-width: 50%;
}
}

.navigation__wrapper {
position: absolute;
display: block;
z-index: 1;
width: 100%;
background-color: $bg-basic-white;
background-color: $text-color-special-black-1;
border-top: 1px solid $bg-special-grey-3;
margin: 10px 0 0;

@media (min-width: $tablet-width) {
position: relative;
background-color: transparent;
border-top: unset;
}

@media (min-width: $desktop-width) {
margin: 17px 0 0;
padding-left: 130px;
}
}

.header--main .navigation__wrapper {
@media (min-width: $desktop-width) {
position: absolute;
}
}

Expand Down
2 changes: 2 additions & 0 deletions source/styles/blocks/subscription.scss
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,8 @@
}

.subscription__button {
font-size: 20px;
line-height: 26px;
width: 100%;
min-height: 56px;

Expand Down
Loading