grid-coordinates 1.1.3 → 1.1.4

data/README.mdown

@@ -48,21 +48,25 @@ When you use the mixin `+grid-coordinates` you are able to leverage the classes
 
 For an example of this in use, take a peek at [grid-coordinates.com/.../demo.sass](https://github.com/adamstac/grid-coordinates.com/blob/master/themes/grid-coordinates/sass/demo.sass).
 
-`@extend grid-container`
+`@extend .grid-container`
 
-`@extend nested-grid-container`
+`@extend .nested-grid-container`
 
-`@extend grid([columns])`
+`@extend .grid([columns])`
 
-`@extend grid-prefix([columns])`
+`@extend .grid-prefix([columns])`
 
-`@extend grid-suffix([columns])`
+`@extend .grid-prefix-margin-([columns])`
 
-`@extend grid-push([columns])`
+`@extend .grid-suffix([columns])`
 
-`@extend grid-pull([columns])`
+`@extend .grid-suffix-margin-([columns])`
 
-`@extend grid-full`
+`@extend .grid-push([columns])`
+
+`@extend .grid-pull([columns])`
+
+`@extend .grid-full`
 
 ### Using the Mixins
 
@@ -74,9 +78,9 @@ Use these mixins in your Sass stylesheets. Keep in mind that when you go the rou
 
 `+grid([columns])`
 
-`+grid-prefix([columns])`
+`+grid-prefix([columns], [type])`
 
-`+grid-suffix([columns])`
+`+grid-suffix([columns], [type])`
 
 `+grid-push([columns])`
 

data/lib/grid-coordinates.rb

@@ -5,6 +5,7 @@ Compass::Frameworks.register("grid-coordinates", :path => "#{File.dirname(__FILE
 
 module GridCoordinates
   
-  VERSION = "1.1.3".freeze
+  VERSION = "1.1.4".freeze
+  DATE = "2011-03-13".freeze
 
 end

data/stylesheets/_grid-coordinates.sass

@@ -43,9 +43,15 @@ $overflow: true !default
   @for $i from 1 through $grid-columns - 1
     .grid-prefix-#{$i}
       +grid-prefix($i)
+  @for $i from 1 through $grid-columns - 1
+    .grid-prefix-margin-#{$i}
+      +grid-prefix($i,margin)
   @for $i from 1 through $grid-columns - 1
     .grid-suffix-#{$i}
       +grid-suffix($i)
+  @for $i from 1 through $grid-columns - 1
+    .grid-suffix-margin-#{$i}
+      +grid-suffix($i,margin)
   @for $i from 1 through $grid-columns - 1
     .grid-push-#{$i}
       +grid-push($i)
@@ -62,7 +68,7 @@ $overflow: true !default
 // Grid Container
 =grid-container-base
   margin: 0 auto
-  width: $grid-columns * $grid-width + $grid-columns * $grid-gutter-width
+  width: ($grid-columns * $grid-width) + ($grid-columns * $grid-gutter-width)
 
 =grid-container
   +overflow
@@ -72,8 +78,8 @@ $overflow: true !default
 =nested-grid-container-base
   display: inline-block
   margin:
-    left: -$grid-gutter-width / 2
-    right: -$grid-gutter-width / 2
+    left: -($grid-gutter-width / 2)
+    right: -($grid-gutter-width / 2)
   width: auto
 
 =nested-grid-container
@@ -84,7 +90,7 @@ $overflow: true !default
 =grid-block-base
   +float-left
   position: relative
-  margin: 0 $grid-gutter-width / 2
+  margin: 0 ($grid-gutter-width / 2)
 
 =grid-block
   +grid-block-base
@@ -108,26 +114,20 @@ $overflow: true !default
   @else
     width: (($grid-columns * $grid-width) + ($grid-columns * $grid-gutter-width)) - $grid-gutter-width
 
-=grid-prefix($grid-columns)
-  @if $grid-columns == 1
-    padding-left: $grid-width + $grid-gutter-width
-  @else
+=grid-prefix($grid-columns, $type: "padding")
+  @if $type == "padding"
     padding-left: ($grid-columns * $grid-width) + ($grid-columns * $grid-gutter-width)
-
-=grid-suffix($grid-columns)
-  @if $grid-columns == 1
-    padding-right: $grid-width + $grid-gutter-width
   @else
+    margin-left: (($grid-columns * $grid-width) + ($grid-columns * $grid-gutter-width)) + ($grid-gutter-width / 2)
+
+=grid-suffix($grid-columns, $type: "padding")
+  @if $type == "padding"
     padding-right: ($grid-columns * $grid-width) + ($grid-columns * $grid-gutter-width)
+  @else
+    margin-right: (($grid-columns * $grid-width) + ($grid-columns * $grid-gutter-width)) + ($grid-gutter-width / 2)
 
 =grid-push($grid-columns)
-  @if $grid-columns == 1
-    left: $grid-width + $grid-gutter-width
-  @else
-    left: ($grid-columns * $grid-width) + ($grid-columns * $grid-gutter-width)
+  left: ($grid-columns * $grid-width) + ($grid-columns * $grid-gutter-width)
 
 =grid-pull($grid-columns)
-  @if $grid-columns == 1
-    left: -(($grid-width + $grid-gutter-width))
-  @else
-    left: -(($grid-columns * $grid-width) + ($grid-columns * $grid-gutter-width))
+  left: -($grid-columns * $grid-width) + ($grid-columns * $grid-gutter-width)

data/stylesheets/_grid-coordinates.scss

@@ -42,9 +42,15 @@ $overflow: true !default;
   @for $i from 1 through $grid-columns - 1 {
     .grid-prefix-#{$i} {
       @include grid-prefix($i); } }
+  @for $i from 1 through $grid-columns - 1 {
+    .grid-prefix-margin-#{$i} {
+      @include grid-prefix($i, margin); } }
   @for $i from 1 through $grid-columns - 1 {
     .grid-suffix-#{$i} {
       @include grid-suffix($i); } }
+  @for $i from 1 through $grid-columns - 1 {
+    .grid-suffix-margin-#{$i} {
+      @include grid-suffix($i, margin); } }
   @for $i from 1 through $grid-columns - 1 {
     .grid-push-#{$i} {
       @include grid-push($i); } }
@@ -71,8 +77,8 @@ $overflow: true !default;
 @mixin nested-grid-container-base {
   display: inline-block;
   margin: {
-    left: -$grid-gutter-width / 2;
-    right: -$grid-gutter-width / 2; };
+    left: -($grid-gutter-width / 2);
+    right: -($grid-gutter-width / 2); };
   width: auto; }
 
 @mixin nested-grid-container {
@@ -107,26 +113,20 @@ $overflow: true !default;
   @else {
     width: $grid-columns * $grid-width + $grid-columns * $grid-gutter-width - $grid-gutter-width; } }
 
-@mixin grid-prefix($grid-columns) {
-  @if $grid-columns == 1 {
-    padding-left: $grid-width + $grid-gutter-width; }
+@mixin grid-prefix($grid-columns, $type: "padding") {
+  @if $type == "padding" {
+    padding-left: $grid-columns * $grid-width + $grid-columns * $grid-gutter-width; }
   @else {
-    padding-left: $grid-columns * $grid-width + $grid-columns * $grid-gutter-width; } }
+    margin-left: $grid-columns * $grid-width + $grid-columns * $grid-gutter-width + $grid-gutter-width / 2; } }
 
-@mixin grid-suffix($grid-columns) {
-  @if $grid-columns == 1 {
-    padding-right: $grid-width + $grid-gutter-width; }
+@mixin grid-suffix($grid-columns, $type: "padding") {
+  @if $type == "padding" {
+    padding-right: $grid-columns * $grid-width + $grid-columns * $grid-gutter-width; }
   @else {
-    padding-right: $grid-columns * $grid-width + $grid-columns * $grid-gutter-width; } }
+    margin-right: $grid-columns * $grid-width + $grid-columns * $grid-gutter-width + $grid-gutter-width / 2; } }
 
 @mixin grid-push($grid-columns) {
-  @if $grid-columns == 1 {
-    left: $grid-width + $grid-gutter-width; }
-  @else {
-    left: $grid-columns * $grid-width + $grid-columns * $grid-gutter-width; } }
+  left: $grid-columns * $grid-width + $grid-columns * $grid-gutter-width; }
 
 @mixin grid-pull($grid-columns) {
-  @if $grid-columns == 1 {
-    left: -($grid-width + $grid-gutter-width); }
-  @else {
-    left: -($grid-columns * $grid-width + $grid-columns * $grid-gutter-width); } }
+  left: -($grid-columns * $grid-width) + $grid-columns * $grid-gutter-width; }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: grid-coordinates
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 1
-  - 3
-  version: 1.1.3
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - Adam Stacoviak
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 -05:00
+date: 2011-03-13 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency