updated about page to explain markdown filter, added more theme colors

4 files changed, 20 insertions, 22 deletions

diff --git a/source/about.haml b/source/about.haml
index bc272ebb..0a5e431f 100644
--- a/source/about.haml
+++ b/source/about.haml
@@ -2,6 +2,7 @@
 layout: default
 title: About Me
 ---
+/ use the :mardown filter if you want to write pages with Markdown
 :markdown
   # About Me
 
diff --git a/source/stylesheets/partials/main/_layout.sass b/source/stylesheets/partials/main/_layout.sass
index 3fbb3f96..31548d66 100644
--- a/source/stylesheets/partials/main/_layout.sass
+++ b/source/stylesheets/partials/main/_layout.sass
@@ -43,8 +43,8 @@ html body
     overflow: visible
     li
       padding: 0 15px
-      border-left: 1px solid #d3d3d3
-      border-right: 1px solid #f4f4f4
+      border-left= "1px solid" !nav_border_left
+      border-right= "1px solid" !nav_border_right
       &.alpha
         border-left: none
         padding-left: 0
@@ -80,14 +80,18 @@ html body
     padding:
       top: 25px
       bottom: 25px
-    background-color= !content_bg
+    background-color= !blog_bg
     +box-shadow(#ccc)
+    border:
+      left= "1px solid" !page_border_sides
+      right= "1px solid" !page_border_sides
+.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
-  .blog .footer
+  .footer
     padding-top= !base_font_size
 
 
diff --git a/source/stylesheets/partials/main/_theme.sass b/source/stylesheets/partials/main/_theme.sass
index 2feff314..b159019e 100644
--- a/source/stylesheets/partials/main/_theme.sass
+++ b/source/stylesheets/partials/main/_theme.sass
@@ -1,3 +1,6 @@
+// Link Colors
+!link_color = #165B94
+
 // Main Section Colors
 !body_color = #333
 !body_bg = #323232
@@ -11,20 +14,21 @@
 !nav_bg = #e8e8e8
 !nav_border_top = #fff
 !nav_border_bottom = #aaa
+!nav_border_left = #ccc
+!nav_border_right = #fff
 
-!page_border = #fff
+!page_border_sides = #ccc
 !page_bg = #f0f0f0
+
+// Blog 
 !article_border = #eee
-!content_bg = #fff
+!blog_bg = #fff
 
 !footer_color = #999
 !footer_bg = #444
 
-// Link Colors
-!link_color = #165B94
-
 // Form Colors
-!fieldset_bg = #fff
+!fieldset_bg = #ececec
 !fieldset_border = #c3c3c3
 
 !textinput_color = #333
@@ -42,14 +46,4 @@
 // Button Colors
 !default_button_text_color = #fff
 !default_button_bg = yellow
-!blue_btn = desaturate(adjust_hue(!default_button_bg, -16), 25)
-
-// Flash Message Colors
-!flash_notice   	= #00529B
-!flash_notice_bg  = #BDE5F8
-!flash_success    = #4F8A10
-!flash_success_bg = #DFF2BF
-!flash_warning    = #FBF4BD
-!flash_warning_bg = #FBF4BD
-!flash_error      = #D8000C
-!flash_error_bg   = #FFD9DA
\ No newline at end of file
+!blue_btn = desaturate(adjust_hue(!default_button_bg, -16), 25)
\ No newline at end of file
diff --git a/source/typography.haml b/source/typography.haml
index 4f7c2e34..f7e7b17b 100644
--- a/source/typography.haml
+++ b/source/typography.haml
@@ -36,7 +36,6 @@ title: Typography Debug
   %abbr(title="For The Win!") FTW!
 %p
   
-
 %h3 Unordered lists
 %ul
   %li Lorem ipsum dolor sit amet