Skip to content

Commit

Permalink
Вносит последние изменения
Browse files Browse the repository at this point in the history
  • Loading branch information
baranovdmitriy87 committed Oct 21, 2024
1 parent 4f7261f commit b477ee8
Show file tree
Hide file tree
Showing 151 changed files with 2,152 additions and 165 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
488 changes: 488 additions & 0 deletions backstop_data/bitmaps_test/20241021-231615/report.json

Large diffs are not rendered by default.

488 changes: 488 additions & 0 deletions backstop_data/bitmaps_test/20241021-231914/report.json

Large diffs are not rendered by default.

491 changes: 491 additions & 0 deletions backstop_data/bitmaps_test/20241021-234508/report.json

Large diffs are not rendered by default.

487 changes: 487 additions & 0 deletions backstop_data/bitmaps_test/20241021-234811/report.json

Large diffs are not rendered by default.

136 changes: 67 additions & 69 deletions backstop_data/html_report/config.js

Large diffs are not rendered by default.

172 changes: 85 additions & 87 deletions backstop_data/json_report/jsonReport.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions source/icons/social/logo-academy.svg
1 change: 1 addition & 0 deletions source/icons/social/logo-html.svg
1 change: 1 addition & 0 deletions source/icons/social/phone.svg
1 change: 1 addition & 0 deletions source/icons/social/pin.svg
17 changes: 10 additions & 7 deletions source/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ <h2 class="catalog__title">Каталог кофейных напитков</h2>
</section>

</main>
<footer class="footer">
<footer class="footer" data-test="footer">
<div class="footer__inner container">
<div class="footer__wrapper">
<a class="footer__logo" href="#">
Expand All @@ -179,23 +179,23 @@ <h2 class="catalog__title">Каталог кофейных напитков</h2>
<a class="social-list__link" href="#">
<span class="visually-hidden">Вконтакте</span>
<svg class="social-list__link-icon" width="20" height="20">
<use xlink:href="#social_vk"></use>
<use xlink:href="icons/stack.svg#social_vk"></use>
</svg>
</a>
</li>
<li class="social-list__item">
<a class="social-list__link" href="#">
<span class="visually-hidden">Pinterest</span>
<svg class="social-list__link-icon" width="22" height="22">
<use xlink:href="#social_pinterest"></use>
<use xlink:href="icons/stack.svg#social_pinterest"></use>
</svg>
</a>
</li>
<li class="social-list__item">
<a class="social-list__link" href="#">
<span class="visually-hidden">Одноклассники</span>
<svg class="social-list__link-icon" width="20" height="20">
<use xlink:href="#social_ok"></use>
<use xlink:href="icons/stack.svg#social_ok"></use>
</svg>
</a>
</li>
Expand Down Expand Up @@ -239,13 +239,13 @@ <h3 class="footer-nav__title">Контакты</h3>
<ul class="footer-nav__list contacts-list">
<li class="contacts-list__item contacts-list__item--address">
<svg class="contacts-list__pin-icon" width="20" height="20">
<use xlink:href="#pin"></use>
<use xlink:href="icons/stack.svg#social_pin"></use>
</svg>
<span class="contacts-list__list-text">Санкт-Петербург, набережная реки Карповки, дом 5</span>
</li>
<li class="contacts-list__item">
<svg class="contacts-list__phone-icon" width="13" height="16">
<use xlink:href="#phone"></use>
<use xlink:href="icons/stack.svg#social_phone"></use>
</svg>
+7 (999) 999-99-99
</li>
Expand All @@ -258,8 +258,11 @@ <h3 class="footer-nav__title">Контакты</h3>
<a class="copyright__link" href="https://htmlacademy.org/" target="_blank">
HTML Academy
<svg class="copyright__link-icon" width="12" height="16">
<use xlink:href="#logo-academy"></use>
<use xlink:href="icons/stack.svg#social_logo-academy"></use>
</svg>
<!-- <svg class="social-icon" width="27" height="34">
<use xlink:href="img/sprite.svg#icon-social-academy"></use>
</svg> -->
</a>
</div>
</div>
Expand Down
8 changes: 7 additions & 1 deletion source/styles/blocks/features.scss
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@
text-align: center;
text-transform: uppercase;
letter-spacing: 0.06vw;

@media (min-width: $desktop-width) {
letter-spacing: 0.05vw;
}
}

.features__list {
Expand All @@ -68,8 +72,9 @@
align-items: normal;
display: grid;
grid-template-columns: repeat(4, 317px);
// grid-template-columns: 317px 315px 316px 317px;
column-gap: 31px;
margin-top: 108px;
margin-top: 107px;
}
}

Expand Down Expand Up @@ -117,6 +122,7 @@

@media (min-width: $desktop-width) {
text-align: center;
margin: 0 0 5px;
}
}

Expand Down
2 changes: 1 addition & 1 deletion source/styles/blocks/footer-nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
display: grid;
grid-template-rows: 1fr;
grid-template-columns: 1fr 1fr 1fr;
grid-gap: 30px;
// grid-gap: 30px;
margin-top: 10px;
}

Expand Down
9 changes: 9 additions & 0 deletions source/styles/blocks/site-list.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@
line-height: 16px;
text-transform: uppercase;

&:hover,
&:focus {
color: $primary-lighter;
}

&:active {
color: $primary-darker;
}

@media (max-width: $mobile-width-only) {
padding: 20px 0;
outline-offset: unset;
Expand Down
15 changes: 15 additions & 0 deletions source/styles/blocks/user-menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,17 @@
}
}

.user-menu__item a {
&:hover,
&:focus {
color: $primary-lighter;
}

&:active {
color: $primary-darker;
}
}

.user-menu__link {
display: flex;
align-items: center;
Expand All @@ -61,6 +72,10 @@
}
}

.user-menu__enter::before:hover {
background-color: $primary-lighter;
}

.user-menu__cart {
@media (min-width: $desktop-width) {
min-width: 100px;
Expand Down

0 comments on commit b477ee8

Please sign in to comment.