zen-grids 1.0.alpha.1 → 1.0.alpha.2

data/stylesheets/zen/_grids.scss

@@ -141,6 +141,20 @@ $legacy-support-for-ie6: false !default;
   }
 }
 
+//
+// Apply this to content boxes that need to be cleared below other content boxes.
+//
+@mixin zen-clear (
+  $float-direction: $zen-float-direction
+) {
+  // Determine the float direction.
+  $dir: $float-direction;
+  @if $zen-reverse-all-floats {
+    $dir: zen-direction-flip($dir);
+  }
+  clear: $dir;
+}
+
 
 //
 // Helper functions for the Zen mixins.

data/templates/project/layout.scss

@@ -9,7 +9,6 @@ $legacy-support-for-ie7: false;
 $zen-column-count: 12;
 $zen-gutter-width: 20px;
 
-$navbar-height: 4em;
 
 //
 // Skip link styling
@@ -36,44 +35,84 @@ $navbar-height: 4em;
   }
 }
 
+#header,
+#main,
+#footer {
+  margin: {
+    left: auto;
+    right: auto;
+  }
+  max-width: 1100px;
+}
+
 #main {
   @include zen-grid-container();
 }
 
-@media all and (min-width: 480px) and (max-width: 639px) {
-  $zen-column-count: 3;
+//
+// Horizontal navigation bar
+@media all and (min-width: 480px) {
+  $zen-column-count: 1;
+  $navbar-height: 4em;
 
   #main {
     padding-top: $navbar-height;
   }
   #main-menu {
-    @include zen-grid(1, 3);
+    @include zen-grid(1, 1);
     margin-top: -$navbar-height;
     height: $navbar-height;
   }
+}
+
+@media all and (min-width: 480px) and (max-width: 639px) {
+  $zen-column-count: 2;
+
   #content {
     @include zen-grid(1, 2);
   }
   #aside1 {
-    @include zen-grid(1, 1, right);
+    @include zen-grid(1, 1);
+    @include zen-clear(); // Clear left-floated elements (#content)
   }
   #aside2 {
-    clear: right;
+    @include zen-grid(2, 1);
+  }
+}
+
+@media all and (min-width: 640px) and (max-width: 799px) {
+  $zen-column-count: 3;
+
+  #content {
+    @include zen-grid(1, 2);
+  }
+  #aside1 {
     @include zen-grid(1, 1, right);
   }
+  #aside2 {
+    @include zen-clear(left); // Clear right-floated elements (#content)
+    @include zen-grid(1, 2);
+  }
 }
 
-@media all and (min-width: 640px) {
-  $zen-column-count: 5;
+@media all and (min-width: 800px) and (max-width: 959px) {
+  $zen-column-count: 3;
 
-  #main {
-    padding-top: $navbar-height;
+  #content {
+    @include zen-grid(1, 2);
   }
-  #main-menu {
-    @include zen-grid(1, 5);
-    margin-top: -$navbar-height;
-    height: $navbar-height;
+  #aside1 {
+    @include zen-grid(1, 1, right);
   }
+  #aside2 {
+    @include zen-clear(right); // Clear right-floated elements (#aside1)
+    @include zen-grid(1, 1, right);
+  }
+}
+
+@media all and (min-width: 960px) {
+  $zen-column-count: 5;
+
   #content {
     @include zen-grid(2, 3);
   }

data/zen-grids.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://zengrids.com'
   s.rubyforge_project =
 
-  s.version     = '1.0.alpha.1'
-  s.date        = '2012-01-11'
+  s.version     = '1.0.alpha.2'
+  s.date        = '2012-01-12'
 
   s.authors     = ['John Albin Wilkins']
   s.email       = 'virtually.johnalbin@gmail.com'

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 0
   - alpha
-  - 1
-  version: 1.0.alpha.1
+  - 2
+  version: 1.0.alpha.2
 platform: ruby
 authors: 
 - John Albin Wilkins
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-11 00:00:00 +08:00
+date: 2012-01-12 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 
-rubyforge_project: 1.0.alpha.1
+rubyforge_project: 1.0.alpha.2
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3