reorganized css, changed typography, layout fixes

This commit is contained in:
B Mathis 2009-11-07 23:25:12 -06:00
parent 55b8d5dc3f
commit 6b9c3af4b5
8 changed files with 34 additions and 33 deletions

View File

@ -79,7 +79,7 @@ google_analytics: true
Status updating... Status updating...
#footer #footer
.page_width .page_width
= "Copyright © #{Time.now.strftime('%Y')} - #{page.blog_title} | " Copyright © #{Time.now.strftime('%Y')} - #{page.blog_title} -
%span.credit Powered by <a href="http://github.com/imathis/octopress/">Octopress</a> %span.credit Powered by <a href="http://github.com/imathis/octopress/">Octopress</a>
- if page.respond_to? :disqus_short_name - if page.respond_to? :disqus_short_name
//Disqus Commens code //Disqus Commens code

View File

@ -7,8 +7,8 @@ title: Blog
.article .article
%h2= link_to(post.title, post.url, {:class=>"title"}) %h2= link_to(post.title, post.url, {:class=>"title"})
= post.content = post.content
.footer - if page.respond_to? :disqus_short_name
- if page.respond_to? :disqus_short_name .footer
- if post.data["comments_off"] - if post.data["comments_off"]
%em.comments_off Comments disabled %em.comments_off Comments disabled
- else - else

View File

@ -10,10 +10,6 @@ html body
a a
color= !link_color color= !link_color
#footer a
color= #ddd
&:hover
color = #fff
#header #header
background-color= !header_bg background-color= !header_bg
border-bottom= "1px solid" !header_border border-bottom= "1px solid" !header_border
@ -91,23 +87,10 @@ html body
right= "1px solid" !page_border_sides right= "1px solid" !page_border_sides
#main #main
width= !page_width - !sidebar_width - !sidebar_margin width= !page_width - !sidebar_width - !sidebar_margin
#sidebar
width= !sidebar_width
margin-left= !sidebar_margin
#main, #sidebar #main
float: left 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 #footer
position: relative position: relative
z-index: 2 z-index: 2
@ -116,4 +99,8 @@ html body
padding= !base_font_size * 1.5 0 padding= !base_font_size * 1.5 0
color= !footer_color color= !footer_color
+h-linear-gradient(darken(!body_bg, 25), !body_bg) +h-linear-gradient(darken(!body_bg, 25), !body_bg)
border-top= "14px solid" !footer_bg border-top= "14px solid" !footer_bg
a
color= #ddd
&:hover
color = #fff

View File

@ -1,3 +1,4 @@
@import partials/twitter.sass @import partials/blog.sass
@import partials/search.sass @import partials/search.sass
@import partials/sidebar.sass @import partials/sidebar.sass
@import partials/twitter.sass

View File

@ -10,16 +10,17 @@
+serif-font +serif-font
body body
font-size= !base_font_size font-size= !base_font_size +2
+sans-font +serif-font
h1,h2,h3,h4,h5,h6 h1,h2,h3,h4,h5,h6
color: #333 color: #333
font-weight: bold font-weight: bold
+heading-font +heading-font
letter-spacing: -1px
blockquote blockquote
+heading-font +quote-font
font-size= !base_font_size * 1.2 font-size= !base_font_size * 1.2
.quote blockquote .quote blockquote
font-size= !h4 font-size= !h4

View File

@ -14,7 +14,7 @@
=sans-font =sans-font
font-family: "Lucida Grande", "Lucida Sans Unicode", "Trebuchet MS", Helvetica, Arial, Verdana, sans-serif font-family: "Lucida Grande", "Lucida Sans Unicode", "Trebuchet MS", Helvetica, Arial, Verdana, sans-serif
=serif-font =serif-font
font-family: Times, "Times New Roman" Georgia, serif font-family: Georgia, Times, "Times New Roman", serif
=fixed-font =fixed-font
font-family: "Menlo", "Bitstream Vera Sans", Monaco, "Andale Mono", "Lucida Console", monospace font-family: "Menlo", "Bitstream Vera Sans", Monaco, "Andale Mono", "Lucida Console", monospace

View File

@ -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

View File

@ -1,7 +1,11 @@
#sidebar #sidebar
float: left
width= !sidebar_width
padding-top: 10px padding-top: 10px
h4 margin-left= !sidebar_margin
margin: 0
.small h4
+sans-font margin: 0
font-size: 50% .small
+sans-font
font-size: 50%