Merge branch 'master' of github.com:imathis/octopress

This commit is contained in:
Brandon Mathis 2011-07-25 20:35:36 -04:00
commit 3ebe3e5a0e

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;