diff options
| author | B Mathis <brandon@imathis.com> | 2009-10-30 00:31:02 -0500 |
|---|---|---|
| committer | B Mathis <brandon@imathis.com> | 2009-10-30 00:31:02 -0500 |
| commit | 5c736f5eb03d7b51defe27ac027124557c4c7a3b (patch) | |
| tree | f2ad356f733a6b359360422209cba95d8197c817 /source/stylesheets/partials | |
| parent | 80a70068ed7fda704c769e123c77bb8c78c7d9a3 (diff) | |
| download | my_new_personal_website-5c736f5eb03d7b51defe27ac027124557c4c7a3b.tar.xz my_new_personal_website-5c736f5eb03d7b51defe27ac027124557c4c7a3b.zip | |
added twitter feed to sidebar, moved to compass-edge gem
Diffstat (limited to 'source/stylesheets/partials')
| -rw-r--r-- | source/stylesheets/partials/_main.sass | 2 | ||||
| -rw-r--r-- | source/stylesheets/partials/main/_layout.sass | 21 | ||||
| -rw-r--r-- | source/stylesheets/partials/main/_twitter.sass | 2 |
3 files changed, 19 insertions, 6 deletions
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 |