Skip to content

Commit

Permalink
Fix header spacing when tag is showing
Browse files Browse the repository at this point in the history
Fixes #67
  • Loading branch information
piperhaywood committed Dec 4, 2019
1 parent 77d7fb4 commit a8672a9
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 9 deletions.
19 changes: 18 additions & 1 deletion src/_includes/assets/css/components.header.css
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@
justify-content: space-between;
}

.header--site .nav__list {
flex-wrap: wrap;
}

.nav__link {
border: none;
color: var(--color-grey-dark);
Expand All @@ -67,6 +71,14 @@
line-height: inherit;
}

.writing--tag .header--site .nav__item--writing {
padding-right: var(--gutter);
}

.writing--tag .header--desktop .nav__item--writing {
max-width: 34rem;
}

.writing--tag .nav__link--current {
color: var(--color-grey-dark);
padding-right: 0;
Expand All @@ -77,12 +89,17 @@
color: var(--color-1);
}

.writing--tag .panel {
.writing--tag .panel,
.writing--tag .nav__item {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}

.writing--tag .nav__item {
max-width: 100vw;
}

.skip-buttons:focus-within {
display: flex;
padding: var(--gutter) var(--gutter) 0 var(--gutter);
Expand Down
14 changes: 8 additions & 6 deletions src/_includes/components/header-writing.njk
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,23 @@

<div class="header header--desktop" id="top" aria-hidden="true">
<div class="panel">
{% set linkUrl = '/writing/' %}
{% set linkText = 'Writing' %}
{% set current = true %}
{% include "components/nav-link.njk" %}{% if tag %}<span class="color-grey"> &mdash; </span>{{ tag }}{% endif %}
<div class="nav__item nav__item--writing">
{% set linkUrl = '/writing/' %}
{% set linkText = 'Writing' %}
{% set current = true %}
{% include "components/nav-link.njk" %}{% if tag %}<span class="color-grey"> &mdash; </span>{{ tag }}{% endif %}
</div>
</div>
<div class="panel">
<nav class="nav">
<ul class="nav__list">
<li class="nav__item">
<li class="nav__item nav__item--thinking">
{% set linkUrl = '/thinking/' %}
{% set linkText = 'Thinking' %}
{% set current = false %}
{% include "components/nav-link.njk" %}
</li>
<li class="nav__item">
<li class="nav__item nav__item--home">
{% set linkUrl = '/' %}
{% set linkText = global.siteTitle %}
{% set current = false %}
Expand Down
4 changes: 2 additions & 2 deletions src/_includes/components/header.njk
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
{%- endif -%}
<nav class="nav">
<ul class="nav__list">
<li class="nav__item">
<li class="nav__item nav__item--thinking">
{% set linkUrl = '/thinking/' %}
{% set linkText = 'Thinking' %}
{% set current = section == 'thinking' %}
{% include "components/nav-link.njk" %}
</li>
<li class="nav__item">
<li class="nav__item nav__item--writing">
{% set linkUrl = '/writing/' %}
{% set linkText = 'Writing' %}
{% set current = section == 'writing' or section == 'post' %}
Expand Down

0 comments on commit a8672a9

Please sign in to comment.