From 806d27db135233ed96f67973a956fb44b107c234 Mon Sep 17 00:00:00 2001 From: Brandon Mathis Date: Mon, 22 Aug 2011 16:28:50 -0400 Subject: using @extend for responsive blocks, added shadow-box mixin to utlities for configurable border shadow box styling, moved .left, .right, .center classes to .basic-alignment class for @extending as needed in layouts. Fixes #109 --- .themes/classic/sass/base/_layout.scss | 9 +++++++++ .themes/classic/sass/base/_utilities.scss | 7 +++++++ .themes/classic/sass/partials/_blog.scss | 16 +++------------- .themes/classic/sass/partials/sidebar/_base.scss | 5 +++++ 4 files changed, 24 insertions(+), 13 deletions(-) (limited to '.themes/classic') diff --git a/.themes/classic/sass/base/_layout.scss b/.themes/classic/sass/base/_layout.scss index ef47279a..f6fa5a5f 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 { 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 3416347b..558f0a22 100644 --- a/.themes/classic/sass/partials/_blog.scss +++ b/.themes/classic/sass/partials/_blog.scss @@ -44,19 +44,9 @@ 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; - } - img { - &.left { float: left; margin-right: 1.5em; } - &.right { float: right; margin-left: 1.5em; } - &.center { margin: 0 auto 1.5em; } - &.left, &.right { margin-bottom: .8em; } + @extend .flex-content; + @extend .basic-alignment; + @include shadow-box; } video, .flash-video { margin: 0 auto 1.5em; } video { display: block; width: 100%; } 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; -- cgit v1.2.1