Skip to content

Commit 15c949c

Browse files
keksobotkeksobot
authored
Merge pull request #10 from Kate1jkee/master
2 parents 3cb3565 + a3f1917 commit 15c949c

File tree

9 files changed

+46
-27
lines changed

9 files changed

+46
-27
lines changed

‎source/catalog.html‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@
3535
<img class="logo__text" src="images/logo-text-mobile.svg" width="101" height="18" alt="Cat energy">
3636
</picture>
3737
</a>
38-
<nav class="main-header__nav main-nav">
39-
<!-- Если JS выключен - модификатор nojs к main-nav -->
38+
<nav class="main-header__nav main-nav main-nav--js">
39+
<!-- Если нужно интерактивное меню - модификатор js к main-nav -->
40+
<!-- Если нужно открытое меню - модификатор nojs к main-nav -->
4041
<input class="main-nav__input visually-hidden" type="checkbox" id="main-nav-input" name="main-nav-input">
4142
<label class="main-nav__toggle" for="main-nav-input"></label>
4243
<ul class="main-nav__list">
@@ -359,12 +360,12 @@ <h2 class="contacts__title">Приглашаем
359360
</div>
360361
<!-- Если JS включен - js -->
361362
<!-- Если JS выключен - nojs -->
362-
<div class="main-footer__map main-footer__map--js">
363+
<div class="main-footer__map main-footer__map--nojs">
363364
<iframe class="main-footer__map-iframe" src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d1998.6037876728562!2d30.320472478050274!3d59.93871647491518!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x4696310fca3de3a1%3A0xc7af30764648c6b1!2z0JHQvtC70YzRiNCw0Y8g0JrQvtC90Y7RiNC10L3QvdCw0Y8g0YPQuy4sINC0LiAxOS84LCDQodCw0L3QutGCLdCf0LXRgtC10YDQsdGD0YDQsywgMTkxMTg2!5e0!3m2!1sru!2sru!4v1766597941287!5m2!1sru!2sru" width="320" height="362" allowfullscreen title="Офис компании по адресу ул.Большая Конюшенная, 19/8, Санкт-Петербург" loading="lazy"></iframe>
364365
<picture class="main-footer__map-picture">
365-
<source type="image/webp" media="(min-width: 1200px)" srcset="images/map-desktop@1x.webp 1x, images/map-desktop@2x.webp 2x">
366-
<source type="image/webp" media="(min-width: 768px)" srcset="images/map-tablet@1x.webp 1x, images/map-tablet@2x.webp 2x">
367-
<source type="image/webp" srcset="images/map-mobile@1x.webp 1x, images/map-mobile@2x.webp 2x">
366+
<source width="1440" height="400" type="image/webp" media="(min-width: 1200px)" srcset="images/map-desktop@1x.webp 1x, images/map-desktop@2x.webp 2x">
367+
<source width="768" height="400" type="image/webp" media="(min-width: 768px)" srcset="images/map-tablet@1x.webp 1x, images/map-tablet@2x.webp 2x">
368+
<source width="320" height="362" type="image/webp" srcset="images/map-mobile@1x.webp 1x, images/map-mobile@2x.webp 2x">
368369

369370
<source width="1440" height="400" type="image/png" media="(min-width: 1340px)" srcset="images/map-desktop@1x.png 1x, images/map-desktop@2x.png 2x">
370371
<source width="768" height="400" type="image/png" media="(min-width: 768px)" srcset="images/map-tablet@1x.png 1x, images/map-tablet@2x.png 2x">

‎source/index.html‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@
3535
<img class="logo__text" src="images/logo-text-mobile.svg" width="101" height="18" alt="Cat energy">
3636
</picture>
3737
</a>
38-
<nav class="main-header__nav main-nav">
39-
<!-- Если JS выключен - модификатор nojs к main-nav -->
38+
<nav class="main-header__nav main-nav main-nav--js">
39+
<!-- Если нужно интерактивное меню - модификатор js к main-nav -->
40+
<!-- Если нужно открытое меню - модификатор nojs к main-nav -->
4041
<input class="main-nav__input visually-hidden" type="checkbox" id="main-nav-input" name="main-nav-input">
4142
<label class="main-nav__toggle" for="main-nav-input"></label>
4243
<ul class="main-nav__list main-nav__list--bg">
@@ -68,9 +69,9 @@ <h1 class="nutrition-selector__title">Функциональное
6869
<p class="nutrition-selector__description">Занялся собой? Займись котом!</p>
6970
</div>
7071
<picture class="nutrition-selector__image-container">
71-
<source type="image/webp" media="(min-width: 1200px)" srcset="images/promo-food-desktop@1x.webp 1x, images/promo-food-desktop@2x.webp 2x">
72-
<source type="image/webp" media="(min-width: 768px)" srcset="images/promo-food-tablet@1x.webp 1x, images/promo-food-tablet@2x.webp 2x">
73-
<source type="image/webp" srcset="images/promo-food-mobile@1x.webp 1x, images/promo-food-mobile@2x.webp 2x">
72+
<source width="552" height="499" type="image/webp" media="(min-width: 1200px)" srcset="images/promo-food-desktop@1x.webp 1x, images/promo-food-desktop@2x.webp 2x">
73+
<source width="709" height="609" type="image/webp" media="(min-width: 768px)" srcset="images/promo-food-tablet@1x.webp 1x, images/promo-food-tablet@2x.webp 2x">
74+
<source width="280" height="270" type="image/webp" srcset="images/promo-food-mobile@1x.webp 1x, images/promo-food-mobile@2x.webp 2x">
7475
<source width="552" height="499" type="image/png" media="(min-width: 1340px)" srcset="images/promo-food-desktop@1x.png 1x, images/promo-food-desktop@2x.png 2x">
7576
<source width="709" height="609" type="image/png" media="(min-width: 768px)" srcset="images/promo-food-tablet@1x.png 1x, images/promo-food-tablet@2x.png 2x">
7677
<img class="nutrition-selector__image" src="images/promo-food-mobile@1x.png" srcset="images/promo-food-mobile@2x.png 2x" width="280" height="270" alt="Упаковка фирменного корма Cat Energy">
@@ -176,12 +177,12 @@ <h2 class="contacts__title">Приглашаем
176177
</div>
177178
<!-- Если JS включен - js -->
178179
<!-- Если JS выключен - nojs -->
179-
<div class="main-footer__map main-footer__map--js">
180+
<div class="main-footer__map main-footer__map--nojs">
180181
<iframe class="main-footer__map-iframe" src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d1998.6037876728562!2d30.320472478050274!3d59.93871647491518!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x4696310fca3de3a1%3A0xc7af30764648c6b1!2z0JHQvtC70YzRiNCw0Y8g0JrQvtC90Y7RiNC10L3QvdCw0Y8g0YPQuy4sINC0LiAxOS84LCDQodCw0L3QutGCLdCf0LXRgtC10YDQsdGD0YDQsywgMTkxMTg2!5e0!3m2!1sru!2sru!4v1766597941287!5m2!1sru!2sru" width="320" height="362" allowfullscreen title="Офис компании по адресу ул.Большая Конюшенная, 19/8, Санкт-Петербург" loading="lazy"></iframe>
181182
<picture class="main-footer__map-picture">
182-
<source type="image/webp" media="(min-width: 1200px)" srcset="images/map-desktop@1x.webp 1x, images/map-desktop@2x.webp 2x">
183-
<source type="image/webp" media="(min-width: 768px)" srcset="images/map-tablet@1x.webp 1x, images/map-tablet@2x.webp 2x">
184-
<source type="image/webp" srcset="images/map-mobile@1x.webp 1x, images/map-mobile@2x.webp 2x">
183+
<source width="1440" height="400" type="image/webp" media="(min-width: 1200px)" srcset="images/map-desktop@1x.webp 1x, images/map-desktop@2x.webp 2x">
184+
<source width="768" height="400" type="image/webp" media="(min-width: 768px)" srcset="images/map-tablet@1x.webp 1x, images/map-tablet@2x.webp 2x">
185+
<source width="320" height="362" type="image/webp" srcset="images/map-mobile@1x.webp 1x, images/map-mobile@2x.webp 2x">
185186
<source width="1440" height="400" type="image/png" media="(min-width: 1340px)" srcset="images/map-desktop@1x.png 1x, images/map-desktop@2x.png 2x">
186187
<source width="768" height="400" type="image/png" media="(min-width: 768px)" srcset="images/map-tablet@1x.png 1x, images/map-tablet@2x.png 2x">
187188
<img class="main-footer__map-image" src="images/map-mobile@1x.png" srcset="images/map-mobile@2x.png 2x" width="320" height="362" alt="Офис компании по адресу ул.Большая Конюшенная, 19/8, Санкт-Петербург">

‎source/styles/blocks/advertising-example.scss‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@
1818
}
1919
}
2020

21+
@media (min-width: $desktop-width) {
22+
.advertising-example {
23+
background-image: linear-gradient(#ffffff 195px, #f2f2f2 195px 100%);
24+
}
25+
}
26+
2127
@media (min-width: $tablet-width) {
2228
.advertising-example__container {
2329
display: flex;
@@ -38,7 +44,7 @@
3844
min-width: 280px;
3945
max-width: 280px;
4046
margin: 0 auto;
41-
padding: 25px 20px 50px;
47+
padding: 25px 20px 40px;
4248
}
4349

4450
@media (min-width: $tablet-width) {
@@ -60,7 +66,6 @@
6066
}
6167
}
6268

63-
6469
.advertising-example__title {
6570
@include font-text-secondary(36px, 40px, $color-text-dark);
6671
margin: 0;
@@ -172,5 +177,9 @@
172177
margin: 0;
173178
margin-bottom: 85px;
174179
margin-right: 60px;
180+
181+
position: absolute;
182+
top: 72px;
183+
right: 0;
175184
}
176185
}

‎source/styles/blocks/links.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
min-width: 280px;
33
max-width: 280px;
44
margin: 0 auto;
5-
padding: 50px 20px;
5+
padding: 40px 20px;
66
}
77

88
@media (min-width: $tablet-width) {

‎source/styles/blocks/main-footer.scss‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@
4949
overflow: hidden;
5050
}
5151

52+
@media (min-width: $tablet-width) {
53+
.main-footer__map-picture {
54+
max-height: 400px;
55+
}
56+
}
57+
5258
.main-footer__map-image {
5359
display: block;
5460
width: 100%;
@@ -82,7 +88,7 @@
8288

8389
.main-footer__contacts {
8490
margin: 0 auto;
85-
padding: 15px 20px;
91+
padding: 25px 20px;
8692
}
8793

8894
@media (min-width: $tablet-width) {

‎source/styles/blocks/main.scss‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@media (min-width: $tablet-width) {
22
.main__nutrition-selector {
33
margin: 0 auto;
4-
padding: 65px 30px 0;
4+
padding: 65px 0 0;
55
}
66
}
77

@@ -87,6 +87,7 @@
8787
.main__promos-and-new {
8888
margin: 0 auto;
8989
padding: 45px 20px;
90+
padding-bottom: 35px;
9091
}
9192

9293
@media (width >= 768px) {

‎source/styles/blocks/nutrition-selector.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@
5959

6060
@media (min-width: $tablet-width) {
6161
.nutrition-selector {
62-
min-width: 708px;
63-
max-width: 708px;
6462
background: none;
6563
}
6664

@@ -78,7 +76,7 @@
7876
min-width: 708px;
7977
max-width: 708px;
8078
margin: 0 auto;
81-
padding: 0;
79+
padding: 0 30px;
8280
position: relative;
8381
}
8482
}
@@ -233,13 +231,15 @@
233231
.nutrition-selector__image-container {
234232
grid-row: 2/4;
235233
grid-column: 1/-1;
234+
margin-left: 20px;
236235
}
237236
}
238237

239238
@media (min-width: $desktop-width) {
240239
.nutrition-selector__image-container {
241240
grid-column: 4/6;
242241
grid-row: 1/4;
242+
margin-left: 0;
243243
}
244244
}
245245

‎source/styles/blocks/offer-list.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
.offer-list {
77
display: flex;
88
gap: 80px;
9+
flex-wrap: wrap;
910
}
1011
}
1112

‎source/styles/blocks/product-card.scss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
flex-direction: column;
4949
background:
5050
linear-gradient(
51-
to top,
52-
$bg-color-base 0% 430px,
53-
transparent 430px 100%
51+
to bottom,
52+
transparent 0% 81px,
53+
$bg-color-base 81px 100%
5454
);
5555
background-repeat: no-repeat;
5656
background-position: center;
@@ -83,7 +83,7 @@
8383
content: "";
8484
position: absolute;
8585
width: 100%;
86-
height: 429px;
86+
height: calc(100% - 81px);
8787
bottom: 0;
8888
left: 0;
8989
border: 2px solid #f2f2f2;

0 commit comments

Comments
 (0)