diff --git a/_includes/author-bio.html b/_includes/author-profile.html similarity index 91% rename from _includes/author-bio.html rename to _includes/author-profile.html index aa7f759b..fe12998a 100644 --- a/_includes/author-bio.html +++ b/_includes/author-profile.html @@ -4,14 +4,14 @@
- {% if author.avatar contains 'http' %} - {{ author.name }} bio photo + {% if author.avatar contains "http" %} + {{ author.name }} photo {% else %} - {{ author.name }} bio photo + {{ author.name }} photo {% endif %} -

{{ author.name }}

- {% if author.bio %}

{{ author.bio }}

{% endif %} +

{{ author.name }}

+ {% if author.bio %}

{{ author.bio }}

{% endif %} {% if author.email %} Email {% endif %} diff --git a/_layouts/default.html b/_layouts/default.html index b5757f80..5d137496 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -6,7 +6,7 @@ {% include head.html %} - + {% include browser-upgrade.html %} {% include navigation.html %} @@ -14,7 +14,7 @@ {% if page.image.feature %}
-
- {% include author-bio.html %} +
+ {% include author-profile.html %}
{{ content }}
diff --git a/_layouts/home.html b/_layouts/home.html index 6b12e7d7..00318149 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -4,7 +4,7 @@ layout: default {% include absolute-url.liquid %} -
+

Recent Posts

{% for post in site.posts limit:5 %}
diff --git a/_layouts/post-index.html b/_layouts/post-index.html index 66c55b05..36155a91 100644 --- a/_layouts/post-index.html +++ b/_layouts/post-index.html @@ -4,7 +4,7 @@ layout: default {% include absolute-url.liquid %} -
+

{{ page.title }}

{% capture written_year %}'None'{% endcapture %} {% for post in site.posts %} @@ -22,4 +22,4 @@ layout: default {% endif %}
{% endfor %} -
\ No newline at end of file +
\ No newline at end of file diff --git a/_sass/page.scss b/_sass/page.scss index abc8327b..b1dc5423 100644 --- a/_sass/page.scss +++ b/_sass/page.scss @@ -247,8 +247,8 @@ $button-size: 1.5rem; } } -/* Index listing specific styling */ -#index { +/* Archive listing specific styling */ +.archive { @include container; @include grid(12,10); @include prefix(12,1); @@ -342,23 +342,47 @@ $button-size: 1.5rem; clear: both; font-size: 80%; } -.article-author-side, -.article-author-bottom { - h3 { - margin-bottom: 0; - } - p { - font-size: 80%; - font-style: italic; - } + +/* Author profile */ +.author-profile { + display: none; a, a:hover { border-bottom: 0 solid transparent; } + @media #{$small} { + display: block; + @include grid(12,2); + @include prefix(12,0.5); + @include suffix(12,0.5); + } + @media #{$x-large} { + @include grid(12,1.5); + @include prefix(12,2); + } +} + +.author-name { + margin-bottom: 0; + @media #{$small} { + margin-top: 10px; + margin-bottom: 10px; + } +} + +.author-bio { + font-size: 80%; + font-style: italic; + @media #{$small} { + margin-bottom: 20px; + } +} + +.author-avatar { + max-width: 110px; + @include rounded(150px); } -/* Default social media links in author sidebar */ .author-social { - display: block; margin-bottom: 5px; @include font-rem(14); color: $black; @@ -376,72 +400,17 @@ $button-size: 1.5rem; } } -/* Author sidebar */ -.article-author-side { - display: none; - .bio-photo { - max-width: 110px; - @include rounded(150px); - } - @media #{$small} { - display: block; - @include grid(12,2); - @include prefix(12,0.5); - @include suffix(12,0.5); - h3, - p, - .author-social { - display: block; - max-width: 125px; - } - h3 { - margin-top: 10px; - margin-bottom: 10px; - } - p { - margin-bottom: 20px; - } - .author-social { - margin-bottom: 5px; - } - } - @media #{$large} { - h3, - .bio-photo, - p, - .author-social { - max-width: 150px; - } - } - @media #{$x-large} { - @include grid(12,1.5); - @include prefix(12,2); - } +@media #{$small} { + display: block; + max-width: 125px; } -/* Author module - mobile only */ -.article-author-bottom { - margin-bottom: 1em; - @media #{$small} { - display: none; - } - .bio-photo { - float: left; - margin-right: 25px; - max-width: 100px; - @include rounded(150px); - } +@media #{$large} { + .author-name, + .author-avatar, + .author-bio, .author-social { - display: inline-block; - margin-right: 10px; - } - @media #{$large} { - h3, - .bio-photo, - p, - .author-social { - max-width: 150px; - } + max-width: 150px; } }