compass-aura 0.1.4.1 → 0.1.5

data/stylesheets/_aura.scss

@@ -3,6 +3,7 @@
 //////////////////////////////
 @import 'susy';
 @import 'modular-scale';
+@import 'math';
 
 //////////////////////////////
 // Aurora Variables, Functions, Mixins

data/stylesheets/aura/_functions.scss

@@ -119,4 +119,132 @@
 // Returns Width of One Gutter
 @function gutter-width($gutter-col-grid) {
   @return $gutter-col-grid * nth($gutter-to-col, 1);
+}
+
+//////////////////////////////
+// Sidebar Functions
+//////////////////////////////
+@function sidebar-width($overflow: true) {
+  // Grab number of sidebars
+  $num: nth($sidebars, 1);
+  
+  @if $num > 2 or $num < 0 {
+    @warn 'Invalid number of sidebars! You can have 0, 1, or 2 sidebars!';
+    @return -1;
+  }
+  
+  // Grab length of sidebar variable to determine how to act
+  $length: length($sidebars);
+  
+  @if $length < 2 {
+    @warn "Not enough arguments! You need to provide at least the number of sidebars and the side of the sidebar! If you do not want sidebars, set $sidebars: 0, 'none';";
+    @return -1;
+  }
+  @else if $length > 4 {
+    @warn "Too many arguments!";
+    @return -1;
+  }
+  
+  @if $length == 2 {
+    @if $num == 0 {
+      $total-cols: $main-content-cols;
+      @return 0;
+    }
+    @else if $num == 1 {
+      @return $total-cols - $main-content-cols;
+    }
+    @else if $num == 2 {
+      $remainder: $total-cols - $main-content-cols;
+      $floor: floor($remainder / 2);
+      $extra: $remainder - $floor;
+      $big: '';
+      $small: '';
+      @if $floor > $extra {
+        $big: $floor;
+        $small: $extra;
+      }
+      @else if $extra > $floor {
+        $big: $extra;
+        $small: $floor;
+      }
+      @else {
+        $big: $floor;
+        $small: $extra;
+      }
+      
+      @if $overflow == true {
+        @return $big;
+      }
+      @else {
+        @return $small;
+      }
+    }
+    @else {
+      @warn 'Invalid number of sidebars! You can have 0, 1, or 2 sidebars!';
+      @return -1;
+    }
+  }
+  @else if $length == 3 {
+    $sidebar-width: nth($sidebars, 3);
+    @if is-int($sidebar-width) == false {
+      @warn 'Sidebar width must be an integer!';
+      @return -1;
+    }
+    
+    @if $num == 0 {
+      $total-cols: $main-content-cols;
+      @return 0;
+    }
+    @else if $num == 1 {
+      $total-cols: $main-content-cols + $sidebar-width;
+      @return $sidebar-width;
+    }
+    @else if $num == 2 {
+      $total-cols: $main-content-cols + 2 * $sidebar-width;
+      @return $sidebar-width;
+    }
+  }
+  @else if $length == 4 {
+    $sidebar-1-width: nth($sidebars, 3);
+    @if is-int($sidebar-1-width) == false {
+      @warn 'First sidebar width must be an integer!';
+      @return -1;
+    }
+    
+    $sidebar-2-width: nth($sidebars, 4);
+    @if is-int($sidebar-2-width) == false {
+      @warn 'Second sidebar width must be an integer!';
+      @return -1;
+    }
+    
+   @if $num == 0 {
+      $total-cols: $main-content-cols;
+      @return 0;
+    }
+    @else if $num > 1 {
+      $total-cols: $main-content-cols + $sidebar-1-width + $sidebar-2-width;
+      
+      $big: '';
+      $small: '';
+      
+      @if $sidebar-1-width > $sidebar-2-width {
+        $big: $sidebar-1-width;
+        $small: $sidebar-2-width;
+      }
+      @else if $sidebar-1-width < $sidebar-2-width {
+        $big: $sidebar-2-width;
+        $small: $sidebar-1-width;
+      }
+      @else {
+        $big: $sidebar-1-width;
+        $small: $sidebar-2-width;
+      }
+      @if $overflow == true {
+        @return $big;
+      }
+      @else {
+        @return $small;
+      }
+    }
+  }
 }

data/stylesheets/aura/_mixins.scss

@@ -29,6 +29,67 @@
   @else {
     $measure: $measure-width;
   }
+  
+  // Set up sidebars now as sidebars can affect $total-cols
+  %primary-sidebar {
+    @include columns(sidebar-width());
+
+    @if nth($sidebars, 2) == 'left' or nth($sidebars, 2) == 'both'{
+      float: none;
+      @include respond-to('small') {
+        @include alpha();
+        float: left;
+      }
+    }
+    @else if nth($sidebars, 2) == 'right' {
+      float: none;
+      @include respond-to('small') {
+        float: right;
+        @if nth($sidebars, 1) == 1 {
+          margin-left: 0;
+          margin-right: gutter();
+        }
+      }
+    }
+    @else if nth($sidebars, 2) == 'none' {
+      float: none;
+      @include respond-to('small') {
+        float: right;
+      }
+    }
+    @else {
+      @warn 'Sidebar side can only have a value of left, right, both, or none';
+    }
+  }
+  
+  %secondary-sidebar {
+    @include columns(sidebar-width($overflow: false));
+
+    @if nth($sidebars, 2) == 'left' {
+      float: none;
+      @include respond-to('small') {
+        float: left;
+      }
+    }
+    @else if nth($sidebars, 2) == 'right' or nth($sidebars, 2) == 'both' {
+      float: none;
+      @include respond-to('small') {
+        float: right;
+        margin-left: 0;
+        margin-right: gutter();
+      }
+    }
+    @else if nth($sidebars, 2) == 'none' {
+      float: none;
+      @include respond-to('small') {
+        float: right;
+      }
+    }
+    @else {
+      @warn 'Sidebar side can only have a value of left, right, both, or none';
+    }
+  }
+  
   // Set UP Grid
   // If there's a width, figure out body-font-size for width
   @if $width {
@@ -88,6 +149,36 @@
     @include respond-to('small') {
       @include columns($main-content-cols);
     }
+    @if nth($sidebars, 2) == 'left' or nth($sidebars, 2) == 'both'{
+      float: none;
+      @include respond-to('small') {
+        float: 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;
+      }
+    }
+    // Add in "Omega"
+    @if nth($sidebars, 2) == 'left' {
+      @include respond-to('small') {
+        margin-left: 0;
+        margin-right: gutter();
+      }
+    }
+    @else {
+      @warn 'Sidebar side can only have a value of left, right, both, or none';
+    }
   }
   
   %aura-container {

data/stylesheets/aura/_variables.scss

@@ -7,6 +7,7 @@ $total-cols:            12                          !default;
 $main-content-cols:     9                           !default;
 $font-scale:            true                        !default;
 $obj-scale:             true                        !default;
+$sidebars:              1, 'right'                  !default;
 // Advanced Options
 $gutter-to-col:         1, 4                        !default;
 $alphabet-count:        26                          !default;

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  - 1
-  version: 0.1.4.1
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Sam Richard
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 -05:00
+date: 2011-03-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,6 +44,20 @@ dependencies:
         version: "0.9"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: sassy-math
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 7
+        version: 0.1.7
+  type: :runtime
+  version_requirements: *id003
 description: Typography based Responsive Framework utilizing Susy and Modular Scale.
 email: 
 - snugug@gmail.com