diff options
Diffstat (limited to 'themes/classic/sass/default/partials')
| -rw-r--r-- | themes/classic/sass/default/partials/_blog.scss | 12 | ||||
| -rw-r--r-- | themes/classic/sass/default/partials/_footer.scss | 8 | ||||
| -rw-r--r-- | themes/classic/sass/default/partials/_header.scss | 1 | ||||
| -rw-r--r-- | themes/classic/sass/default/partials/_page.scss | 2 | ||||
| -rw-r--r-- | themes/classic/sass/default/partials/_sidebar.scss | 14 | ||||
| -rw-r--r-- | themes/classic/sass/default/partials/_syntax.scss | 46 | ||||
| -rw-r--r-- | themes/classic/sass/default/partials/_twitter.scss | 8 |
7 files changed, 62 insertions, 29 deletions
diff --git a/themes/classic/sass/default/partials/_blog.scss b/themes/classic/sass/default/partials/_blog.scss index 916e78c8..1f1a4a86 100644 --- a/themes/classic/sass/default/partials/_blog.scss +++ b/themes/classic/sass/default/partials/_blog.scss @@ -1,11 +1,18 @@ $border: inline-image('dotted-border.png'); #articles { + @media only screen and (max-width: 992px) { + ul, ol { margin-left: 1.4em; } + } > article { padding-bottom: 1em; &:last-child { margin-bottom: 0; border-bottom: none; } h2 { padding-top: 0.8em; background: $border top left repeat-x; + &:first-child { + background: none; + padding-top: 0; + } } .byline + time:before, .byline + time +time:before { content: "\2022 "; @@ -31,7 +38,6 @@ $border: inline-image('dotted-border.png'); margin: 0; font-style: italic; @extend .sans; - //font-family: "Georgia", Palatino, Times, "Times New Roman"; } } .entry-content { @@ -60,6 +66,10 @@ $border: inline-image('dotted-border.png'); } } } + header.feature h1 { + font-size: 2.0em; font-style: italic; + line-height: 1.3em; + } #disqus_thread { } .meta { border-bottom: 1px dashed #dddddd; diff --git a/themes/classic/sass/default/partials/_footer.scss b/themes/classic/sass/default/partials/_footer.scss index a04b3df9..019bc2a4 100644 --- a/themes/classic/sass/default/partials/_footer.scss +++ b/themes/classic/sass/default/partials/_footer.scss @@ -1,11 +1,11 @@ body > footer { @extend .sans; font-size: .8em; - color: $nav-color; + color: $footer-color; text-shadow: lighten($footer-bg, 5) 0 1px; background-color: $footer-bg; - @include background(linear-gradient(lighten($nav-bg, 8), $nav-bg, darken($nav-bg, 11))); - border-top: 1px solid $footer-border; + @include background(linear-gradient(lighten($footer-bg, 8), $footer-bg, darken($footer-bg, 11))); + border-top: 1px solid $footer-border-top; position: relative; padding-top: 1em; padding-bottom: 1em; @@ -13,7 +13,7 @@ body > footer { @include border-bottom-radius(.4em); z-index: 1; a { - @include link-colors($nav-color, $nav-color-hover); + @include link-colors($footer-link-color, $footer-link-color-hover); } p:last-child { margin-bottom: 0; } } diff --git a/themes/classic/sass/default/partials/_header.scss b/themes/classic/sass/default/partials/_header.scss index 4cc92e4f..9cc4601f 100644 --- a/themes/classic/sass/default/partials/_header.scss +++ b/themes/classic/sass/default/partials/_header.scss @@ -13,5 +13,6 @@ body > header { @extend .sans; font-size: 1em; color: $subtitle-color; + font-weight: normal; } } diff --git a/themes/classic/sass/default/partials/_page.scss b/themes/classic/sass/default/partials/_page.scss index cb0aa27a..8bda58e1 100644 --- a/themes/classic/sass/default/partials/_page.scss +++ b/themes/classic/sass/default/partials/_page.scss @@ -5,7 +5,7 @@ body { border: 0 0 1px 0 solid darken($page-bg, 5); > div { background-color: $sidebar-bg; - border-bottom: 1px solid $nav-border-bottom; + border-bottom: 1px solid $page-border-bottom; > div { background-color: $main-bg; border-right: 1px solid $sidebar-border; diff --git a/themes/classic/sass/default/partials/_sidebar.scss b/themes/classic/sass/default/partials/_sidebar.scss index 046068d1..8c38e2a6 100644 --- a/themes/classic/sass/default/partials/_sidebar.scss +++ b/themes/classic/sass/default/partials/_sidebar.scss @@ -1,12 +1,14 @@ .side-shadow-border { - @include box-shadow(#fff 0 1px); + @include box-shadow(lighten($sidebar-bg, 5) 0 1px); } #articles + aside { + color: $sidebar-color; padding-top: 1.2em; + text-shadow: lighten($sidebar-bg, 8) 0 1px; section { @extend .sans; font-size: .8em; - line-height: 1.5em; + line-height: 1.4em; margin-bottom: 1.5em; h1 { margin: 1.5em 0 0; @@ -35,7 +37,9 @@ color: inherit; @include transition(color, .5s); } - &:hover a, &:hover #tweets a { color: $link-color; } + &:hover a, &:hover #tweets a { color: $sidebar-link-color; + &:hover { color: $sidebar-link-color-hover; } + } #recent_posts { time { text-transform: uppercase; @@ -48,8 +52,8 @@ @import "delicious"; } .aside-alt-link { - color: #999; + color: $sidebar-link-color-subdued; &:hover { - color: #555; + color: $sidebar-link-color-subdued-hover; } } diff --git a/themes/classic/sass/default/partials/_syntax.scss b/themes/classic/sass/default/partials/_syntax.scss index 2258ac46..b249559f 100644 --- a/themes/classic/sass/default/partials/_syntax.scss +++ b/themes/classic/sass/default/partials/_syntax.scss @@ -26,15 +26,16 @@ $green: #859900; //$base3: $base03; .highlight, html .gist .gist-file .gist-syntax .gist-highlight { - pre.line-numbers { + .line-numbers { text-align: right; + font-size: .8em; + line-height: 1.45em; background: $base02 !important; border-right: 1px solid darken($base03, 2) !important; @include box-shadow(lighten($base02, 2) -1px 0 inset); text-shadow: darken($base02, 10) 0 -1px; span { color: $base01 !important; } - padding-left: .8em !important; - padding-right: .8em !important; + padding: .8em !important; } } html .gist .gist-file { @@ -47,10 +48,7 @@ html .gist .gist-file { .gist-highlight{ background: $base03 !important; pre { - @extend .pre; - } - pre.line-numbers { - + @extend .pre-code; } } } @@ -79,19 +77,39 @@ html .gist .gist-file { } } } -pre { @extend .pre; } +pre { + background: #fff; + border: 1px solid #ddd; + @include border-radius(.4em); + @extend .mono; + line-height: 1.45em; + font-size: .8em; + margin-bottom: 1.5em; + padding: .4em .8em; + color: #555; +} -.pre { +p code { @extend .mono; + display: inline-block; + white-space: no-wrap; + background: #fff; + font-size: .9em; + color: #555; + border: 1px solid #ddd; + @include border-radius(.4em); + padding: 0 .3em; +} + +.pre-code { @include selection(adjust-color($base03, $lightness: 23%, $saturation: -65%), $text-shadow: $base03 0 1px); - font-size: .8em; overflow: scroll; overflow-y: hidden; + display: block; + padding: .8em !important; overflow-x: auto; line-height: 1.45em; - padding: 1em 1.2em !important; background: $base03 !important; - code { background: $base03 !important; overflow: hidden; } color: $base1 !important; span { color: $base1 !important; } span { font-style: normal !important; font-weight: normal !important; } @@ -162,12 +180,13 @@ pre { @extend .pre; } } .highlight, .gist-highlight { + pre { background: none; @include border-radius(none); border: none; padding: 0; margin-bottom: 0; } margin-bottom: 1.5em; background: $base03; overflow-y: hidden; overflow-x: auto; - pre { overflow: visible; } } +.highlight code { @extend .pre-code; background: #000;} figure { margin-bottom: 1.5em; figcaption { @@ -201,7 +220,6 @@ h3.filename { @extend .code-title; } position: absolute; right: .8em; @include hover-link; color: #666 !important; - &:hover { color: $link-color !important; } z-index: 1; font-size: 13px; text-shadow: #cbcccc 0 1px 0; diff --git a/themes/classic/sass/default/partials/_twitter.scss b/themes/classic/sass/default/partials/_twitter.scss index de7a6930..36c6f62b 100644 --- a/themes/classic/sass/default/partials/_twitter.scss +++ b/themes/classic/sass/default/partials/_twitter.scss @@ -9,13 +9,13 @@ background: inline-image('bird_32_gray_fail.png') no-repeat center .5em; } } - a { color: #666; @include hover-link; } + a { color: $sidebar-link-color-subdued; @include hover-link; } p { position: relative; padding-right: 1em; } - a[href*='status']{ - color: #aaa; + a[href*=status]{ + color: $twitter-status-link; float: right; padding: 0 0 .1em 1em; position: relative; right: -1.3em; @@ -23,7 +23,7 @@ font-size: .7em; span { font-size: 1.5em; } &:hover { - color: #555; + color: $sidebar-link-color-subdued-hover; text-decoration: none; } } |