updated to latest octopress

This commit is contained in:
Brandon Mathis 2011-08-22 16:30:40 -04:00
parent 7527a9fda4
commit 105e446bd2
5 changed files with 28 additions and 15 deletions

View File

@ -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 {

View File

@ -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; }

View File

@ -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;

View File

@ -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;

View File

@ -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;