diff options
Diffstat (limited to '.themes/classic/sass')
-rw-r--r-- | .themes/classic/sass/base/_layout.scss | 11 | ||||
-rw-r--r-- | .themes/classic/sass/base/_typography.scss | 2 | ||||
-rw-r--r-- | .themes/classic/sass/base/_utilities.scss | 7 | ||||
-rw-r--r-- | .themes/classic/sass/partials/_blog.scss | 19 | ||||
-rw-r--r-- | .themes/classic/sass/partials/_syntax.scss | 3 | ||||
-rw-r--r-- | .themes/classic/sass/partials/sidebar/_base.scss | 5 |
6 files changed, 30 insertions, 17 deletions
diff --git a/.themes/classic/sass/base/_layout.scss b/.themes/classic/sass/base/_layout.scss index ef47279a..4a3c780f 100644 --- a/.themes/classic/sass/base/_layout.scss +++ b/.themes/classic/sass/base/_layout.scss @@ -75,6 +75,15 @@ aside[role=sidebar] { @extend .group; } +.flex-content { max-width: 100%; height: auto; } + +.basic-alignment { + &.left { float: left; margin-right: 1.5em; } + &.right { float: right; margin-left: 1.5em; } + &.center { display:block; margin: 0 auto 1.5em; } + &.left, &.right { margin-bottom: .8em; } +} + .toggle-sidebar { &, .no-sidebar & { display: none; }} body.sidebar-footer { @@ -103,7 +112,7 @@ body.sidebar-footer { @extend .group; margin-right: $sidebar-width-medium; position: relative; - .no-sidebar & { margin-right: 0; } + .no-sidebar & { margin-right: 0; border-right: 0; } .collapse-sidebar & { margin-right: 20px; } > div, > article { padding-top: $pad-medium/2; diff --git a/.themes/classic/sass/base/_typography.scss b/.themes/classic/sass/base/_typography.scss index 05402574..ef83065b 100644 --- a/.themes/classic/sass/base/_typography.scss +++ b/.themes/classic/sass/base/_typography.scss @@ -86,7 +86,7 @@ del, s { text-decoration: line-through; } abbr, acronym { border-bottom: 1px dotted; cursor: help; } -pre, code, tt { @extend .mono-font; } +pre, code, tt { @extend .mono; } sub, sup { line-height: 0; } diff --git a/.themes/classic/sass/base/_utilities.scss b/.themes/classic/sass/base/_utilities.scss index 8b718cdc..2d49e659 100644 --- a/.themes/classic/sass/base/_utilities.scss +++ b/.themes/classic/sass/base/_utilities.scss @@ -5,6 +5,13 @@ height: image-height($img); } +@mixin shadow-box($border: #fff .5em solid, $shadow: rgba(#000, .15) 0 1px 4px, $border-radius: .3em) { + @include border-radius($border-radius); + @include box-shadow($shadow); + @include box-sizing(border-box); + border: $border; +} + @mixin selection($bg, $color: inherit, $text-shadow: none){ * { &::-moz-selection { background: $bg; color: $color; text-shadow: $text-shadow; } diff --git a/.themes/classic/sass/partials/_blog.scss b/.themes/classic/sass/partials/_blog.scss index 8d9d5f80..558f0a22 100644 --- a/.themes/classic/sass/partials/_blog.scss +++ b/.themes/classic/sass/partials/_blog.scss @@ -44,21 +44,12 @@ article { line-height: 1.3em; } img, video, .flash-video { - max-width: 100%; - height: auto; - border: .5em solid #fff; - @include border-radius(.3em); - @include box-shadow(rgba(#000, .15) 0 1px 4px); - @include box-sizing(border-box); - display: block; - margin: 0 auto 1.5em; + @extend .flex-content; + @extend .basic-alignment; + @include shadow-box; } - img { - &.left { float: left; margin-right: 1.5em; } - &.right { float: right; margin-left: 1.5em; } - &.left, &.right { margin-bottom: .8em; } - } - video { display: block; margin-bottom: 1.5em; width: 100%; } + video, .flash-video { margin: 0 auto 1.5em; } + video { display: block; width: 100%; } .flash-video { > div { position: relative; diff --git a/.themes/classic/sass/partials/_syntax.scss b/.themes/classic/sass/partials/_syntax.scss index 9bee3020..7e8ed8d5 100644 --- a/.themes/classic/sass/partials/_syntax.scss +++ b/.themes/classic/sass/partials/_syntax.scss @@ -85,7 +85,8 @@ h3.filename { + pre { @include border-top-radius(0px); } } -p code { +p code, +li code { @extend .mono; display: inline-block; white-space: no-wrap; diff --git a/.themes/classic/sass/partials/sidebar/_base.scss b/.themes/classic/sass/partials/sidebar/_base.scss index 08f04d23..a0d1c09e 100644 --- a/.themes/classic/sass/partials/sidebar/_base.scss +++ b/.themes/classic/sass/partials/sidebar/_base.scss @@ -20,6 +20,11 @@ aside[role=sidebar] { } } } + img { + @extend .flex-content; + @extend .basic-alignment; + @include shadow-box($border: #fff .3em solid); + } ul { margin-bottom: 0.5em; margin-left: 0; |