From 87f300b2bcf166474e5f7824fb3126a7992613ba Mon Sep 17 00:00:00 2001 From: Brandon Mathis Date: Wed, 13 Jul 2011 22:23:19 -0400 Subject: [PATCH] 1. Styled pagination for blog index 2. Fixed Newer pagination link on page 2 3. Improved sidebar section breakdown on collapse 4. Removed sharing links from the blog index page (moved to pages) 5. Improved styling for metadata on the blog index 6. Moved /blog/archives.html to /blog/archives/index.html 7. Improved responsive layout styling bugs --- .themes/classic/sass/base/_layout.scss | 7 +--- .themes/classic/sass/base/_theme.scss | 4 +- .themes/classic/sass/partials/_blog.scss | 38 +++++++++++++++---- .../classic/sass/partials/_navigation.scss | 2 +- .themes/classic/sass/partials/_sharing.scss | 11 +++--- .themes/classic/source/_includes/article.html | 15 +++----- .../classic/source/_includes/navigation.html | 2 +- .../source/_includes/post_categories.html | 2 +- .../{archives.html => archives/index.html} | 0 .themes/classic/source/index.html | 18 +++++---- .../classic/source/javascripts/octopress.js | 2 +- _config.yml | 6 +-- 12 files changed, 62 insertions(+), 45 deletions(-) rename .themes/classic/source/blog/{archives.html => archives/index.html} (100%) diff --git a/.themes/classic/sass/base/_layout.scss b/.themes/classic/sass/base/_layout.scss index 64344c8..d1545e8 100644 --- a/.themes/classic/sass/base/_layout.scss +++ b/.themes/classic/sass/base/_layout.scss @@ -19,7 +19,7 @@ body { max-width: $max-width; position: relative; margin: 0 auto; - > header, > nav, > footer, #content > article, #content > div > article, #content > div > nav { + > header, > nav, > footer, #content > article, #content > div > article, #content > div > section, nav[role=pagination] { @extend .group; padding-left: $pad-min; padding-right: $pad-min; @@ -59,11 +59,6 @@ body { body > header { font-size: 1em; } #content aside { @extend .group; - section { - &.odd, &.even { float: left; width: 48%; } - &.odd { margin-left: 0; } - &.even { margin-left: 4%; } - } } } @media only screen and (min-width: 768px) { diff --git a/.themes/classic/sass/base/_theme.scss b/.themes/classic/sass/base/_theme.scss index 27a6aab..0afa111 100644 --- a/.themes/classic/sass/base/_theme.scss +++ b/.themes/classic/sass/base/_theme.scss @@ -4,7 +4,7 @@ $img-border: inline-image('dotted-border.png'); // Main Link Colors $link-color: lighten(#165b94, 3) !default; $link-color-hover: adjust-color($link-color, $lightness: 10, $saturation: 25) !default; -$link-color-visited: adjust-color($link-color, $hue: 80, $lightness: -2) !default; +$link-color-visited: adjust-color($link-color, $hue: 80, $lightness: -4) !default; $link-color-active: adjust-color($link-color-hover, $lightness: -15) !default; // Main Section Colors @@ -38,7 +38,7 @@ $nav-border-left: darken($nav-bg, 11) !default; $nav-border-right: lighten($nav-bg, 7) !default; /* Sidebar colors */ -$sidebar-bg: #eee !default; +$sidebar-bg: #f2f2f2 !default; $sidebar-link-color: $link-color !default; $sidebar-link-color-hover: $link-color-hover !default; $sidebar-color: change-color(mix($text-color, $sidebar-bg, 80), $hue: hue($sidebar-bg), $saturation: saturation($sidebar-bg)/2) !default; diff --git a/.themes/classic/sass/partials/_blog.scss b/.themes/classic/sass/partials/_blog.scss index c2c598f..39dcecd 100644 --- a/.themes/classic/sass/partials/_blog.scss +++ b/.themes/classic/sass/partials/_blog.scss @@ -5,8 +5,7 @@ } > article, > div > article { overflow: hidden; - padding-bottom: 1em; - &:last-child { margin-bottom: 0; } + padding-top: 1em; h2 { padding-top: 0.8em; background: $img-border top left repeat-x; @@ -32,16 +31,16 @@ font-size: .9em; color: $text-color-light; margin: 0; - @extend .sans; &.meta { + @extend .sans; text-transform: uppercase; + position: absolute; top: 0; } } @media only screen and (min-width: 768px) { margin-bottom: 1.5em; padding-bottom: 1em; background: $img-border bottom left repeat-x; - p.meta { position: absolute; top: 0; } } } .feature { @@ -82,12 +81,13 @@ } } > div > article > footer { - margin-bottom: 1.5em; - background: $img-border top left repeat-x; + padding-bottom: 2.5em; margin-top: 2em; - padding-top: 1em; @extend .sans; - p.meta { display: inline-block; font-size: .8em; } + p.meta { + margin-bottom: .8em; + font-size: .85em; + } } } @@ -95,6 +95,8 @@ article + article { background: $img-border top left repeat-x; } #content .blog-index { + padding: { top: 0; bottom: 0; } + article { padding-top: 2em; } article header { background: none; padding-bottom: 0; } article h1 { font-size: 2.2em; @@ -126,3 +128,23 @@ article + article { padding: 0 .4em 0 .2em; display: inline-block; } + +nav[role=pagination] { + text-align: center; + font-size: .95em; + div { + position: relative; + background: $img-border top left repeat-x; + padding: {top: 1.5em; bottom: 1.5em;} + } + a { + text-decoration: none; + color: $text-color-light; + &.prev { position: absolute; left: 0; } + &.next { position: absolute; right: 0; } + &:hover { color: $link-color-hover; } + &[href*=archive] { + &:before, &:after { content: '\2014'; padding: 0 .3em; } + } + } +} diff --git a/.themes/classic/sass/partials/_navigation.scss b/.themes/classic/sass/partials/_navigation.scss index be13256..fca6132 100644 --- a/.themes/classic/sass/partials/_navigation.scss +++ b/.themes/classic/sass/partials/_navigation.scss @@ -86,7 +86,7 @@ body > nav { .search { width: 91%; } } fieldset[role=mobile-nav] { display: none; } - fieldset[role=site-search]{ width: 100%; } + fieldset[role=site-search]{ width: 99%; } } @media only screen and (min-width: 992px) { diff --git a/.themes/classic/sass/partials/_sharing.scss b/.themes/classic/sass/partials/_sharing.scss index 58a4c30..1fa9775 100644 --- a/.themes/classic/sass/partials/_sharing.scss +++ b/.themes/classic/sass/partials/_sharing.scss @@ -1,7 +1,6 @@ -footer .sharing { - display: inline-block; - position: relative; - top: .3em; - padding-left: .5em; - &:first-child { padding-left: 0; } +.sharing { + p.meta + & { + padding: { top: 1em; left: 0; } + background: $img-border top left repeat-x; + } } diff --git a/.themes/classic/source/_includes/article.html b/.themes/classic/source/_includes/article.html index b458d73..603c2f9 100644 --- a/.themes/classic/source/_includes/article.html +++ b/.themes/classic/source/_includes/article.html @@ -5,20 +5,17 @@ {% else %}

{{ page.title | titlecase }}

{% endif %} - {% unless page.no_meta or !index %}

{% include post_date.html %}

{% endunless %} + {% unless page.no_meta %} +

{% include post_date.html %}

+ {% endunless %} + {% if index %} + {% endif %} {% endunless %} {% if index %}
{{ content | exerpt | smart_quotes }}
-

Read on →

{% else %}
{{ content | smart_quotes }}
diff --git a/.themes/classic/source/_includes/navigation.html b/.themes/classic/source/_includes/navigation.html index 6c8efaa..ec18512 100644 --- a/.themes/classic/source/_includes/navigation.html +++ b/.themes/classic/source/_includes/navigation.html @@ -12,5 +12,5 @@ diff --git a/.themes/classic/source/_includes/post_categories.html b/.themes/classic/source/_includes/post_categories.html index 7bf7528..4a98b29 100644 --- a/.themes/classic/source/_includes/post_categories.html +++ b/.themes/classic/source/_includes/post_categories.html @@ -1,6 +1,6 @@ {% capture category %}{% if post %}{{ post.categories | category_links | size }}{% else %}{{ page.categories | category_links | size }}{% endif %}{% endcapture %} {% unless category == '0' %} - in + {% if post %} {{ post.categories | category_links }} {% else %} diff --git a/.themes/classic/source/blog/archives.html b/.themes/classic/source/blog/archives/index.html similarity index 100% rename from .themes/classic/source/blog/archives.html rename to .themes/classic/source/blog/archives/index.html diff --git a/.themes/classic/source/index.html b/.themes/classic/source/index.html index 3f6b11b..8754a82 100644 --- a/.themes/classic/source/index.html +++ b/.themes/classic/source/index.html @@ -11,13 +11,17 @@ blog_index: true {% endfor %} {% if site.disqus_short_name %}