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

Conflicts:
	plugins/category_generator.rb

1 files changed, 36 insertions, 28 deletions

diff --git a/.themes/classic/sass/partials/_syntax.scss b/.themes/classic/sass/partials/_syntax.scss
index 77ac8d78..5465286f 100644
--- a/.themes/classic/sass/partials/_syntax.scss
+++ b/.themes/classic/sass/partials/_syntax.scss
@@ -1,44 +1,52 @@
 .highlight, html .gist .gist-file .gist-syntax .gist-highlight {
   table td.code { width: 100%; }
-  .line-numbers {
-    text-align: right;
-    font-size: 13px;
-    line-height: 1.45em;
-    @if $solarized == light {
-      background: lighten($base03, 1) $noise-bg !important;
-      border-right: 1px solid darken($base02, 2) !important;
-      @include box-shadow(lighten($base03, 2) -1px 0 inset);
-      text-shadow: lighten($base02, 2) 0 -1px;
-    } @else {
-      background: $base02 $noise-bg !important;
-      border-right: 1px solid darken($base03, 2) !important;
-      @include box-shadow(lighten($base02, 2) -1px 0 inset);
-      text-shadow: darken($base02, 10) 0 -1px;
-    }
-    span { color: $base01 !important; }
-    padding: .8em !important;
-    @include border-radius(0);
-  }
   border: 1px solid $pre-border !important;
 }
+.highlight .line-numbers, html .gist .gist-file .gist-syntax .highlight .line_numbers {
+  text-align: right;
+  font-size: 13px;
+  line-height: 1.45em;
+  @if $solarized == light {
+    background: lighten($base03, 1) $noise-bg !important;
+    border-right: 1px solid darken($base02, 2) !important;
+    @include box-shadow(lighten($base03, 2) -1px 0 inset);
+    text-shadow: lighten($base02, 2) 0 -1px;
+  } @else {
+    background: $base02 $noise-bg !important;
+    border-right: 1px solid darken($base03, 2) !important;
+    @include box-shadow(lighten($base02, 2) -1px 0 inset);
+    text-shadow: darken($base02, 10) 0 -1px;
+  }
+  span { color: $base01 !important; }
+  padding: .8em !important;
+  @include border-radius(0);
+}
+
 figure.code, .gist-file, pre {
   @include box-shadow(rgba(#000, .06) 0 0 10px);
   .highlight pre { @include box-shadow(none); }
 }
 
+.gist .highlight, figure.code .highlight {
+  @include selection(adjust-color($base03, $lightness: 23%, $saturation: -65%), $text-shadow: $base03 0 1px);
+}
 html .gist .gist-file {
   margin-bottom: 1.8em;
   position: relative;
   border: none;
   padding-top: image-height("code_bg.png") !important;
+  .highlight {
+    margin-bottom: 0;
+  }
   .gist-syntax {
     border-bottom: 0 !important;
     background: none !important;
-    .gist-highlight{
+    .gist-highlight {
       background: $base03 !important;
-      pre {
-        @extend .pre-code;
-      }
+    }
+    .highlight pre {
+      @extend .pre-code;
+      padding: 0;
     }
   }
   .gist-meta {
@@ -107,12 +115,11 @@ p, li {
 }
 
 .pre-code {
-  @include selection(adjust-color($base03, $lightness: 23%, $saturation: -65%), $text-shadow: $base03 0 1px);
   font-family: $mono !important;
   overflow: scroll;
   overflow-y: hidden;
   display: block;
-  padding: .8em !important;
+  padding: .8em;
   overflow-x: auto;
   line-height: 1.45em;
   background: $base03 $noise-bg !important;
@@ -187,7 +194,7 @@ p, li {
 }
 
 .highlight, .gist-highlight {
-  pre { background: none; @include border-radius(none); border: none; padding: 0; margin-bottom: 0; }
+  pre { background: none; @include border-radius(0px); border: none; padding: 0; margin-bottom: 0; }
   margin-bottom: 1.8em;
   background: $base03;
   overflow-y: hidden;
@@ -206,7 +213,9 @@ pre, .highlight, .gist-highlight {
   &::-webkit-scrollbar-thumb:horizontal { background: $solar-scroll-thumb;  -webkit-border-radius: 4px; border-radius: 4px }
 }
 
-.highlight code { @extend .pre-code; background: #000;}
+.highlight code { 
+  @extend .pre-code; background: #000;
+}
 figure.code {
   background: none;
   padding: 0;
@@ -250,4 +259,3 @@ figure.code {
   text-shadow: #cbcccc 0 1px 0;
   padding-left: 3em;
 }
-