updated to latest octopress styling

This commit is contained in:
Brandon Mathis 2011-07-26 11:28:26 -04:00
parent d6c18614a5
commit 6d652b1b46
3 changed files with 26 additions and 38 deletions

View File

@ -1,18 +1,18 @@
$base03: #002b36; //darkest blue $base03: #002b36 !default; //darkest blue
$base02: #073642; //dark blue $base02: #073642 !default; //dark blue
$base01: #586e75; //darkest gray $base01: #586e75 !default; //darkest gray
$base00: #657b83; //dark gray $base00: #657b83 !default; //dark gray
$base0: #839496; //medium gray $base0: #839496 !default; //medium gray
$base1: #93a1a1; //medium light gray $base1: #93a1a1 !default; //medium light gray
$base2: #eee8d5; //cream $base2: #eee8d5 !default; //cream
$base3: #fdf6e3; //white $base3: #fdf6e3 !default; //white
$yellow: #b58900; $yellow: #b58900 !default;
$orange: #cb4b16; $orange: #cb4b16 !default;
$red: #dc322f; $red: #dc322f !default;
$magenta: #d33682; $magenta: #d33682 !default;
$violet: #6c71c4; $violet: #6c71c4 !default;
$blue: #268bd2; $blue: #268bd2 !default;
$cyan: #2aa198; $cyan: #2aa198 !default;
$green: #859900; $green: #859900 !default;
$pre-bg: $base03 !default; $pre-bg: $base03 !default;

View File

@ -43,37 +43,23 @@ article {
font-size: 2.0em; font-style: italic; font-size: 2.0em; font-style: italic;
line-height: 1.3em; line-height: 1.3em;
} }
img { img, video, .flash-video {
max-width: 100%; max-width: 100%;
height: auto;
border: .5em solid #fff; border: .5em solid #fff;
@include border-radius(.3em); @include border-radius(.3em);
@include box-shadow(rgba(#000, .15) 0 1px 4px); @include box-shadow(rgba(#000, .15) 0 1px 4px);
@include box-sizing(border-box); @include box-sizing(border-box);
display: block; display: block;
margin: 0 auto 1.5em; margin: 0 auto 1.5em;
&.left {
float: left;
margin-right: 1.5em;
} }
&.right { img {
float: right; &.left { float: left; margin-right: 1.5em; }
margin-left: 1.5em; &.right { float: right; margin-left: 1.5em; }
} &.left, &.right { margin-bottom: .8em; }
&.left, &.right {
margin-bottom: .8em;
}
}
img, video { max-width: 100%; height: auto; }
video {
width: 100%; display: block; margin-bottom: 1.5em;
padding: .8em; background: #fff; border: 1px solid #eee;
@include box-sizing(border-box);
} }
video { display: block; margin-bottom: 1.5em; width: 100%; }
.flash-video { .flash-video {
max-width: 100%;
margin-bottom: 1.5em;
@include box-sizing(border-box);
padding: .8em; background: #fff; border: 1px solid #eee;
> div { > div {
position: relative; position: relative;
display: block; display: block;

View File

@ -126,9 +126,10 @@ p code {
.n { color: $blue !important; } .n { color: $blue !important; }
.na { color: $blue !important; } /* Name.Attribute */ .na { color: $blue !important; } /* Name.Attribute */
.nb { color: $green !important; } /* Name.Builtin */ .nb { color: $green !important; } /* Name.Builtin */
//.nc { color: #445588; font-weight: bold } /* Name.Class */ .nc { color: $magenta !important;} /* Name.Class */
.no { color: $yellow !important; } /* Name.Constant */ .no { color: $yellow !important; } /* Name.Constant */
//.ni { color: #800080 } /* Name.Entity */ //.ni { color: #800080 } /* Name.Entity */
.nl { color: $green !important; }
.ne { color: $blue !important; font-weight: bold !important; } /* Name.Exception */ .ne { color: $blue !important; font-weight: bold !important; } /* Name.Exception */
.nf { color: $blue !important; font-weight: bold !important; } /* Name.Function */ .nf { color: $blue !important; font-weight: bold !important; } /* Name.Function */
.nn { color: $yellow !important; } /* Name.Namespace */ .nn { color: $yellow !important; } /* Name.Namespace */
@ -215,3 +216,4 @@ figure[role=code] {
padding-left: 3em; padding-left: 3em;
} }