diff options
author | Brandon Mathis <brandon@imathis.com> | 2013-03-09 17:14:33 -0600 |
---|---|---|
committer | Brandon Mathis <brandon@imathis.com> | 2013-03-09 17:14:33 -0600 |
commit | 98013543d9bb0c51e05236498bf4fbc92af678e1 (patch) | |
tree | 37e97b118fe9d12ea2469416adab469234501055 /.themes/classic/sass | |
parent | cf5e90962627c4ce2ea5b08d452496621eb969e3 (diff) | |
download | my_new_personal_website-98013543d9bb0c51e05236498bf4fbc92af678e1.tar.xz my_new_personal_website-98013543d9bb0c51e05236498bf4fbc92af678e1.zip |
Removed Twitter and Ender.js. Added jQuery and updated Modernizr
Diffstat (limited to '.themes/classic/sass')
-rw-r--r-- | .themes/classic/sass/base/_theme.scss | 1 | ||||
-rw-r--r-- | .themes/classic/sass/base/_typography.scss | 5 | ||||
-rw-r--r-- | .themes/classic/sass/partials/_sidebar.scss | 1 | ||||
-rw-r--r-- | .themes/classic/sass/partials/sidebar/_twitter.scss | 34 |
4 files changed, 3 insertions, 38 deletions
diff --git a/.themes/classic/sass/base/_theme.scss b/.themes/classic/sass/base/_theme.scss index 9a50a8b4..1a43a03d 100644 --- a/.themes/classic/sass/base/_theme.scss +++ b/.themes/classic/sass/base/_theme.scss @@ -44,7 +44,6 @@ $sidebar-border: desaturate(darken($sidebar-bg, 7), 10) !default; $sidebar-border-hover: darken($sidebar-bg, 7) !default; $sidebar-link-color-subdued: lighten($sidebar-color, 20) !default; $sidebar-link-color-subdued-hover: $sidebar-link-color-hover !default; -$twitter-status-link: lighten($sidebar-link-color-subdued, 15) !default; $footer-color: #888 !default; $footer-bg: #ccc !default; diff --git a/.themes/classic/sass/base/_typography.scss b/.themes/classic/sass/base/_typography.scss index e9b6b19a..85256f0b 100644 --- a/.themes/classic/sass/base/_typography.scss +++ b/.themes/classic/sass/base/_typography.scss @@ -62,7 +62,8 @@ h5, section h4, section section h3 { h6, section h5, section section h4, section section section h3 { font-size: .8em; } -p, blockquote, ul, ol { margin-bottom: 1.5em; } + +p, article blockquote, ul, ol { margin-bottom: 1.5em; } ul { list-style-type: disc; ul { list-style-type: circle; margin-bottom: 0px; @@ -106,7 +107,7 @@ small { font-size: .8em; } big { font-size: 1.2em; } -blockquote { +article blockquote { $bq-margin: 1.2em; font-style: italic; position: relative; diff --git a/.themes/classic/sass/partials/_sidebar.scss b/.themes/classic/sass/partials/_sidebar.scss index eec540ba..cd8c1ca2 100644 --- a/.themes/classic/sass/partials/_sidebar.scss +++ b/.themes/classic/sass/partials/_sidebar.scss @@ -1,5 +1,4 @@ @import "sidebar/base"; -@import "sidebar/twitter"; @import "sidebar/googleplus"; @import "sidebar/pinboard"; @import "sidebar/delicious"; diff --git a/.themes/classic/sass/partials/sidebar/_twitter.scss b/.themes/classic/sass/partials/sidebar/_twitter.scss deleted file mode 100644 index dfd49b55..00000000 --- a/.themes/classic/sass/partials/sidebar/_twitter.scss +++ /dev/null @@ -1,34 +0,0 @@ -#tweets { - .loading { - background: inline-image('bird_32_gray.png') no-repeat center .5em; - color: darken($sidebar-bg, 18); - text-shadow: $main-bg 0 1px; - text-align: center; - padding: 2.5em 0 .5em; - &.error { - background: inline-image('bird_32_gray_fail.png') no-repeat center .5em; - } - } - p { - position: relative; - padding-right: 1em; - } - a[href*=status]:first-child { - color: $twitter-status-link; - float: right; - padding: 0 0 .1em 1em; - position: relative; right: -1.3em; - text-shadow: #fff 0 1px; - font-size: .7em; - span { font-size: 1.5em; } - text-decoration: none; - &:hover { - color: $sidebar-link-color-subdued-hover; - text-decoration: none; - } - } - a[href*='twitter.com/search']{ - @extend .aside-alt-link; - @include hover-link; - } -} |