From 5d1d04c52c014171b911c3d7c23108e64f0ee9df Mon Sep 17 00:00:00 2001
From: Brandon Mathis <brandon@imathis.com>
Date: Tue, 12 Jul 2011 19:40:57 -0400
Subject: 1. Made default layout more generic. 2. Added a page layout and
 improved html on post layout. 3. Improved flexibility of stylesheets for
 different layout types. 4. Collapsing sidebar now moves it to the bottom of
 the page and floats content into columns. 5. Improved sharing settings, added
 Google plus one.

---
 .themes/classic/sass/partials/_archive.scss      |  6 ++----
 .themes/classic/sass/partials/_blog.scss         | 25 +++++++++++-------------
 .themes/classic/sass/partials/_sharing.scss      |  7 +++++++
 .themes/classic/sass/partials/_syntax.scss       |  6 +++---
 .themes/classic/sass/partials/sidebar/_base.scss |  4 ++--
 5 files changed, 25 insertions(+), 23 deletions(-)
 create mode 100644 .themes/classic/sass/partials/_sharing.scss

(limited to '.themes/classic/sass/partials')

diff --git a/.themes/classic/sass/partials/_archive.scss b/.themes/classic/sass/partials/_archive.scss
index fbf0dac6..3a19af5d 100644
--- a/.themes/classic/sass/partials/_archive.scss
+++ b/.themes/classic/sass/partials/_archive.scss
@@ -1,4 +1,4 @@
-#articles .blog-archives {
+#blog-archives {
   article {
     padding: 1em 0 1em;
     position: relative;
@@ -57,13 +57,11 @@
       padding:{left: 4.5em; bottom: .7em;}
     }
   a.category {
-    //text-align: right;
     line-height: 1.1em;
-    //float: right;
     }
   }
 }
-#articles .blog-archives.category {
+#content > .category {
   article {
     margin-left: 0;
     padding-left: 6.8em;
diff --git a/.themes/classic/sass/partials/_blog.scss b/.themes/classic/sass/partials/_blog.scss
index 50fef177..c2c598ff 100644
--- a/.themes/classic/sass/partials/_blog.scss
+++ b/.themes/classic/sass/partials/_blog.scss
@@ -1,16 +1,17 @@
-#articles {
-  overflow: hidden;
-  ul, ol { margin-left: 1.4em; }
+#content {
+  article { ul, ol { margin-left: 1.4em; }}
   @media only screen and (min-width: 768px) {
     ul, ol { margin-left: 0; }
   }
-  > article {
+  > article, > div > article {
+    overflow: hidden;
     padding-bottom: 1em;
     &:last-child { margin-bottom: 0;  }
     h2 {
       padding-top: 0.8em;
       background: $img-border top left repeat-x;
-      &:first-child { background: none; padding-top: 0; }
+      .entry-content &:first-child { padding-top: 0; }
+      &:first-child { background: none; }
     }
     .byline + time:before, time +time:before, .comments:before, .byline ~ .categories:before {
       @extend .separator;
@@ -80,24 +81,20 @@
       }
     }
   }
-  iframe.twitter-share-button {
-    position: relative;
-    top: .3em;
-    padding-left: .5em;
-  }
-  > article > footer {
-    margin-top: 2em;
-    padding-top: 1em;
+  > div > article > footer {
     margin-bottom: 1.5em;
     background: $img-border top left repeat-x;
+    margin-top: 2em;
+    padding-top: 1em;
     @extend .sans;
+    p.meta { display: inline-block; font-size: .8em; }
   }
 
 }
 article + article {
   background: $img-border top left repeat-x;
 }
-#articles.blog-index {
+#content .blog-index {
   article header { background: none; padding-bottom: 0; }
   article h1 {
     font-size: 2.2em;
diff --git a/.themes/classic/sass/partials/_sharing.scss b/.themes/classic/sass/partials/_sharing.scss
new file mode 100644
index 00000000..58a4c30b
--- /dev/null
+++ b/.themes/classic/sass/partials/_sharing.scss
@@ -0,0 +1,7 @@
+footer .sharing {
+  display: inline-block;
+  position: relative;
+  top: .3em;
+  padding-left: .5em;
+  &:first-child { padding-left: 0; }
+}
diff --git a/.themes/classic/sass/partials/_syntax.scss b/.themes/classic/sass/partials/_syntax.scss
index 523010bd..02ad74ba 100644
--- a/.themes/classic/sass/partials/_syntax.scss
+++ b/.themes/classic/sass/partials/_syntax.scss
@@ -1,7 +1,7 @@
 .highlight, html .gist .gist-file .gist-syntax .gist-highlight {
   .line-numbers {
     text-align: right;
-    font-size: .8em;
+    font-size: 13px;
     line-height: 1.45em;
     background: $base02 $noise-bg !important;
     border-right: 1px solid darken($base03, 2) !important;
@@ -57,7 +57,7 @@ pre {
   @extend .mono;
   border: 1px solid $pre-border;
   line-height: 1.45em;
-  font-size: .8em;
+  font-size: 13px;
   margin-bottom: 1.5em;
   padding: .8em 1em;
   color: $pre-color;
@@ -73,7 +73,7 @@ p code {
   display: inline-block;
   white-space: no-wrap;
   background: #fff;
-  font-size: .9em;
+  font-size: .8em;
   line-height: 1.5em;
   color: #555;
   border: 1px solid #ddd;
diff --git a/.themes/classic/sass/partials/sidebar/_base.scss b/.themes/classic/sass/partials/sidebar/_base.scss
index 861efc91..6499611f 100644
--- a/.themes/classic/sass/partials/sidebar/_base.scss
+++ b/.themes/classic/sass/partials/sidebar/_base.scss
@@ -1,9 +1,9 @@
 .side-shadow-border {
   @include box-shadow(lighten($sidebar-bg, 5) 0 1px);
 }
-#articles + aside {
+#content > aside {
   color: $sidebar-color;
-  padding-top: 1.2em;
+  //padding-top: 1.2em;
   text-shadow: lighten($sidebar-bg, 8) 0 1px;
   section {
     @extend .sans;
-- 
cgit v1.2.1