fixed sidebar columnization

2 files changed, 18 insertions, 13 deletions

diff --git a/.themes/classic/sass/base/_layout.scss b/.themes/classic/sass/base/_layout.scss
index b1b44738..64344c82 100644
--- a/.themes/classic/sass/base/_layout.scss
+++ b/.themes/classic/sass/base/_layout.scss
@@ -19,7 +19,7 @@ body {
   max-width: $max-width;
   position: relative;
   margin: 0 auto;
-  > header, > nav, > footer, #content > article, #content > div > article {
+  > header, > nav, > footer, #content > article, #content > div > article, #content > div > nav {
     @extend .group;
     padding-left: $pad-min;
     padding-right: $pad-min;
@@ -60,10 +60,10 @@ body {
   #content aside {
     @extend .group;
     section {
-    &.odd, &.even { float: left; width: 48%; }
-    &.odd { margin-left: 0; }
-    &.even { margin-left: 4%; }
-   }
+      &.odd, &.even { float: left; width: 48%; }
+      &.odd { margin-left: 0; }
+      &.even { margin-left: 4%; }
+    }
   }
 }
 @media only screen and (min-width: 768px) {
@@ -89,7 +89,10 @@ body {
       background: none;
       float: left;
       margin: 0 -100% 0 0;
-      section, section.even { width: auto; margin: 0; }
+      section {
+        width: auto; margin-left: 0;
+        &.odd, &.even { float: none; width: auto; margin-left: 0; }
+      }
     }
     .collapse-sidebar & {
       margin-right: 10px;
diff --git a/.themes/classic/source/javascripts/octopress.js b/.themes/classic/source/javascripts/octopress.js
index c26a21f3..949f7a03 100644
--- a/.themes/classic/source/javascripts/octopress.js
+++ b/.themes/classic/source/javascripts/octopress.js
@@ -21,14 +21,16 @@ function addSidebarToggler() {
     }
   });
   sections = $('aside[role=sidebar] > section')
+  if(sections.length > 1){
+    sections.each(function(section, index){
+      if ((sections.length >= 3) && index % 3 == 0) {
+        $(section).addClass("first");
+      }
+      count = ((index +1) % 2) ? "odd" : "even";
+      $(section).addClass(count);
+    });
+  }
   if(sections.length >= 3){ $('aside[role=sidebar]').addClass('thirds') }
-  sections.each(function(section, index){
-    if ((sections.length >= 3) && index % 3 == 0) {
-      $(section).addClass("first");
-    }
-    count = ((index +1) % 2) ? "odd" : "even";
-    $(section).addClass(count);
-  });
 }
 function testFeatures() {
   var features = ['maskImage'];