added twitter feed to sidebar, moved to compass-edge gem

6 files changed, 28 insertions, 17 deletions

diff --git a/source/stylesheets/_library.sass b/source/stylesheets/_library.sass
index 85425cd4..a9158eff 100644
--- a/source/stylesheets/_library.sass
+++ b/source/stylesheets/_library.sass
@@ -1,7 +1,7 @@
 @import library/reset.sass
 @import library/clearfix.sass
 @import library/border_radius.sass
-@import library/box_shadow.sass
+@import library/easy_box_shadow.sass
 @import library/list_borders.sass
 @import library/typography.sass
 @import library/link_colors.sass
diff --git a/source/stylesheets/library/_box_shadow.sass b/source/stylesheets/library/_box_shadow.sass
deleted file mode 100644
index 728a8942..00000000
--- a/source/stylesheets/library/_box_shadow.sass
+++ /dev/null
@@ -1,10 +0,0 @@
-!default_box_shadow_color = #333
-!default_box_shadow_x_offset = 1px
-!default_box_shadow_y_offset = 1px
-!default_box_shadow_blur_radius = 8px
-
-=box-shadow(!color = !default_box_shadow_color, !x_offset = !default_box_shadow_x_offset, !y_offset = !default_box_shadow_y_offset, !blur_radius = !default_box_shadow_blur_radius)
-  box-shadow= !x_offset !y_offset !blur_radius !color
-  -webkit-box-shadow= !x_offset !y_offset !blur_radius !color
-  -moz-box-shadow= !x_offset !y_offset !blur_radius !color
-  
\ No newline at end of file
diff --git a/source/stylesheets/library/_easy_box_shadow.sass b/source/stylesheets/library/_easy_box_shadow.sass
new file mode 100644
index 00000000..437f187a
--- /dev/null
+++ b/source/stylesheets/library/_easy_box_shadow.sass
@@ -0,0 +1,8 @@
+!default_box_shadow_color = #333
+!default_box_shadow_x_offset = 1px
+!default_box_shadow_y_offset = 1px
+!default_box_shadow_blur_radius = 8px
+
+=easy-box-shadow(!color = !default_box_shadow_color, !x_offset = !default_box_shadow_x_offset, !y_offset = !default_box_shadow_y_offset, !blur_radius = !default_box_shadow_blur_radius)
+  +box-shadow(!x_offset, !y_offset, !blur_radius, !color)
+  
\ No newline at end of file
diff --git a/source/stylesheets/partials/_main.sass b/source/stylesheets/partials/_main.sass
index 4494b8a2..374268c8 100644
--- a/source/stylesheets/partials/_main.sass
+++ b/source/stylesheets/partials/_main.sass
@@ -1,4 +1,4 @@
 @import main/theme.sass
 @import main/layout.sass
 @import main/form.sass
-@import main/flash_messages.sass
\ No newline at end of file
+@import main/twitter.sass
\ No newline at end of file
diff --git a/source/stylesheets/partials/main/_layout.sass b/source/stylesheets/partials/main/_layout.sass
index 31548d66..0275a511 100644
--- a/source/stylesheets/partials/main/_layout.sass
+++ b/source/stylesheets/partials/main/_layout.sass
@@ -1,5 +1,6 @@
-!page_width = 560px
-!sidebar_width = 0
+!page_width = 900px
+!sidebar_width = 250px
+!sidebar_margin = 30px
 !pad = 15px
 !default_border_radius = 4px
 
@@ -52,8 +53,7 @@ html body
         border-right: 0
       &.subscribe
         position: absolute
-        right: 0
-        //left= !page_width - 25px
+        left= !page_width - !sidebar_width - !sidebar_margin/2
         border: none
         a
           display: inline-block
@@ -75,16 +75,27 @@ html body
     right: 30px
 
 #page
+  +clearfix
   background-color= !page_bg
   .page_width
+    +clearfix
     padding:
       top: 25px
       bottom: 25px
     background-color= !blog_bg
-    +box-shadow(#ccc)
+    +easy-box-shadow(#ccc)
     border:
       left= "1px solid" !page_border_sides
       right= "1px solid" !page_border_sides
+#main
+  width= !page_width - !sidebar_width - !sidebar_margin
+#sidebar
+  width= !sidebar_width
+  margin-left= !sidebar_margin
+
+#main, #sidebar
+  float: left
+
 .blog
   .article
     padding= !base_font_size * 1.5 0 !base_font_size * 1.5
diff --git a/source/stylesheets/partials/main/_twitter.sass b/source/stylesheets/partials/main/_twitter.sass
new file mode 100644
index 00000000..baeef5b4
--- /dev/null
+++ b/source/stylesheets/partials/main/_twitter.sass
@@ -0,0 +1,2 @@
+#twitter
+  font-size: 85%
\ No newline at end of file