diff --git a/.themes/classic/sass/base/_layout.scss b/.themes/classic/sass/base/_layout.scss index f9f3a41..ad99c6a 100644 --- a/.themes/classic/sass/base/_layout.scss +++ b/.themes/classic/sass/base/_layout.scss @@ -89,7 +89,10 @@ body { } } -#content { > div, > article { width: 100%; }} +#content { + overflow: hidden; + > div, > article { width: 100%; } +} aside.sidebar { float: none; @@ -134,6 +137,7 @@ body.sidebar-footer { } #content { @extend .group; + overflow: visible; margin-right: $sidebar-width-medium; position: relative; .no-sidebar & { margin-right: 0; border-right: 0; } diff --git a/.themes/classic/sass/base/_solarized.scss b/.themes/classic/sass/base/_solarized.scss index 45d8fc5..8903887 100644 --- a/.themes/classic/sass/base/_solarized.scss +++ b/.themes/classic/sass/base/_solarized.scss @@ -4,8 +4,8 @@ $base01: #586e75 !default; //darkest gray $base00: #657b83 !default; //dark gray $base0: #839496 !default; //medium gray $base1: #93a1a1 !default; //medium light gray -$base2: #eee8d5 !default; //cream -$base3: #fdf6e3 !default; //white +$base2: #f2f2f2 !default; //cream +$base3: #ffffff !default; //white $solar-yellow: #b58900 !default; $solar-orange: #cb4b16 !default; $solar-red: #dc322f !default; diff --git a/.themes/classic/sass/partials/_sharing.scss b/.themes/classic/sass/partials/_sharing.scss index 1fa9775..3eecb48 100644 --- a/.themes/classic/sass/partials/_sharing.scss +++ b/.themes/classic/sass/partials/_sharing.scss @@ -4,3 +4,5 @@ background: $img-border top left repeat-x; } } + +#fb-root { display: none; } diff --git a/.themes/classic/sass/partials/sidebar/_base.scss b/.themes/classic/sass/partials/sidebar/_base.scss index afda01c..5441304 100644 --- a/.themes/classic/sass/partials/sidebar/_base.scss +++ b/.themes/classic/sass/partials/sidebar/_base.scss @@ -2,6 +2,7 @@ @include box-shadow(lighten($sidebar-bg, 5) 0 1px); } aside.sidebar { + overflow: hidden; color: $sidebar-color; text-shadow: lighten($sidebar-bg, 8) 0 1px; a { @extend .force-wrap; } diff --git a/.themes/classic/source/javascripts/octopress.js b/.themes/classic/source/javascripts/octopress.js index c0b53cf..379e663 100644 --- a/.themes/classic/source/javascripts/octopress.js +++ b/.themes/classic/source/javascripts/octopress.js @@ -110,7 +110,7 @@ function wrapFlashVideos() { function renderDeliciousLinks(items) { var output = ""; $('#delicious').html(output); diff --git a/_config.yml b/_config.yml index 38e5182..b09453e 100644 --- a/_config.yml +++ b/_config.yml @@ -42,7 +42,7 @@ pagination_dir: blog # Directory base for pagination URLs eg. /blog/page/2/ recent_posts: 5 # Posts in the sidebar Recent Posts section excerpt_link: "Read on →" # "Continue reading" link text at the bottom of excerpted articles -titlecase: true # Converts page and post titles to tilecase +titlecase: true # Converts page and post titles to titlecase # list each of the sidebar modules you want to include, in the order you want them to appear. # To add custom asides, create files in /source/_includes/custom/asides/ and add them to the list like 'custom/asides/custom_aside_name.html' diff --git a/sass/base/_layout.scss b/sass/base/_layout.scss index f9f3a41..ad99c6a 100644 --- a/sass/base/_layout.scss +++ b/sass/base/_layout.scss @@ -89,7 +89,10 @@ body { } } -#content { > div, > article { width: 100%; }} +#content { + overflow: hidden; + > div, > article { width: 100%; } +} aside.sidebar { float: none; @@ -134,6 +137,7 @@ body.sidebar-footer { } #content { @extend .group; + overflow: visible; margin-right: $sidebar-width-medium; position: relative; .no-sidebar & { margin-right: 0; border-right: 0; } diff --git a/sass/base/_solarized.scss b/sass/base/_solarized.scss index 45d8fc5..8903887 100644 --- a/sass/base/_solarized.scss +++ b/sass/base/_solarized.scss @@ -4,8 +4,8 @@ $base01: #586e75 !default; //darkest gray $base00: #657b83 !default; //dark gray $base0: #839496 !default; //medium gray $base1: #93a1a1 !default; //medium light gray -$base2: #eee8d5 !default; //cream -$base3: #fdf6e3 !default; //white +$base2: #f2f2f2 !default; //cream +$base3: #ffffff !default; //white $solar-yellow: #b58900 !default; $solar-orange: #cb4b16 !default; $solar-red: #dc322f !default; diff --git a/sass/base/_theme.scss b/sass/base/_theme.scss index 62e0689..9a50a8b 100644 --- a/sass/base/_theme.scss +++ b/sass/base/_theme.scss @@ -1,4 +1,4 @@ -$noise-bg: image-url('noise.png') top left; +$noise-bg: image-url('noise.png') top left !default; $img-border: inline-image('dotted-border.png'); // Main Link Colors @@ -41,7 +41,7 @@ $sidebar-link-color-hover: $link-color-hover !default; $sidebar-link-color-active: $link-color-active !default; $sidebar-color: change-color(mix($text-color, $sidebar-bg, 80), $hue: hue($sidebar-bg), $saturation: saturation($sidebar-bg)/2) !default; $sidebar-border: desaturate(darken($sidebar-bg, 7), 10) !default; -$sidebar-border: darken($sidebar-bg, 7) !default; +$sidebar-border-hover: darken($sidebar-bg, 7) !default; $sidebar-link-color-subdued: lighten($sidebar-color, 20) !default; $sidebar-link-color-subdued-hover: $sidebar-link-color-hover !default; $twitter-status-link: lighten($sidebar-link-color-subdued, 15) !default; diff --git a/sass/partials/_sharing.scss b/sass/partials/_sharing.scss index 1fa9775..3eecb48 100644 --- a/sass/partials/_sharing.scss +++ b/sass/partials/_sharing.scss @@ -4,3 +4,5 @@ background: $img-border top left repeat-x; } } + +#fb-root { display: none; } diff --git a/sass/partials/sidebar/_base.scss b/sass/partials/sidebar/_base.scss index afda01c..5441304 100644 --- a/sass/partials/sidebar/_base.scss +++ b/sass/partials/sidebar/_base.scss @@ -2,6 +2,7 @@ @include box-shadow(lighten($sidebar-bg, 5) 0 1px); } aside.sidebar { + overflow: hidden; color: $sidebar-color; text-shadow: lighten($sidebar-bg, 8) 0 1px; a { @extend .force-wrap; } diff --git a/source/_includes/navigation.html b/source/_includes/navigation.html index 9b87017..2f0e628 100644 --- a/source/_includes/navigation.html +++ b/source/_includes/navigation.html @@ -4,10 +4,12 @@
  • Email
    • {% endif %} + {% if site.simple_search %}
    + {% endif %} {% include custom/navigation.html %} diff --git a/source/javascripts/octopress.js b/source/javascripts/octopress.js index c0b53cf..379e663 100644 --- a/source/javascripts/octopress.js +++ b/source/javascripts/octopress.js @@ -110,7 +110,7 @@ function wrapFlashVideos() { function renderDeliciousLinks(items) { var output = ""; $('#delicious').html(output);