zen-grids 1.0.alpha.3 → 1.0.beta.1

data/README.txt

@@ -40,7 +40,7 @@ INSTALLATION
 
 Zen grids is distributed as a Ruby Gem. On your computer, simply run:
 
-  sudo gem install zen-grids
+  sudo gem install zen-grids --pre
 
 Then to add it to an existing project, edit the project's configuration file,
 config.rb, and add this line:

data/stylesheets/zen/_columns.scss

@@ -7,8 +7,8 @@ $legacy-support-for-ie6: true !default;
 
 
 //
-// This mixin should be applied to a container so that the children elements
-// become columns arranged with the Zen Columns layout method.
+// This mixin should be applied to a container so that the children items become
+// columns arranged with the Zen Columns layout method.
 //
 // The mixin has the following required parameters:
 // - $selectors: A list of selectors for all the columns inside the container.
@@ -39,8 +39,8 @@ $legacy-support-for-ie6: true !default;
 // In addition to standard columns, the mixin supports one horizontal navbar
 // that will appear (with a fixed height) above all the other columns. The
 // parameters for this optional navbar are:
-// - $navbar-selector: The selector for the navbar. It should be a child element
-//   of the container just as a normal column is.
+// - $navbar-selector: The selector for the navbar. It should be a child item of
+//   the container just as a normal column is.
 // - $navbar-height: The fixed height of the navbar. Required if the
 //   $navbar-selector is used.
 // - $navbar-width: The width of the navbar. Defaults to 100% of the container

data/stylesheets/zen/_grids.scss

@@ -26,9 +26,10 @@ $zen-box-sizing: border-box !default;
 // This is a helper variable for RTL layouts.
 $zen-reverse-all-floats: false !default;
 
-// You can generate more efficient CSS if you manually apply the unit base to
-// all grid elements in a single ruleset.
-$zen-auto-include-unit-base: true !default;
+// You can generate more efficient CSS if you manually apply the
+// zen-grid-item-base mixin to all grid items from within a single ruleset.
+$zen-auto-include-item-base: true !default;
+$zen-auto-include-html-item-base: true !default;
 
 // Turn off IE6/7 support since we're defaulting to box-sizing: border-box.
 $legacy-support-for-ie7: false !default;
@@ -42,7 +43,7 @@ $legacy-support-for-ie6: false !default;
 
 
 //
-// Apply this to the container element.
+// Apply this to the grid container element.
 //
 @mixin zen-grid-container () {
   position: relative;
@@ -50,11 +51,11 @@ $legacy-support-for-ie6: false !default;
 }
 
 //
-// Apply this to any content box that is also a container element for a nested
-// grid.
+// Apply this to any grid item that is also a grid container element for a
+// nested grid.
 //
 @mixin zen-nested-container () {
-  @include zen-grid-container();
+  @include zen-grid-container;
   padding: {
     left: 0;
     right: 0;
@@ -62,21 +63,23 @@ $legacy-support-for-ie6: false !default;
 }
 
 //
-// Apply this to each content box. Set the $column-position to the column number
-// the content box starts on. And set the $column-span to the number of columns
-// that the content box spans.
+// Apply this to each grid item. Set the $column-position to the column number
+// the grid item starts on. And set the $column-span to the number of columns
+// that the grid item spans.
 //
-// For content boxes that are floated right, the $column-position is counted
+// For grid items that are floated right, the $column-position is counted
 // from the right instead of from the left.
 //
-@mixin zen-grid (
+@mixin zen-grid-item (
   $column-position,
   $column-span,
   $float-direction: $zen-float-direction,
   $column-count: $zen-column-count,
   $gutter-width: $zen-gutter-width,
   $grid-width: $zen-grid-width,
-  $box-sizing: $zen-box-sizing
+  $box-sizing: $zen-box-sizing,
+  $reverse-all-floats: $zen-reverse-all-floats,
+  $auto-include-item-base: $zen-auto-include-item-base
 ) {
 
   // Calculate the unit width.
@@ -84,7 +87,7 @@ $legacy-support-for-ie6: false !default;
 
   // Determine the float direction and its reverse.
   $dir: $float-direction;
-  @if $zen-reverse-all-floats {
+  @if $reverse-all-floats {
     $dir: zen-direction-flip($dir);
   }
   $rev: zen-direction-flip($dir);
@@ -97,8 +100,8 @@ $legacy-support-for-ie6: false !default;
   }
 
   // Auto-apply the unit base mixin.
-  @if $zen-auto-include-unit-base {
-    @include zen-grid-unit-base($gutter-width, $box-sizing);
+  @if $auto-include-item-base {
+    @include zen-grid-item-base($gutter-width, $box-sizing);
   }
 }
 
@@ -109,17 +112,17 @@ $legacy-support-for-ie6: false !default;
 // The mixin has the following optional parameters, but its better to use the
 // $zen-gutter-width and $zen-box-sizing variables instead:
 // - $gutter-width: Half of this value is applied as padding to the left and
-//   right sides of the element.
+//   right sides of the item.
 // - $box-sizing: The type of CSS3 box model each box should use. Can be set to
 //   content-box or border-box. Defaults to content-box, but border-box is way
 //   cooler. IE 6 and 7 don't support border-box.
-@mixin zen-grid-unit-base (
+@mixin zen-grid-item-base (
   $gutter-width: $zen-gutter-width,
   $box-sizing: $zen-box-sizing
 ) {
   padding: {
-    left: $gutter-width / 2;
-    right: $gutter-width / 2;
+    left: zen-half-gutter($gutter-width);
+    right: zen-half-gutter($gutter-width);
   }
   // Specify the border-box properties.
   @if $box-sizing == border-box {
@@ -152,29 +155,38 @@ $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
+  $float-direction: $zen-float-direction,
+  $reverse-all-floats: $zen-reverse-all-floats
 ) {
   // Determine the float direction.
   $dir: $float-direction;
-  @if $zen-reverse-all-floats {
+  @if $reverse-all-floats {
     $dir: zen-direction-flip($dir);
   }
   clear: $dir;
 }
 
 //
-// Apply this to an element to help align it to the grid. Set the $column-span
-// to the number of columns that the content box spans. Set the $column-count to
-// the number of columns that the parent element spans.
+// Apply this to an HTML item that is in the normal flow of a document to help
+// align it to the grid. Set the $column-span to the number of columns that the
+// HTML element should span. Set the $column-count to the number of columns that
+// the parent element spans.
 //
-@mixin zen-grid-width (
+// Unlike the zen-grid-item() mixin, this mixin does not float the HTML item. To
+// help position the item to align flush with the left edge of a containing grid
+// item, you can set the $alpha-margin to true. To help position the item to
+// align to align flush with the right edge of a containing grid item, you can
+// set the $omega-margin to true.
+//
+@mixin zen-grid-html-item (
   $column-span,
   $column-count: $zen-column-count,
   $alpha-margin: false,
   $omega-margin: false,
   $gutter-width: $zen-gutter-width,
   $grid-width: $zen-grid-width,
-  $box-sizing: $zen-box-sizing
+  $box-sizing: $zen-box-sizing,
+  $auto-include-html-item-base: $zen-auto-include-html-item-base
 ) {
 
   $dir: $zen-float-direction;
@@ -194,7 +206,9 @@ $legacy-support-for-ie6: false !default;
   width: $column-span * $unit-width;
 
   // Auto-apply the unit base mixin.
-  @include zen-grid-unit-base($gutter-width, $box-sizing);
+  @if $auto-include-html-item-base {
+    @include zen-grid-item-base($gutter-width, $box-sizing);
+  }
 }
 
 
@@ -212,5 +226,6 @@ $legacy-support-for-ie6: false !default;
 
 // Returns a half gutter width.
 @function zen-half-gutter($gutter-width: $zen-gutter-width) {
+  // @todo Handle odd-pixel-sized gutters.
   @return $gutter-width / 2;
 }

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.3'
-  s.date        = '2012-01-15'
+  s.version     = '1.0.beta.1'
+  s.date        = '2012-01-20'
 
   s.authors     = ['John Albin Wilkins']
   s.email       = 'virtually.johnalbin@gmail.com'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: zen-grids
 version: !ruby/object:Gem::Version 
-  hash: -3702664262
+  hash: 62196289
   prerelease: 4
   segments: 
   - 1
   - 0
-  - alpha
-  - 3
-  version: 1.0.alpha.3
+  - beta
+  - 1
+  version: 1.0.beta.1
 platform: ruby
 authors: 
 - John Albin Wilkins
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-15 00:00:00 Z
+date: 2012-01-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sass
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 
-rubyforge_project: 1.0.alpha.3
+rubyforge_project: 1.0.beta.1
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3