Simplify styling

This commit is contained in:
Michael Rose 2016-03-19 21:50:18 -04:00
parent 109f4ffb44
commit d5ce1b2226
8 changed files with 52 additions and 43 deletions

View file

@ -15,11 +15,13 @@
{% capture page_categories %}{% for category in page.categories %}{{ category | downcase }}#{{ category }}{% unless forloop.last %},{% endunless %}{% endfor %}{% endcapture %} {% capture page_categories %}{% for category in page.categories %}{{ category | downcase }}#{{ category }}{% unless forloop.last %},{% endunless %}{% endfor %}{% endcapture %}
{% assign category_hashes = (page_categories | split: ',' | sort:0) %} {% assign category_hashes = (page_categories | split: ',' | sort:0) %}
<p class="page__taxonomy"><strong>{{ site.data.ui-text[site.locale].categories_label }}</strong> <span itemprop="keywords"> <p class="page__taxonomy">
{% if site.data.ui-text[site.locale].categories_label %}<strong>{{ site.data.ui-text[site.locale].categories_label }} </strong>{% endif %}
<span itemprop="keywords">
{% for hash in category_hashes %} {% for hash in category_hashes %}
{% assign keyValue = hash | split: '#' %} {% assign keyValue = hash | split: '#' %}
{% capture category_word %}{{ keyValue[1] | strip_newlines }}{% endcapture %} {% capture category_word %}{{ keyValue[1] | strip_newlines }}{% endcapture %}
<a href="{{ base_path }}{{ category_word | slugify | prepend: path_type | prepend: site.categories.path }}" class="page__taxonomy-item" rel="tag">{{ category_word }}</a>{% unless forloop.last %}, {% endunless %} <a href="{{ base_path }}{{ category_word | slugify | prepend: path_type | prepend: site.categories.path }}" class="page__taxonomy-item" rel="tag">{{ category_word }}</a>{% unless forloop.last %}<span class="sep">, </span>{% endunless %}
{% endfor %} {% endfor %}
</span> </span>
</p> </p>

View file

@ -15,11 +15,13 @@
{% capture page_tags %}{% for tag in page.tags %}{{ tag | downcase }}#{{ tag }}{% unless forloop.last %},{% endunless %}{% endfor %}{% endcapture %} {% capture page_tags %}{% for tag in page.tags %}{{ tag | downcase }}#{{ tag }}{% unless forloop.last %},{% endunless %}{% endfor %}{% endcapture %}
{% assign tag_hashes = (page_tags | split: ',' | sort:0) %} {% assign tag_hashes = (page_tags | split: ',' | sort:0) %}
<p class="page__taxonomy"><strong>{{ site.data.ui-text[site.locale].tags_label }}</strong> <span itemprop="keywords"> <p class="page__taxonomy">
{% if site.data.ui-text[site.locale].tags_label %}<strong>{{ site.data.ui-text[site.locale].tags_label }} </strong>{% endif %}
<span itemprop="keywords">
{% for hash in tag_hashes %} {% for hash in tag_hashes %}
{% assign keyValue = hash | split: '#' %} {% assign keyValue = hash | split: '#' %}
{% capture tag_word %}{{ keyValue[1] | strip_newlines }}{% endcapture %} {% capture tag_word %}{{ keyValue[1] | strip_newlines }}{% endcapture %}
<a href="{{ base_path }}{{ tag_word | slugify | prepend: path_type | prepend: site.tags.path }}" class="page__taxonomy-item" rel="tag">{{ tag_word }}</a>{% unless forloop.last %}, {% endunless %} <a href="{{ base_path }}{{ tag_word | slugify | prepend: path_type | prepend: site.tags.path }}" class="page__taxonomy-item" rel="tag">{{ tag_word }}</a>{% unless forloop.last %}<span class="sep">, </span>{% endunless %}
{% endfor %} {% endfor %}
</span> </span>
</p> </p>

View file

@ -19,8 +19,6 @@ layout: default
{% if page.link %}<div><a href="{{ page.link }}" class="btn">{{ site.data.ui-text[site.locale].ext_link_label }}</a></div>{% endif %} {% if page.link %}<div><a href="{{ page.link }}" class="btn">{{ site.data.ui-text[site.locale].ext_link_label }}</a></div>{% endif %}
</section> </section>
{% if site.share and page.share %}{% include social-share.html %}{% endif %}
<footer class="page__meta"> <footer class="page__meta">
{% if site.data.ui-text[site.locale].meta_label %} {% if site.data.ui-text[site.locale].meta_label %}
<h4 class="page__meta-title">{{ site.data.ui-text[site.locale].meta_label }}</h4> <h4 class="page__meta-title">{{ site.data.ui-text[site.locale].meta_label }}</h4>
@ -32,6 +30,8 @@ layout: default
<p class="page__date"><strong>{{ site.data.ui-text[site.locale].date_label }}</strong> <time datetime="{{ page.date | date_to_xmlschema }}">{{ page.date | date: "%B %d, %Y" }}</time></p> <p class="page__date"><strong>{{ site.data.ui-text[site.locale].date_label }}</strong> <time datetime="{{ page.date | date_to_xmlschema }}">{{ page.date | date: "%B %d, %Y" }}</time></p>
{% endif %} {% endif %}
</footer> </footer>
{% if site.share and page.share %}{% include social-share.html %}{% endif %}
</div> </div>
{% if site.comments.provider and page.comments %} {% if site.comments.provider and page.comments %}

View file

@ -21,8 +21,8 @@
.archive__subtitle { .archive__subtitle {
margin: 0; margin: 0;
padding-bottom: 0.5em; padding-bottom: 0.5em;
font-family: $serif; font-size: 14px;
font-size: 28px; color: mix(#fff, $gray, 25%);
border-bottom: 1px solid $border-color; border-bottom: 1px solid $border-color;
} }

View file

@ -14,8 +14,7 @@
margin: 2em 0; margin: 2em 0;
padding: 1em; padding: 1em;
background-color: mix(#fff, $notice-color, 90%); background-color: mix(#fff, $notice-color, 90%);
border-top: 0.25em solid mix(#fff, $notice-color, 50%); border-radius: $border-radius;
border-bottom: 0.25em solid mix(#fff, $notice-color, 50%);
h4 { h4 {
margin-top: 0 !important; // override margin-top: 0 !important; // override
margin-bottom: 0.75em; margin-bottom: 0.75em;

View file

@ -102,14 +102,8 @@
color: mix(#fff, $gray, 25%); color: mix(#fff, $gray, 25%);
font-family: $sans-serif; font-family: $sans-serif;
font-size: 14px; font-size: 14px;
a {
text-decoration: none;
&:hover {
text-decoration: underline;
}
}
p { p {
margin-bottom: 0; margin-bottom: 0.5em;
} }
} }
@ -120,6 +114,32 @@
} }
/*
Page taxonomy
========================================================================== */
.page__taxonomy {
.sep {
display: none;
}
}
.page__taxonomy-item {
display: inline-block;
margin-right: 5px;
margin-bottom: 8px;
padding: 5px 10px;
text-decoration: none;
border: 1px solid $light-gray;
border-radius: $border-radius;
&:hover {
text-decoration: none;
border-color: $gray;
}
}
/* /*
Comments Comments
========================================================================== */ ========================================================================== */

View file

@ -26,11 +26,7 @@
padding: 10px 20px; padding: 10px 20px;
font-family: $sans-serif-narrow; font-family: $sans-serif-narrow;
font-size: 16px; font-size: 16px;
color: #fff; border-bottom: 1px solid $border-color;
border: 1px solid $border-color;
border-top-left-radius: $border-radius;
border-top-right-radius: $border-radius;
background: $gray;
} }
.toc__menu { .toc__menu {
@ -38,10 +34,6 @@
padding: 0; padding: 0;
width: 100%; width: 100%;
list-style: none; list-style: none;
border: 1px solid $border-color;
border-top: none;
border-bottom-right-radius: $border-radius;
border-bottom-left-radius: $border-radius;
a { a {
display: block; display: block;
padding: 10px 20px; padding: 10px 20px;
@ -49,20 +41,14 @@
font-size: 11px; font-size: 11px;
font-weight: bold; font-weight: bold;
line-height: 1.5; line-height: 1.5;
border-left: 0.5em solid $gray;
border-bottom: 1px solid $border-color; border-bottom: 1px solid $border-color;
&:hover { &:hover {
color: #000; color: #000;
border-left: 0.5em solid $info-color;
background: mix(#fff, $info-color, 90%); background: mix(#fff, $info-color, 90%);
} }
} }
li ul > li a { li ul > li a {
font-weight: normal; font-weight: normal;
border-left: 0.5em solid mix(#fff, $gray, 25%);
}
li ul > li > ul > li a {
border-left: 0.5em solid mix(#fff, $gray, 50%);
} }
// hide sub sub links on small screens // hide sub sub links on small screens
li > ul li { li > ul li {

File diff suppressed because one or more lines are too long