From 6b9c3af4b596bb5180214ce634043e55e8d34818 Mon Sep 17 00:00:00 2001
From: B Mathis <brandon@imathis.com>
Date: Sat, 7 Nov 2009 23:25:12 -0600
Subject: [PATCH] reorganized css, changed typography, layout fixes

---
 source/_layouts/default.haml         |  2 +-
 source/index.haml                    |  4 ++--
 stylesheets/_layout.sass             | 25 ++++++-------------------
 stylesheets/_partials.sass           |  5 +++--
 stylesheets/_typography.sass         |  7 ++++---
 stylesheets/library/_typography.sass |  2 +-
 stylesheets/partials/_blog.sass      |  8 ++++++++
 stylesheets/partials/_sidebar.sass   | 14 +++++++++-----
 8 files changed, 34 insertions(+), 33 deletions(-)
 create mode 100644 stylesheets/partials/_blog.sass

diff --git a/source/_layouts/default.haml b/source/_layouts/default.haml
index 1dc52ff..540ed28 100644
--- a/source/_layouts/default.haml
+++ b/source/_layouts/default.haml
@@ -79,7 +79,7 @@ google_analytics: true
                 Status updating...
     #footer
       .page_width
-        = "Copyright &copy; #{Time.now.strftime('%Y')} - #{page.blog_title} | "
+        Copyright &copy; #{Time.now.strftime('%Y')} - #{page.blog_title} -
         %span.credit Powered by <a href="http://github.com/imathis/octopress/">Octopress</a>
     - if page.respond_to? :disqus_short_name
       //Disqus Commens code
diff --git a/source/index.haml b/source/index.haml
index ad7cc11..f781d4e 100644
--- a/source/index.haml
+++ b/source/index.haml
@@ -7,8 +7,8 @@ title: Blog
     .article
       %h2= link_to(post.title, post.url, {:class=>"title"})
       = post.content
-      .footer
-        - if page.respond_to? :disqus_short_name
+      - if page.respond_to? :disqus_short_name
+        .footer
           - if post.data["comments_off"]
             %em.comments_off Comments disabled
           - else
diff --git a/stylesheets/_layout.sass b/stylesheets/_layout.sass
index ab06b65..1b57761 100644
--- a/stylesheets/_layout.sass
+++ b/stylesheets/_layout.sass
@@ -10,10 +10,6 @@ html body
   a
     color= !link_color
 
-#footer a
-  color= #ddd
-  &:hover
-    color = #fff
 #header
   background-color= !header_bg
   border-bottom= "1px solid" !header_border
@@ -91,23 +87,10 @@ html body
       right= "1px solid" !page_border_sides
 #main
   width= !page_width - !sidebar_width - !sidebar_margin
-#sidebar
-  width= !sidebar_width
-  margin-left= !sidebar_margin
 
-#main, #sidebar
+#main
   float: left
 
-.blog
-  .article
-    padding= !base_font_size * 1.5 0 !base_font_size * 1.5
-    border-bottom= "1px solid" !article_border
-    &:first-child
-      padding-top: 0
-  .footer
-    padding-top= !base_font_size
-
-
 #footer
   position: relative
   z-index: 2
@@ -116,4 +99,8 @@ html body
   padding= !base_font_size * 1.5 0
   color= !footer_color
   +h-linear-gradient(darken(!body_bg, 25), !body_bg)
-  border-top= "14px solid" !footer_bg
\ No newline at end of file
+  border-top= "14px solid" !footer_bg
+  a
+    color= #ddd
+    &:hover
+      color = #fff
\ No newline at end of file
diff --git a/stylesheets/_partials.sass b/stylesheets/_partials.sass
index cb52369..5a2b966 100644
--- a/stylesheets/_partials.sass
+++ b/stylesheets/_partials.sass
@@ -1,3 +1,4 @@
-@import partials/twitter.sass
+@import partials/blog.sass
 @import partials/search.sass
-@import partials/sidebar.sass
\ No newline at end of file
+@import partials/sidebar.sass
+@import partials/twitter.sass
\ No newline at end of file
diff --git a/stylesheets/_typography.sass b/stylesheets/_typography.sass
index b5fcd56..3578b32 100644
--- a/stylesheets/_typography.sass
+++ b/stylesheets/_typography.sass
@@ -10,16 +10,17 @@
   +serif-font
 
 body
-  font-size= !base_font_size
-  +sans-font
+  font-size= !base_font_size +2
+  +serif-font
   
 h1,h2,h3,h4,h5,h6
   color: #333
   font-weight: bold
   +heading-font
+  letter-spacing: -1px
 
 blockquote
-  +heading-font
+  +quote-font
   font-size= !base_font_size * 1.2
 .quote blockquote
   font-size= !h4
diff --git a/stylesheets/library/_typography.sass b/stylesheets/library/_typography.sass
index 34634ac..d78f869 100644
--- a/stylesheets/library/_typography.sass
+++ b/stylesheets/library/_typography.sass
@@ -14,7 +14,7 @@
 =sans-font
   font-family: "Lucida Grande", "Lucida Sans Unicode", "Trebuchet MS", Helvetica, Arial, Verdana, sans-serif
 =serif-font
-  font-family: Times, "Times New Roman" Georgia, serif
+  font-family: Georgia, Times, "Times New Roman", serif
 =fixed-font
   font-family: "Menlo", "Bitstream Vera Sans", Monaco, "Andale Mono", "Lucida Console", monospace
 
diff --git a/stylesheets/partials/_blog.sass b/stylesheets/partials/_blog.sass
new file mode 100644
index 0000000..34ec6da
--- /dev/null
+++ b/stylesheets/partials/_blog.sass
@@ -0,0 +1,8 @@
+.blog
+  .article
+    padding= !base_font_size * 1.5 0 !base_font_size * 1.5
+    border-bottom= "1px solid" !article_border
+    &:first-child
+      padding-top: 0
+  .footer
+    padding-top= !base_font_size
\ No newline at end of file
diff --git a/stylesheets/partials/_sidebar.sass b/stylesheets/partials/_sidebar.sass
index b9513e2..919725d 100644
--- a/stylesheets/partials/_sidebar.sass
+++ b/stylesheets/partials/_sidebar.sass
@@ -1,7 +1,11 @@
 #sidebar
+  float: left
+  width= !sidebar_width
   padding-top: 10px
-h4
-  margin: 0
-  .small
-    +sans-font
-    font-size: 50%
\ No newline at end of file
+  margin-left= !sidebar_margin
+  
+  h4
+    margin: 0
+    .small
+      +sans-font
+      font-size: 50%
\ No newline at end of file