compass-aura 0.2.2 → 0.3

data/stylesheets/aura/_functions.scss

@@ -88,9 +88,9 @@
     
     $col-total: col-total();
     $gutter-col-grid: gutter-col-grid($col-total);
-    $col-width: col-width($gutter-col-grid);
+    $column-width: col-width($gutter-col-grid);
     $gutter-width: gutter-width($gutter-col-grid);
-    $side-gutter-width: $gutter-width;
+    $grid-padding: $gutter-width;
     
     $aura-breakpoints: join($aura-breakpoints, columns-width() * $scale-ratio);
     
@@ -147,14 +147,14 @@
   
   @if $length == 2 {
     @if $num == 0 {
-      $total-cols: $main-content-cols;
+      $total-columns: $main-content-cols;
       @return 0;
     }
     @else if $num == 1 {
-      @return $total-cols - $main-content-cols;
+      @return $total-columns - $main-content-cols;
     }
     @else if $num == 2 {
-      $remainder: $total-cols - $main-content-cols;
+      $remainder: $total-columns - $main-content-cols;
       $floor: floor($remainder / 2);
       $extra: $remainder - $floor;
       $big: '';
@@ -192,15 +192,15 @@
     }
     
     @if $num == 0 {
-      $total-cols: $main-content-cols;
+      $total-columns: $main-content-cols;
       @return 0;
     }
     @else if $num == 1 {
-      $total-cols: $main-content-cols + $sidebar-width;
+      $total-columns: $main-content-cols + $sidebar-width;
       @return $sidebar-width;
     }
     @else if $num == 2 {
-      $total-cols: $main-content-cols + 2 * $sidebar-width;
+      $total-columns: $main-content-cols + 2 * $sidebar-width;
       @return $sidebar-width;
     }
   }
@@ -218,11 +218,11 @@
     }
     
    @if $num == 0 {
-      $total-cols: $main-content-cols;
+      $total-columns: $main-content-cols;
       @return 0;
     }
     @else if $num > 1 {
-      $total-cols: $main-content-cols + $sidebar-1-width + $sidebar-2-width;
+      $total-columns: $main-content-cols + $sidebar-1-width + $sidebar-2-width;
       
       $big: '';
       $small: '';

data/stylesheets/aura/_mixins.scss

@@ -31,22 +31,21 @@
     $measure: $measure-width;
   }
   
-  // Set up sidebars now as sidebars can affect $total-cols
+  // Set up sidebars now as sidebars can affect $total-columns
   %primary-sidebar {
-    @include columns($total-cols, $total-cols);
-    margin-left: gutter();
+    clear: both;
     
     // Single column debugging for mobile-first design!
     @if $single-column == false {
       @include respond-to('small') {
-        margin-left: 0;
-        @include columns(sidebar-width());
+        clear: none;
+        @include span-columns(sidebar-width());
       }
       
       @if nth($sidebars, 2) == 'left' or nth($sidebars, 2) == 'both'{
         float: none;
         @include respond-to('small') {
-          @include alpha();
+          ;
           float: left;
         }
       }
@@ -55,8 +54,7 @@
         @include respond-to('small') {
           float: left;
           @if nth($sidebars, 1) == 1 {
-            margin-left: 0;
-            margin-right: gutter();
+            @include omega;
           }
         }
       }
@@ -74,16 +72,17 @@
       float: none;
     }
   }
+;
+  
   
   %secondary-sidebar {
-    @include columns($total-cols, $total-cols);
-    margin-left: gutter();
-    
+//    @include span-columns($total-columns);
+    clear: both;
     // Single column debugging for mobile-first design!
     @if $single-column == false {
       @include respond-to('small') {
-        margin-left: 0;
-        @include columns(sidebar-width($overflow: false));
+        clear: none;
+        @include span-columns(sidebar-width($overflow: false));
       }
       
       @if nth($sidebars, 2) == 'left' {
@@ -96,14 +95,14 @@
         float: none;
         @include respond-to('small') {
           float: right;
-          margin-left: 0;
-          margin-right: gutter();
+          @include omega;
         }
       }
       @else if nth($sidebars, 2) == 'both' {
         float: none;
         @include respond-to('small') {
           float: right;
+          // Need to fake "pull" for this column in order to work 
           margin-right: -1 * (columns($main-content-cols) + columns(sidebar-width($overflow: false)) + gutter());
         }
       }
@@ -123,18 +122,18 @@
   // If there's a width, figure out body-font-size for width
   @if $width {
     $width-em: px-em($width);
-    $sub-col: $width-em / ($total-cols * gutter-col-total() + nth($gutter-to-col, 1));
-    $col-width: $sub-col * nth($gutter-to-col, 2);
+    $sub-col: $width-em / ($total-columns * gutter-col-total() + nth($gutter-to-col, 1));
+    $column-width: $sub-col * nth($gutter-to-col, 2);
     $gutter-width: $sub-col * nth($gutter-to-col, 1);
-    $side-gutter-width: $gutter-width;
+    $grid-padding: $gutter-width;
   }
   @else {
     $col-total: col-total();
     $gutter-col-total: gutter-col-total();
     $gutter-col-grid: gutter-col-grid($col-total);
-    $col-width: col-width($gutter-col-grid);
+    $column-width: col-width($gutter-col-grid);
     $gutter-width: gutter-width($gutter-col-grid);
-    $side-gutter-width: $gutter-width;
+    $grid-padding: $gutter-width;
   }
   
   // Set Root Em
@@ -177,53 +176,43 @@
   
   // Create Measure class to be extended
   %measure {
-    @include full;
+    clear: both;
     
     // Single column debugging for mobile-first design!
     @if $single-column == false {
       @include respond-to('small') {
-        @include columns($main-content-cols);
+        clear: none;
+        @include span-columns($main-content-cols);
       }
       @if nth($sidebars, 2) == 'left'{
         float: none;
         @include respond-to('small') {
-          float: right;
+          @include omega;
+          margin-right: 0;
         }
       }
       @else if nth($sidebars, 2) == 'both' {
         float: none;
         @include respond-to('small') {
           float: right;
-          @include alpha;
-          margin-left: 0;
-          margin-right: columns(sidebar-width($overflow: false)) + gutter() + gutter();
+          @include push(2, $from: 'right');
         }
       }
       @else if nth($sidebars, 2) == 'right' {
         float: none;
         @include respond-to('small') {
-          @include alpha();
           float: left;
         }
       }
       @else if nth($sidebars, 2) == 'none' {
         float: none;
         @include respond-to('small') {
-          @include alpha();
           float: left;
         }
       }
       @else {
         @warn 'Sidebar side can only have a value of left, right, both, or none';
       }
-
-      // Add in "Omega"
-      @if nth($sidebars, 2) == 'left' {
-        @include respond-to('small') {
-          margin-left: 0;
-          margin-right: gutter();
-        }
-      }
     }
   }
   

data/stylesheets/aura/_variables.scss

@@ -3,7 +3,7 @@
 //////////////////////////////
 // Basic Options.
 $body-font-size:        16px                        !default;
-$total-cols:            12                          !default;
+$total-columns:         12                          !default;
 $main-content-cols:     9                           !default;
 $font-scale:            true                        !default;
 $obj-scale:             true                        !default;

metadata

@@ -4,9 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - Sam Richard
@@ -14,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 -04:00
+date: 2011-05-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,16 +31,18 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: compass-susy-plugin
+  name: susy
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
+        - 0
+        - rc
         - 0
-        - 9
-        version: "0.9"
+        version: 1.0.rc.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -58,7 +59,7 @@ dependencies:
         version: 0.1.8
   type: :runtime
   version_requirements: *id003
-description: Typography based Responsive Framework utilizing Susy and Modular Scale.
+description: Responsive Framework utilizing Susy and Modular Scale.
 email: 
 - snugug@gmail.com
 executables: []
@@ -103,6 +104,6 @@ rubyforge_project: compass-aura
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Typography based Responsive Framework.
+summary: Responsive Framework for Compass.
 test_files: []