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

Поправить верстку блока .footer (привести в соответствие с макетом) #138

Closed
wants to merge 2 commits into from
Closed

Поправить верстку блока .footer (привести в соответствие с макетом) #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5012a30
Поправить верстку блока .footer (привести в соответствие с макетом)
Oct 18, 2020
56855c1
Добавить padding в правую колонку на десктопе
Oct 18, 2020
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
10 changes: 5 additions & 5 deletions src/includes/footer.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<span class="footer__organization">Веб-стандарты,</span> 2006–{{ site.buildYear }}
</p>
<ul class="footer__pages">
<li><a class="footer__link" href="/articles/">Статьи</a></li>
<li><a class="footer__link">Календарь</a></li>
<li><a class="footer__link">Подкаст</a></li>
<li><a class="footer__link">О проекте</a></li>
<li><a class="footer__link" href="https://www.patreon.com/webstandards_ru">Поддержать проект</a></li>
<li class="footer__page"><a class="footer__link" href="/articles/">Статьи</a></li>
<li class="footer__page"><a class="footer__link">Календарь</a></li>
<li class="footer__page"><a class="footer__link">Подкаст</a></li>
<li class="footer__page"><a class="footer__link">О проекте</a></li>
<li class="footer__page"><a class="footer__link" href="https://www.patreon.com/webstandards_ru">Поддержать проект</a></li>
</ul>
<p class="footer__design">
<span class="footer__design-caption">Дизайн сайта:</span>
Expand Down
78 changes: 50 additions & 28 deletions src/styles/blocks/footer.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,32 @@

.footer {
display: grid;
grid-template-rows: min-content 1fr;
grid-template-rows: 1fr min-content;
grid-template-columns: 1fr 1fr;
gap: 10px;
padding: 16px 8px;
gap: 16px;
padding: 16px 16px 24px;
color: var(--color-grey-lighter);
font-size: 12px;
line-height: 1.3;
background-color: var(--color-grey-dark);
}

@media (min-width: 1024px) {
@media (min-width: 500px) {
.footer {
font-size: 16px;
}
}

@media (min-width: 768px) {
.footer {
padding: 22px 48px 34px;
row-gap: 8px;
padding: 24px 24px 32px;
}
}

@media (min-width: 1000px) {
.footer {
padding: 24px 32px 32px;
}
}

Expand All @@ -24,16 +39,16 @@
}

.footer__link[href]:link {
color: var(--color-grey-lightest);
color: white;
}

.footer__link[href]:visited {
color: white;
color: var(--color-grey-lightest);
}

@media (hover: hover) and (pointer: fine) {
.footer__link[href]:hover {
color: white;
color: var(--color-grey-lightest);
}
}

Expand All @@ -47,8 +62,6 @@
grid-row: 1 / auto;
grid-column: 1 / 2;
margin: 0;
font-size: 16px;
line-height: 1.3;
}

.footer__organization {
Expand All @@ -67,19 +80,17 @@
.footer__design {
grid-column: 1 / 2;
margin: 0;
font-size: 14px;
line-height: 1.3;
}

@media (min-width: 500px) {
@media (min-width: 768px) {
.footer__design {
font-size: 16px;
grid-column: 2;
}
}

@media (min-width: 1024px) {
@media (min-width: 1000px) {
.footer__design {
grid-column: 2;
padding: 0 0 0 90px;
}
}

Expand All @@ -96,29 +107,40 @@
/* Pages */

.footer__pages {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(120px, 1fr));
grid-auto-rows: max-content;
grid-row: 1 / -1;
grid-column: 2 / 3;
row-gap: 18px;
margin: 0;
padding: 0;
font-size: 14px;
column-gap: 18px;
list-style: none;
}

@media (min-width: 500px) {
.footer__page {
display: block;
margin: 0 0 16px 0;
}

.footer__page:last-child {
margin: 0;
}

@media (min-width: 768px) {
.footer__pages {
font-size: 16px;
grid-row: 1;
}

.footer__page {
display: inline-block;
margin: 0 0 8px 0;
padding: 0 8px 0 0;
}

.footer__page:last-child {
margin: 0 0 8px 0;
}
}

@media (min-width: 1024px) {
@media (min-width: 1000px) {
.footer__pages {
grid-template-columns: initial;
grid-auto-columns: max-content;
grid-auto-flow: column;
padding: 0 0 0 90px;
}
}