octopress.diff

commit c503be473c95fc5a0f3634bf4a1557e5dd1357ed
Author: Derek Zeng <[email protected]>
Date:   Fri May 10 15:45:54 2013 +0800

    save

diff --git a/sass/base/_theme.scss b/sass/base/_theme.scss
index 1a43a03..9765d08 100644
--- a/sass/base/_theme.scss
+++ b/sass/base/_theme.scss
@@ -9,7 +9,8 @@ $link-color-active: adjust-color($link-color-hover, $lightness: -15) !default;
 
 // Main Section Colors
 $main-bg: #f8f8f8 !default;
-$page-bg: #252525 !default;
+$page-bg: #f8f8f8 !default;
+/*$page-bg: #252525 !default;*/
 $article-border: #eeeeee !default;
 
 $header-bg: #333 !default;
diff --git a/sass/custom/_colors.scss b/sass/custom/_colors.scss
index 740266a..255c4b4 100644
--- a/sass/custom/_colors.scss
+++ b/sass/custom/_colors.scss
@@ -2,9 +2,10 @@
 // To give it a try, uncomment some of the lines below rebuild your blog, and see how it works.
 // If you need a handy color picker try http://hslpicker.com
 
-//$header-bg: #263347;
+$header-bg: #878788;
 //$subtitle-color: lighten($header-bg, 58);
 //$nav-bg: desaturate(lighten(#8fc17a, 18), 5);
+$nav-bg: lighten(#000000, 50%);
 //$nav-bg-front: image-url('noise.png');
 //$nav-bg-back: linear-gradient(lighten($nav-bg, 8), $nav-bg, darken($nav-bg, 11));
 //$sidebar-bg: desaturate(#eceff5, 8);
@@ -19,12 +20,12 @@
 //$solarized: light;
 
 /* If you want to tweak the Solarized colors you can do that here */
-//$base03:          #002b36; //darkest blue
-//$base02:          #073642; //dark blue
-//$base01:          #586e75; //darkest gray
+$base03:          #002b36; //darkest blue
+$base02:          #073642; //dark blue
+$base01:          #586e75; //darkest gray
 //$base00:          #657b83; //dark gray
 //$base0:           #839496; //medium gray
-//$base1:           #93a1a1; //medium light gray
+$base1:           #93a1a1; //medium light gray
 //$base2:           #eee8d5; //cream
 //$base3:           #fdf6e3; //white
 //$solar-yellow:    #b58900;
@@ -38,6 +39,6 @@
 
 
 /* Non highlighted code colors */
-//$pre-bg: $base03;
-//$pre-border: darken($base02, 5);
-//$pre-color: $base1;
+$pre-bg: $base03;
+$pre-border: darken($base02, 5);
+$pre-color: $base1;
diff --git a/sass/custom/_layout.scss b/sass/custom/_layout.scss
index 74c7de9..6c95e97 100644
--- a/sass/custom/_layout.scss
+++ b/sass/custom/_layout.scss
@@ -1,18 +1,18 @@
 // Here you can easily change your sites's layout.
 // To give it a try, uncomment some of the lines below, make changes, rebuild your blog, and see how it works.
 
-//$header-font-size: 1em;
-//$header-padding-top: 1.5em;
-//$header-padding-bottom: 1.5em;
+$header-font-size: 1em;
+$header-padding-top: 1.5em;
+$header-padding-bottom: 1.5em;
 
 //$max-width: 1350px;
-//$indented-lists: true;
+$indented-lists: true;
 
 // Padding used for layout margins
-//$pad-min: 18px;
-//$pad-narrow: 25px;
-//$pad-medium: 35px;
-//$pad-wide: 55px;
+$pad-min: 4px;
+$pad-narrow: 10px;
+$pad-medium: 20px;
+$pad-wide: 25px;
 
 // Sidebar widths used in media queries
 //$sidebar-width-medium: 240px;
diff --git a/sass/custom/_styles.scss b/sass/custom/_styles.scss
index 91ffccc..1a173e4 100644
--- a/sass/custom/_styles.scss
+++ b/sass/custom/_styles.scss
@@ -1,2 +1,33 @@
 // This File is imported last, and will override other styles in the cascade
 // Add styles here to make changes without digging in too much
+
+body {
+  margin-top: 10px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  -ms-border-radius: 5px;
+  -o-border-radius: 5px;
+  border-radius: 5px;
+  -webkit-box-shadow: 0 2px 9px 2px #444;
+  -moz-box-shadow: 0 2px 9px 2px #444;
+  box-shadow: 0 2px 9px 2px #444;
+  background-color: #fff;
+  header {
+    h1 {
+      display: inline-block;
+      margin: 0;
+      font-size: 1.5em;
+      a, a:visited, a:hover {
+        color: $title_color;
+        text-decoration: none;
+      }
+    }
+    h2 {
+      margin: .2em 0 0;
+      @extend .sans;
+      font-size: 1em;
+      color: $subtitle-color;
+      font-weight: normal;
+    }
+  }
+}
\ No newline at end of file
diff --git a/source/_layouts/default.html b/source/_layouts/default.html
index f23b07b..4502093 100644
--- a/source/_layouts/default.html
+++ b/source/_layouts/default.html
@@ -1,8 +1,8 @@
 {% capture root_url %}{{ site.root | strip_slash }}{% endcapture %}
 {% include head.html %}
 <body {% if page.body_id %} id="{{ page.body_id }}" {% endif %} {% if page.sidebar == false %} class="no-sidebar" {% endif %} {% if page.sidebar == 'collapse' or site.sidebar == 'collapse' %} class="collapse-sidebar sidebar-footer" {% endif %}>
-  <header role="banner">{% include header.html %}</header>
   <nav role="navigation">{% include navigation.html %}</nav>
+  <header role="banner">{% include header.html %}</header>
   <div id="main">
     <div id="content">
       {{ content | expand_urls: root_url }}