diff options
author | B Mathis <brandon@imathis.com> | 2010-07-26 10:55:53 -0500 |
---|---|---|
committer | B Mathis <brandon@imathis.com> | 2010-07-26 10:55:53 -0500 |
commit | 76b8b8ca450dc09c86d0ad958f7397c3b1bdc36f (patch) | |
tree | 1c017153e507802955569cc88fc985baea3f1c5e /stylesheets/partials | |
parent | 5951848f724ae5a64d917dced57c328013dc2939 (diff) | |
download | my_new_personal_website-76b8b8ca450dc09c86d0ad958f7397c3b1bdc36f.tar.xz my_new_personal_website-76b8b8ca450dc09c86d0ad958f7397c3b1bdc36f.zip |
fixed rake preview and updated sass to sass3 syntax
Diffstat (limited to '')
-rw-r--r-- | stylesheets/partials/_blog.sass | 14 | ||||
-rw-r--r-- | stylesheets/partials/_footer.sass | 12 | ||||
-rw-r--r-- | stylesheets/partials/_header.sass | 4 | ||||
-rw-r--r-- | stylesheets/partials/_navigation.sass | 20 | ||||
-rw-r--r-- | stylesheets/partials/_page.sass | 6 | ||||
-rw-r--r-- | stylesheets/partials/_search.sass | 10 | ||||
-rw-r--r-- | stylesheets/partials/_sidebar.sass | 16 | ||||
-rw-r--r-- | stylesheets/partials/_syntax.sass | 88 | ||||
-rw-r--r-- | stylesheets/partials/_twitter.sass | 4 |
9 files changed, 87 insertions, 87 deletions
diff --git a/stylesheets/partials/_blog.sass b/stylesheets/partials/_blog.sass index 75325b39..f2dc104c 100644 --- a/stylesheets/partials/_blog.sass +++ b/stylesheets/partials/_blog.sass @@ -1,26 +1,26 @@ .blog h2 padding-top: 0 - margin-bottom: .1em + margin-bottom: 0.1em .title text-decoration: none &:hover text-decoration: underline .article - padding: #{!base_font_size * 1.5 0} #{!base_font_size * 1.5} - border-bottom: 1px solid #{!article_border} + padding: $base-font-size * 1.5 0 $base-font-size * 1.5 + border-bottom: 1px solid $article-border &:first-child padding-top: 0 #disqus_thread - padding-top: #{!base_font_size} + padding-top: $base-font-size .meta +sans-font - border-bottom: 1px dashed #ddd + border-bottom: 1px dashed #dddddd text-transform: uppercase - color: #777 + color: #777777 padding: 8px 0 5px margin-bottom: 1.5em font-size: 75% letter-spacing: 1px .footer - padding-top: 15px
\ No newline at end of file + padding-top: 15px diff --git a/stylesheets/partials/_footer.sass b/stylesheets/partials/_footer.sass index c67118c0..40ae8e3f 100644 --- a/stylesheets/partials/_footer.sass +++ b/stylesheets/partials/_footer.sass @@ -1,12 +1,12 @@ #footer - +linear-gradient(color_stops(darken(!body_bg, 5), !body_bg)) - font-size: #{!base_font_size_small} - color: #{!footer_color} - border-top: 10px solid #{!footer_bg} + +linear-gradient(color-stops(darken($body-bg, 5), $body-bg)) + font-size: $base-font-size-small + color: $footer-color + border-top: 10px solid $footer-bg padding: 15px 0 position: relative z-index: 2 a - color: #ddd + color: #dddddd &:hover - color: #fff
\ No newline at end of file + color: white diff --git a/stylesheets/partials/_header.sass b/stylesheets/partials/_header.sass index 23e4b0b3..e912d551 100644 --- a/stylesheets/partials/_header.sass +++ b/stylesheets/partials/_header.sass @@ -1,11 +1,11 @@ #header background-color: $header_bg - border-bottom: 1px solid #{$header_border} + border-bottom: 1px solid $header_border padding: 25px 0 h1 display: inline-block margin: 0 a.title font-weight: normal - color: #{$title_color} + color: $title_color text-decoration: none
\ No newline at end of file diff --git a/stylesheets/partials/_navigation.sass b/stylesheets/partials/_navigation.sass index 2667b740..439da5f2 100644 --- a/stylesheets/partials/_navigation.sass +++ b/stylesheets/partials/_navigation.sass @@ -2,11 +2,11 @@ +clearfix position: relative z-index: 1 - background-color: #{!nav_bg} - +linear-gradient(color_stops(#fcfcfc, #f4f4f4 .3, #ddd)) + background-color: $nav-bg + +linear-gradient(color-stops(#fcfcfc, #f4f4f4 0.3, #dddddd)) border: - top: 1px solid #{!nav_border_top} - bottom: 1px solid #{!nav_border_bottom} + top: 1px solid $nav-border-top + bottom: 1px solid $nav-border-bottom ul position: relative +horizontal-list @@ -14,8 +14,8 @@ padding: 6px 0 li padding: 0 15px - border-left: 1px solid #{!nav_border_left} - border-right: 1px solid #{!nav_border_right} + border-left: 1px solid $nav-border-left + border-right: 1px solid $nav-border-right &.alpha border-left: none padding-left: 0 @@ -23,16 +23,16 @@ border-right: 0 &.subscribe position: absolute - left: #{!page_width - !sidebar_width - !sidebar_margin/2} + left: $page-width - $sidebar-width - $sidebar-margin / 2 border: none a display: inline-block padding-left: 28px - background: url("/images/rss.png") left top no-repeat + background: image-url("rss.png") left top no-repeat a display: inline-block - color: #{!nav_color} + color: $nav-color line-height: 150% text-decoration: none &:hover - color: #{!nav_color_hover}
\ No newline at end of file + color: $nav-color-hover diff --git a/stylesheets/partials/_page.sass b/stylesheets/partials/_page.sass index 29dcc92f..8bea659c 100644 --- a/stylesheets/partials/_page.sass +++ b/stylesheets/partials/_page.sass @@ -1,8 +1,8 @@ #page - background-color: #{!main_bg} + background-color: $main_bg #main - background-color: #{!main_bg} - border-right: 1px solid #{!sidebar_border} + background-color: $main_bg + border-right: 1px solid $sidebar_border padding: top: 25px bottom: 25px
\ No newline at end of file diff --git a/stylesheets/partials/_search.sass b/stylesheets/partials/_search.sass index 0deb11ad..44b2a557 100644 --- a/stylesheets/partials/_search.sass +++ b/stylesheets/partials/_search.sass @@ -1,9 +1,9 @@ #search position: absolute - left: #{!page_width + !sidebar_margin - !sidebar_width} - top: #{30%} + left: $page-width + $sidebar-margin - $sidebar-width + top: 30% form - background: url(/images/search_bg.png) no-repeat + background: image-url("search_bg.png") no-repeat padding: 0 height: 28px width: 218px @@ -15,6 +15,6 @@ margin-left: 30px font-size: 15px border: none - color: #aaa + color: #aaaaaa &:focus - outline: none
\ No newline at end of file + outline: none diff --git a/stylesheets/partials/_sidebar.sass b/stylesheets/partials/_sidebar.sass index d98ef356..2a842027 100644 --- a/stylesheets/partials/_sidebar.sass +++ b/stylesheets/partials/_sidebar.sass @@ -2,21 +2,21 @@ line-height: 1.45em font-size: 90% h3 - font-size: #{!h4+2} + font-size: $h4 + 2 margin: 20px -15px 10px padding: 12px 15px - background: #fff + background: white border-bottom: 1px solid #e5e5e5 border-top: 1px solid #e5e5e5 &:first-child margin-top: 0 h4 - font-size: #{!h5} - + font-size: $h5 + #twitter, #delicious +border-radius background: #f8f8f8 - border: 1px solid #eee + border: 1px solid #eeeeee padding: 5px 0 ul list-style-type: none @@ -24,7 +24,7 @@ li margin: 0 15px padding: 10px 0 0 - border-bottom: #ddd 1px dashed + border-bottom: #dddddd 1px dashed &:last-child border-bottom: 0 @@ -32,6 +32,6 @@ p font-style: italic li - color: #666 + color: #666666 font-style: normal - padding-bottom: 8px
\ No newline at end of file + padding-bottom: 8px diff --git a/stylesheets/partials/_syntax.sass b/stylesheets/partials/_syntax.sass index ff70c16b..05196159 100644 --- a/stylesheets/partials/_syntax.sass +++ b/stylesheets/partials/_syntax.sass @@ -1,9 +1,9 @@ .code_window +border-top-radius(5px) +border-bottom-radius(2px) - background: #aaa #{image_url("code_bg.png")} top repeat-x + background: #aaaaaa image-url("code_bg.png") top repeat-x position: relative - margin: .3em 0 1.3em + margin: 0.3em 0 1.3em padding: 0 3px 3px font-size: 14px border: 1px solid #898989 @@ -12,26 +12,26 @@ border-right-color: #a5a5a5 em text-align: center - +text-shadow(#ccc, 1px, 1px, 1px) + +text-shadow(#cccccc, 1px, 1px, 1px) display: block padding: 1px 0 - color: #333 + color: #333333 font-style: normal +sans-font .highlight margin: 0 - + pre - color: #ccc + color: #cccccc font-size: 13px - background: #222 + background: #222222 line-height: 1.5em - border: #aaa 1px solid + border: #aaaaaa 1px solid overflow-x: auto overflow-y: hidden padding: 25px 20px .lineno - color: #888 + color: #888888 background: #e3e3e3 display: inline-block padding: 0 0 0 10px @@ -53,33 +53,33 @@ pre right: 2px +border-bottom-left-radius display: block - color: #777 - background: #333 + color: #777777 + background: #333333 &:hover - background: #444 - color: #ccc + background: #444444 + color: #cccccc // based on: http://github.com/mojombo/tpw/raw/master/css/syntax.css .editor - background: rgb(0,22,41) + background: rgb(0, 22, 41) line-height: 1.25 pre.console background-color: black - color= lighten(#008000, 25) + color: lighten(green, 25) letter-spacing: 1px padding: 0.5em .prompt - color= lighten(#000080, 50) + color: lighten(navy, 50) &:before - :color white + color: white content: "[" &:after - :color white + color: white content: "]" .stdin font-weight: bold - color= lighten(#008000, 75) + color: lighten(green, 75) .highlight padding: 0 0 0.1em @@ -100,7 +100,7 @@ pre.console color: rgb(255, 157, 0) // Paren .p - color= darken(#FF9D00, 33) + color: darken(#ff9d00, 33) // Operator .o color: rgb(255, 157, 0) @@ -121,11 +121,11 @@ pre.console font-style: italic // Generic.Deleted .gd - color: #000000 + color: black background-color: #ffdddd // Generic.Deleted.Specific .gd .x - color: #000000 + color: black background-color: #ffaaaa // Generic.Emph .ge @@ -138,11 +138,11 @@ pre.console color: #999999 // Generic.Inserted .gi - color: #000000 + color: black background-color: #ddffdd // Generic.Inserted.Specific .gi .x - color: #000000 + color: black background-color: #aaffaa // Generic.Output .go @@ -179,28 +179,28 @@ pre.console color: rgb(255, 98, 140) // Literal.String .s - color: #d14 + color: #dd1144 // Name.Attribute .na - color: #008080 + color: teal // Name.Builtin .nb - color= darken(rgb(128, 255, 187), 20) + color: darken(rgb(128, 255, 187), 20) // Name.Class .nc - color= darken(rgb(128, 255, 187), 20) + color: darken(rgb(128, 255, 187), 20) // Name.Constant .no color: rgb(128, 255, 187) // Name.Entity .ni - color: #800080 + color: purple // Name.Exception .ne - color: rgb(255,221, 0) + color: rgb(255, 221, 0) // Name.Function .nf - color: rgb(255,221, 0) + color: rgb(255, 221, 0) // Name.Namespace .nn color: #555555 @@ -209,7 +209,7 @@ pre.console color: white // Name.Variable .nv - color: #008080 + color: teal // Operator.Word .ow color: white @@ -233,34 +233,34 @@ pre.console color: rgb(255, 98, 140) // Literal.String.Backtick .sb - color: rgb(58,217,0) + color: rgb(58, 217, 0) // Literal.String.Char .sc - color: rgb(58,217,0) + color: rgb(58, 217, 0) // Literal.String.Doc .sd - color: rgb(58,217,0) + color: rgb(58, 217, 0) // Literal.String.Double .s2 - color: rgb(58,217,0) + color: rgb(58, 217, 0) // Literal.String.Escape .se - color: rgb(58,217,0) + color: rgb(58, 217, 0) // Literal.String.Heredoc .sh - color: rgb(58,217,0) + color: rgb(58, 217, 0) // Literal.String.Interpol .si - color: rgb(158,255,128) + color: rgb(158, 255, 128) // Literal.String.Other .sx - color: rgb(58,217,0) + color: rgb(58, 217, 0) // Literal.String.Regex .sr color: #009926 // Literal.String.Single .s1 - color: rgb(58,217,0) + color: rgb(58, 217, 0) // Literal.String.Symbol .ss color: rgb(255, 98, 140) @@ -269,13 +269,13 @@ pre.console color: #999999 // Name.Variable.Class .vc - color: #008080 + color: teal // Name.Variable.Global .vg - color: #008080 + color: teal // Name.Variable.Instance .vi - color: #008080 + color: teal // Literal.Number.Integer.Long .il color: rgb(255, 98, 140) diff --git a/stylesheets/partials/_twitter.sass b/stylesheets/partials/_twitter.sass index 1545e67f..181e0473 100644 --- a/stylesheets/partials/_twitter.sass +++ b/stylesheets/partials/_twitter.sass @@ -2,9 +2,9 @@ p padding-bottom: 10px a.topic - color: #{!twitter_topic} + color: $twitter_topic .meta - color: #{!light_text} + color: $light_text font-size: 80% display: block padding: 8px 0 0 |