compass-susy-plugin 0.9.alpha.1 → 0.9.alpha.2

data/VERSION

@@ -1 +1 @@
-0.9.alpha.1
+0.9.alpha.2

data/compass-susy-plugin.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{compass-susy-plugin}
-  s.version = "0.9.alpha.1"
+  s.version = "0.9.alpha.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Meyer"]
-  s.date = %q{2011-02-15}
+  s.date = %q{2011-02-16}
   s.description = %q{Responsive web design with grids the quick and reliable way.}
   s.email = %q{eric@oddbird.net}
   s.extra_rdoc_files = ["LICENSE.txt", "README.mkdn", "lib/susy.rb", "lib/susy/compass_plugin.rb"]

data/sass/susy/_grid.scss

@@ -4,10 +4,17 @@
 
 // Your basic settings for the grid.
 // Override these in base.sass to customize your site.
-$total-cols: 12 !default;
-$col-width: 4em !default;
-$gutter-width: 1em !default;
-$side-gutter-width: $gutter-width !default;
+$total-cols         : 12            !default;
+$col-width          : 4em           !default;
+$gutter-width       : 1em           !default;
+$side-gutter-width  : $gutter-width !default;
+
+// Controls for right-to-left or bi-directional sites.
+// You can override these case-by-case as needed for bi-directional sites.
+$from-direction     : left          !default;
+
+// Sets the direction that +omega elements are floated by deafult.
+$omega-float        : right         !default;
 
 // Functions -----------------------------------------------------------------
 
@@ -15,70 +22,66 @@ $side-gutter-width: $gutter-width !default;
 // plus page padding in non-nested contexts
 @function columns-width(
   $n: false
-  ) {
-    $sg: 0;
-    @if not $n {
-      $n: $total-cols;
-      $sg: $side-gutter-width;
-    }
-    $columns-width: ($n*$col-width) + (ceil($n - 1)*$gutter-width) + ($sg*2);
-    @return $columns-width;
+) {
+  $sg: 0;
+  @if not $n {
+    $n: $total-cols;
+    $sg: $side-gutter-width;
+  }
+  $columns-width: ($n*$col-width) + (ceil($n - 1)*$gutter-width) + ($sg*2);
+  @return $columns-width;
 }
 
 // Return the percentage for the target in a given context
 @function percent-width(
   $t,
   $c
-  ) {
-    $perc: ($t / $c) * 100%;
-    @return $perc;
+) {
+  $perc: ($t / $c) * 100%;
+  @return $perc;
 }
 
 // Return the percentage width of 'n' columns in a context of 'c'
 @function columns(
   $n, 
   $c: false
-  ) {
-    $columns: percent-width(columns-width($n), columns-width($c));
-    @return $columns;
+) {
+  $columns: percent-width(columns-width($n), columns-width($c));
+  @return $columns;
 }
 
 // Return the percentage width of a single gutter in a context of 'c'
 @function gutter(
   $c: false
-  ) {
-    $gutter: percent-width($gutter-width, columns-width($c));
-    @return $gutter;
+) {
+  $gutter: percent-width($gutter-width, columns-width($c));
+  @return $gutter;
 }
 
 // Return the percentage width of a single side gutter in a context of 'c'
 @function side-gutter(
   $c: false
-  ) {
-    $side-gutter: percent-width($side-gutter-width, columns-width($c));
-    @return $side-gutter;
+) {
+  $side-gutter: percent-width($side-gutter-width, columns-width($c));
+  @return $side-gutter;
 }
 
 // Return the percentage width of a single column in a context of 'c'
 @function column(
   $c: false
-  ) {
-    $column: percent-width($col-width, columns-width($c));
-    @return $column;
+) {
+  $column: percent-width($col-width, columns-width($c));
+  @return $column;
 }
 
 // Base Mixin ----------------------------------------------------------------
 
 // Set +container() on the outer grid-containing element(s).
 @mixin container() {
-  // clear all floated columns
   @include pie-clearfix;
-  // use auto horizontal margins to center your page in the body
   margin: auto;
-  // set the page width based on grid settings
   width: columns-width();
-  // never exceed 100% of the browser window (no side-scrolling)
-  max-width: 100%; 
+  max-width: 100%;
 }
 
 // Column Mixins -------------------------------------------------------------
@@ -90,9 +93,13 @@ $side-gutter-width: $gutter-width !default;
 //  - Context MUST NOT be declared on a top-level element.
 // By default a grid-column is floated left with a right gutter.
 //  - Override those with +float("right"), +alpha or +omega
-@mixin columns($n, $context: false) {
+@mixin columns(
+  $n, 
+  $context  : false, 
+  $from     : $from-direction
+) {
   // the column is floated left
-  @include float(left);
+  @include float($from);
   // the width of the column is set as a percentage of the context
   width: columns($n, $context);
   // the right gutter is added as a percentage of the context
@@ -100,20 +107,26 @@ $side-gutter-width: $gutter-width !default;
 }
 
 // Set +un-column to reset a column element to default block behavior
-@mixin un-column {
+@mixin un-column(
+  $from : $from-direction
+) {
+  $to   : opposite-position($from);
   float: none;
   display: block;
   width: auto;
-  margin-right: auto;  
+  margin-#{$to}: auto;  
 }
 
 // Set +full on an element that will span it's entire context.
 // There is no need for +columns, +alpha or +omega on a +full element.
-@mixin full($nested: false) {
+@mixin full(
+  $nested: false
+) {
   clear: both;
   @if not $nested {
-    margin-right: side-gutter();
-    margin-left: side-gutter(); 
+    margin:;
+      left: side-gutter();
+      right: side-gutter(); 
   } 
 }
 
@@ -121,21 +134,35 @@ $side-gutter-width: $gutter-width !default;
 
 // Set +prefix() on any element to add empty colums as padding 
 // before or after.
-@mixin prefix($n, $context: false) {
-  padding-left: columns($n, $context) + gutter($context); 
+@mixin prefix(
+  $n, 
+  $context  : false, 
+  $from     : $from-direction
+) {
+  padding-#{$from}: columns($n, $context) + gutter($context); 
 }
 
-@mixin suffix($n, $context: false) {
-  padding-right: columns($n, $context) + gutter($context); 
+@mixin suffix(
+  $n, 
+  $context  : false, 
+  $from     : $from-direction
+) {
+  $to       : opposite-position($from);
+  padding-#{$to-dir}: columns($n, $context) + gutter($context); 
 }
 
 // Set as a shortcut for both prefix and suffix.
-@mixin pad($p: false, $s: false, $c: false) {
+@mixin pad(
+  $p    : false, 
+  $s    : false, 
+  $c    : false, 
+  $from : $from-direction
+) {
   @if $p {
-    @include prefix($p, $c); 
+    @include prefix($p, $c, $from); 
   } 
   @if $s {
-    @include suffix($s, $c); 
+    @include suffix($s, $c, $from); 
   } 
 }
 
@@ -145,33 +172,33 @@ $side-gutter-width: $gutter-width !default;
 // context to take side-gutters into account. Recommended that you pass 
 // the actual nested contexts (when nested) rather than a true/false 
 // argument for the sake of consistency. Effect is the same.
-@mixin alpha($nested: false) {
+@mixin alpha(
+  $nested : false, 
+  $from   : $from-direction
+) {
   @if not $nested {
-    margin-left: side-gutter();
+    margin-#{$from-dir}: side-gutter();
   } @else {
     @warn "The alpha mixin is not needed in a nested context";
   }
 }
 
-// Sets the direction that +omega elements are floated
-//  - Override $omega_float globally or set +float locally to change
-$omega-float: right !default;
-
 // Set +omega() on the last element of a row, in order to take side-gutters
 // and the page edge into account. Set the $nested argument for nested 
 // columns. It is recommended that you pass the actual nested context when 
 // nested, rather than a true/false argument, for the sake of consistency. 
 // Effect is the same.
-@mixin omega($nested: false) {
-  @include float($omega-float);
-  @if $nested {
-    margin-right: 0; 
-  } @else {
-    margin-right: side-gutter(); 
-  }
-  @if $omega-float == right {
-    #margin-left: - $gutter-width; 
-  } @else {
-    #margin-right: - $gutter-width; 
+@mixin omega(
+  $nested : false, 
+  $from   : $from-direction
+) {
+  $to     : opposite-position($from);
+  $hack   : opposite-position($omega-float);
+  $sg     : 0;
+  @if not $nested {
+    $sg: side-gutter(); 
   }
+  @include float($omega-float);
+  margin-#{$to-dir}: side-gutter(); 
+  #margin-#{$hack-dir}: - $gutter-width; 
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: compass-susy-plugin
 version: !ruby/object:Gem::Version 
-  hash: -3702664218
+  hash: -3702664224
   prerelease: 4
   segments: 
   - 0
   - 9
   - alpha
-  - 1
-  version: 0.9.alpha.1
+  - 2
+  version: 0.9.alpha.2
 platform: ruby
 authors: 
 - Eric Meyer
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 -07:00
+date: 2011-02-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency