compass-960-plugin 0.10.0 → 0.10.1

data/README.mkdn

@@ -1,10 +1,9 @@
 960 Grid System - Compass Plugin
 ================================
 
-* Port of Version 1.0
-* 2008-03-24
+960.gs is created by Nathan Smith. See the official site for more info: <http://960.gs/>
 
-Created by Nathan Smith. See the official site for more info: <http://960.gs/>
+* This plugin is consistent with latest version of 960.gs as of 3/14/2011
 
 ---------
 
@@ -29,8 +28,21 @@ Then edit your `grid.sass` and `text.sass` files accordingly. A reset is added i
 Customizing your Grid System
 ============================
 
-To create a grid system with other number of columns use the `+grid-system` mixin to generate
-the corresponding classes.
+This plugin uses the following configuration variables:
+
+* `$ninesixty-columns` (default: 12) controls the default number of grid columns
+* `$ninesixty-grid-width` (default: 960px) controls the default overall grid width
+* `$ninesixty-gutter-width` (default: 20px) controls the default gutter width
+
+All of the mixins included with this plugin use these configuration variables
+as defaults if the corresponding argument is omitted from a mixin call.
+
+Class-Based Grid System
+=======================
+
+To create a grid system that works like the original 960 Grid Sytem framework
+use the `+grid-system` mixin to generate the corresponding classes. You can
+also customize the number of columns as demonstrated in the following example.
 
 Example:
 
@@ -40,20 +52,37 @@ Example:
 Making Semantic Grids
 =====================
 
+To create a grid system using only CSS, use the following semantic grid mixins:
+
 * Use the `+grid-container` mixin to declare your container element.
-* Use the `+grid` mixin to declare a grid element.
+* Use the `+grid(N, columns, gutter-width)` mixin to declare a grid element.
 * Use the `+alpha` and `+omega` mixins to declare the first and last grid elements for a row.
-* User the `+grid-prefix` and `+grid-suffix` mixins to add grid columns before or after a grid element.
+* Use the `+grid-prefix(N, columns)` and `+grid-suffix(N, columns)` mixins to add empty grid columns before or after a grid element.
+* Use the `+grid-push(N, columns)` and `+grid-pull(N, columns)` mixins to move a grid element from its default position.
+
+`N` is the number of grid columns to span as in `grid_N` or `push_N` with the original 960 Grid System framework.
 
 Example:
 
+    $ninesixty-columns: 16
+
     #wrap
       +grid-container
       #left-nav
         +alpha
-        +grid(5,16)
+        +grid(5)
       #main-content
-        +grid-prefix(1,16)
-        +grid(10, 16)
+        +grid-prefix(1)
+        +grid(10)
         +omega
 
+Authors/Contributors
+====================
+
+[Chris Eppstein](http://chriseppstein.github.com/) is the creator of Compass, a core contributor to Sass and the father of this plugin.
+
+[Nathan Smith](http://sonspring.com/) is the author of [960.gs](http://960.gs/), the grid system this plugin is based on. He's also kind enough to let us pester him with questions from time to time.
+
+These days, [Matt Sanders](https://github.com/mattsa) is probably the best person chat with if you've found a bug or want to get a patch included.
+
+We've also been lucky enough to have some help from a number of [other contributors](https://github.com/chriseppstein/compass-960-plugin/contributors).

data/compass-960-plugin.gemspec

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{compass-960-plugin}
-  s.version = "0.10.0"
+  s.version = "0.10.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.5")
-  s.authors = ["Chris Eppstein"]
-  s.date = %q{2010-06-07}
+  s.authors = ["Chris Eppstein", "Matt Sanders"]
+  s.date = %q{2011-03-14}
   s.description = %q{The 960 Grid System is an effort to streamline web development workflow by providing commonly used dimensions, based on a width of 960 pixels. http://960.gs/}
-  s.email = %q{chris@eppsteins.net}
+  s.email = %w{chris@eppsteins.net matt@modal.org}
   s.has_rdoc = false
   s.files = [
     "compass-960-plugin.gemspec",

data/stylesheets/960/_grid.sass

@@ -61,21 +61,29 @@ $ninesixty-columns: 12 !default
 =grid-move-base
   position: relative
 
-=grid-push($n, $cols)
+=grid-move-push($n, $cols)
   left: ($ninesixty-grid-width / $cols) * $n
 
-=grid-pull($n, $cols)
+=grid-move-pull($n, $cols)
   left: -($ninesixty-grid-width / $cols) * $n
 
+=grid-push($n, $cols: $ninesixty-columns)
+  +grid-move-base
+  +grid-move-push($n, $cols)
+
+=grid-pull($n, $cols: $ninesixty-columns)
+  +grid-move-base
+  +grid-move-pull($n, $cols)
+
 =grid-movements($cols: $ninesixty-columns)
   #{enumerate(".push", 1, $cols, "_")},
   #{enumerate(".pull", 1, $cols, "_")}
     +grid-move-base
   @for $n from 1 through $cols
     .push_#{$n}
-      +grid-push($n, $cols)
+      +grid-move-push($n, $cols)
     .pull_#{$n}
-      +grid-pull($n, $cols)
+      +grid-move-pull($n, $cols)
 
 =grid-system($cols: $ninesixty-columns)
   +grid-container

metadata

@@ -1,41 +1,32 @@
 --- !ruby/object:Gem::Specification 
 name: compass-960-plugin
 version: !ruby/object:Gem::Version 
-  hash: 55
-  prerelease: false
-  segments: 
-  - 0
-  - 10
-  - 0
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors: 
 - Chris Eppstein
+- Matt Sanders
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-06-07 00:00:00 -07:00
+date: 2011-03-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: compass
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 10
-        - 0
         version: 0.10.0
-  type: :runtime
-  version_requirements: *id001
+    version: 
 description: The 960 Grid System is an effort to streamline web development workflow by providing commonly used dimensions, based on a width of 960 pixels. http://960.gs/
-email: chris@eppsteins.net
+email: 
+- chris@eppsteins.net
+- matt@modal.org
 executables: []
 
 extensions: []
@@ -51,7 +42,7 @@ files:
 - templates/project/grid.sass
 - templates/project/manifest.rb
 - templates/project/text.sass
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/chriseppstein/compass-960-plugin
 licenses: []
 
@@ -61,29 +52,21 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 17
-      segments: 
-      - 1
-      - 3
-      - 5
       version: 1.3.5
+  version: 
 requirements: []
 
 rubyforge_project: compass-960-plugin
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Compass compatible Sass port of 960.gs.