singularitygs 1.1.2 → 1.2.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA512: 
-  data.tar.gz: 9bd5f9cb1cec2ea2abdac9b10f08739fcdfb434ab893407288392ac87f34abe753ffd59c2037bc7c4cb17a4f82916e50a39520a7c1e1b9af487ba55c4c3dc06d
-  metadata.gz: a80c3265806c357e5b5af5b7eff905662f824e9bea412cf5237d9ca29856e7577d29d5bc8d12d73cbd068bc7d22192605fb3bfb94c9443079cdb71e4c4243c37
-SHA1: 
-  data.tar.gz: 13f176ec322bfb02fee62f3901105c91ce1998e5
-  metadata.gz: 1bd5f24e9faa1a5727193d09220e14b0fd395dd0
+---
+SHA1:
+  metadata.gz: 77de76920fd546a70587ae4aa397b9e4592a331d
+  data.tar.gz: 267fa655d9d5556402e516b5195ae54450943a83
+SHA512:
+  metadata.gz: 6dca4e176cba9e91ad1b01a4ccd7195a9338bbcc87efdedcc90bb106219e92d5b30beb58a79d555e0a2ce4eb10897f7003e1a1a3d72f559608ece8101cb74d8e
+  data.tar.gz: 14f8bee9514d0277946e55ef883f7fa8e0b28d4992678ee2cfda8cb459555cbaadc58019f0e2000a1ea4c1a779d4c1b6cb375144bbdc78b0876e35cf52a1287e

data/lib/singularitygs.rb

@@ -4,6 +4,6 @@ require 'breakpoint'
 Compass::Frameworks.register("singularitygs", :path => "#{File.dirname(__FILE__)}/..")
 
 module SingularityGS
-  VERSION = "1.1.2"
-  DATE = "2013-08-01"
+  VERSION = "1.2.0.rc.1"
+  DATE = "2014-01-12"
 end

data/stylesheets/_singularitygs.scss

@@ -1,34 +1,21 @@
 //////////////////////////////
-// Import Required Extensions
+// Default Settings
 //////////////////////////////
-@import "breakpoint";
+$Singularity-Settings: (
+  'grids': (-1px: 12),
+  'gutters': (-1px: .25),
+  'gutter styles': (-1px: 'opposite'),
+  'output': 'isolation',
+  'direction': 'ltr',
+  'mobile first': true,
+  'include border box': false,
+  'include clearfix': false
+);
 
 //////////////////////////////
-// Default Variables
+// User Settings
 //////////////////////////////
-
-// The grids being used
-$grids: () !default;
-
-// The gutters of the inner columns of the grid
-$gutters: () !default;
-
-// The gutter styles
-// Options: opposite/split (fixed)
-$gutter-styles: () !default;
-
-// Specifies whether or not you're building mobile-first grids. Defaults to true
-$mobile-first: true !default;
-
-// Default output style.
-$output: 'isolation' !default;
-
-// Direction for your grid. Can be ltr, rtl, or both
-$direction: 'ltr' !default;
-
-// Whether or not to include border-box or clearfix with all spans
-$include-border-box:  false !default;
-$include-clearfix:    false !default;
+$singularity: () !default;
 
 //////////////////////////////
 // Import General Helpers

data/stylesheets/singularitygs/_api.scss

@@ -1,39 +1,99 @@
-@mixin grid-span($span, $location: 1, $grid: false, $gutter: false, $output-style: $output, $options: false) {
+@import "api/float";
+@import "api/isolation";
 
-  @if $output-style == 'float' {
-    @include output-float($span, $location, $grid, $gutter, $options);
-  }
-  @else if $output-style == 'isolation' {
-    @include output-isolation($span, $location, $grid, $gutter, $options);
+//////////////////////////////
+// Master Grid Span mixin
+//////////////////////////////
+@mixin grid-span($span, $location: 1, $grid: null, $gutter: null, $output-style: null, $gutter-style: null, $options: null) {
+
+  @if $output-style == null {
+    $output-style: sgs-get('output');
   }
-}
 
-@mixin push($span, $location, $grid: false, $gutter: false, $output-style: $output) {
+  $Grid: find-grid($grid);
+  $Gutter: find-gutter($gutter);
+  $Style: find-gutter-style($gutter-style);
 
-  @if $output-style == 'float' {
-    @include push-float($span, $location, $grid, $gutter);
-  }
-  @else if $output-style == 'isolation' {
-    @include push-isolation($span, $location, $grid, $gutter);
-  }
-}
+  $Start-Row: start-row($location);
+  $End-Row: end-row($span, $location, $Grid);
 
-@mixin pull($span, $location, $grid: false, $gutter: false, $output-style: $output) {
+  $Fixed-Gutter: fixed-gutter($Grid, $Gutter, $Style);
+  $Split-Gutter: index($Style, 'split');
+  $Gutter-Property: gutter-property($Grid, $Gutter, $Style);
 
-  @if $output-style == 'float' {
-    @include pull-float($span, $location, $grid, $gutter);
-  }
-  @else if $output-style == 'isolation' {
-    @include pull-isolation($span, $location, $grid, $gutter);
+  $Direction: sgs-get('direction');
+  $From: if($options and type-of($options) == 'map', if(map-get($options, 'from'), map-get($options, 'from'), $Direction), $Direction);
+  $From: if($From == 'ltr' or $From == 'rtl', named-direction($From), $From);
+
+  $Holder: ();
+  @each $k, $v in $options {
+    $Holder: if($k == 'from', $Holder, map-merge($Holder, ($k: $v)));
   }
-}
+  $options: if(length($Holder) > 0, $Holder, null);
 
-@mixin isolate($span, $location, $grid: false, $gutter: false, $output-style: $output) {
+  $Span-Map: (
+    'span': $span,
+    'location': $location,
+    'grid': $Grid,
+    'gutter': $Gutter,
+    'style': $Style,
+    'start row': $Start-Row,
+    'end row': $End-Row,
+    'fixed gutter': $Fixed-Gutter,
+    'split gutter': $Split-Gutter,
+    'gutter property': $Gutter-Property,
+    'options': $options
+  );
 
-  @if $output-style == 'float' {
-    @include isolate-float($span, $location, $grid, $gutter);
-  }
-}
 
-@import "api/float";
-@import "api/isolation";
+  @if function-exists('output-#{$output-style}') {
+    $Left: ();
+    $Right: ();
+
+    @if $Direction == 'both' or $From == 'left' or ($Direction == 'rtl' and $From == 'opposite') {
+      $Left: call('output-#{$output-style}', map-merge($Span-Map, ('direction': left)));
+    }
+
+    @if $Direction == 'both' or $From == 'right' or ($Direction == 'ltr' and $From == 'opposite') {
+      $Right: call('output-#{$output-style}', map-merge($Span-Map, ('direction': right)));
+    }
+
+    $Left-Keys: map-keys($Left);
+    $Right-Keys: map-keys($Right);
+    $Exclude: ();
+
+    @each $key in $Left-Keys {
+      @if index($Right-Keys, $key) {
+        @if map-get($Right, $key) == map-get($Left, $key) {
+          $Exclude: append($Exclude, $key);
+        }
+      }
+    }
+
+    // Always try and print the Left value
+    @each $property, $value in $Left {
+      #{$property}: $value;
+    }
+
+    // If Direction is Both or RTL, add the RTL attribute selector
+    @if $Direction == 'both' or $Direction == 'rtl' {
+      [dir="rtl"] & {
+        @each $property, $value in $Right {
+          @if not index($Exclude, $property) {
+            #{$property}: $value;
+          }
+        }
+      }
+    }
+    @else {
+      @each $property, $value in $Right {
+        @if not index($Exclude, $property) {
+          #{$property}: $value;
+        }
+      }
+    }
+  }
+  @else {
+    @warn "There doesn't appear to be an output style named `#{$output-style}`. Please ensure that the function `output-#{$output-style}` and that the output style `#{$output-style}` are both available before trying to use them.";
+  }
+}

data/stylesheets/singularitygs/_helpers.scss

@@ -1,13 +1,17 @@
+//////////////////////////////
+// Setting Helpers
+//////////////////////////////
+@import "helpers/settings";
+
 //////////////////////////////
 // Code Helpers
 //////////////////////////////
 @import "helpers/find";
 @import "helpers/sass-lists";
 @import "helpers/columns";
-@import "helpers/clearfix";
-@import "helpers/box-sizing";
 @import "helpers/span-shared";
 @import "helpers/directions";
+@import "helpers/sort";
 
 //////////////////////////////
 // UI Helpers

data/stylesheets/singularitygs/api/_float.scss

@@ -1,160 +1,98 @@
-@mixin output-float($span, $location, $columns, $gutter, $options: false) {
+@function output-float($Span-Map) {
+  // Set up Left/Right maps
+  $Return: ();
 
-  $location-holder: $location;
+  $Span: map-get($Span-Map, 'span');
+  $Location: map-get($Span-Map, 'location');
 
-  @if type-of($location) == string {
-    @if end-row($span, $location, $columns) {
-      $grid-length: length(find-grid($columns));
-      $location-holder: $grid-length - $span;
-    }
-    @else {
-      $location-holder: 1;
-    }
-  }
+  $Grid: map-get($Span-Map, 'grid');
+  $Gutter: map-get($Span-Map, 'gutter');
+  $Style: map-get($Span-Map, 'style');
 
-  $gutter: find-gutter($gutter);
-  $gutter-span: gutter-span($gutter, $columns);
-  $end-row: end-row($span, $location, $columns);
-  $start-row: start-row($location);
-
-  $gutter-style: find-gutter-style();
-  $fixed-gutter: fixed-gutter($columns, $gutter);
-  $gutter-property: gutter-property($columns, $gutter);
-
-  width: column-span($span, $location-holder, $columns, $gutter, $gutter-style);
-
-  @if $direction == 'ltr' or $direction == 'both' {
-    // Set the CSS direction to ltr
-    $cssdir: 'ltr';
-    // Find the CSS named direction and opposite direction
-    $dir: named-direction($cssdir);
-    $opp: opposite-direction($dir);
-
-    clear: $opp;
-
-    @if $end-row {
-      float: $opp;
-      @if index($gutter-style, split) and not $fixed-gutter {
-	#{$gutter-property}-#{$dir}: 0;
-	#{$gutter-property}-#{$opp}: $gutter-span / 2;
-      }
-      @else if not $fixed-gutter {
-	#{$gutter-property}-#{$opp}: 0;
-      }
-    }
-    @else {
-      float: $dir;
-
-      @if $start-row {
-	@if index($gutter-style, split) and not $fixed-gutter {
-	  #{$gutter-property}-#{$dir}: $gutter-span / 2;
-	  #{$gutter-property}-#{$opp}: $gutter-span / 2;
-	}
-	@else if not $fixed-gutter {
-	  #{$gutter-property}-#{$dir}: 0;
-	  #{$gutter-property}-#{$opp}: $gutter-span;
-	}
+  $Start-Row: map-get($Span-Map, 'start row');
+  $End-Row: map-get($Span-Map, 'end row');
 
-      }
-    }
+  $Fixed-Gutter: map-get($Span-Map, 'fixed gutter');
+  $Split-Gutter: map-get($Span-Map, 'split gutter');
+  $Gutter-Property: map-get($Span-Map, 'gutter property');
 
-    @if $fixed-gutter {
-      @if index($gutter-style, split) {
-	#{$gutter-property}-#{$dir}: $gutter-span / 2;
-	#{$gutter-property}-#{$opp}: $gutter-span / 2;
-      }
-      @else {
-	#{$gutter-property}-#{$opp}: $gutter-span;
-      }
-    }
-  }
+  $Direction: map-get($Span-Map, 'direction');
+  $Options: map-get($Span-Map, 'options');
 
-  @if $direction == 'rtl' or $direction == 'both' {
-    // Set the CSS direction to ltr
-    $cssdir: 'rtl';
-    // Find the CSS named direction and opposite direction
-    $dir: named-direction($cssdir);
-    $opp: opposite-direction($dir);
-
-
-    [dir="#{$cssdir}"] & {
-      clear: $opp;
-
-      @if $end-row {
-        float: $opp;
-	@if index($gutter-style, split) and not $fixed-gutter {
-	  #{$gutter-property}-#{$dir}: 0;
-	  #{$gutter-property}-#{$opp}: $gutter-span / 2;
-	}
-	@else if not $fixed-gutter {
-	  #{$gutter-property}-#{$opp}: 0;
-	}
-      }
-      @else {
-        float: $dir;
-
-        @if $start-row {
-	  @if index($gutter-style, split) and not $fixed-gutter {
-	    #{$gutter-property}-#{$dir}: $gutter-span / 2;
-	    #{$gutter-property}-#{$opp}: $gutter-span / 2;
-	  }
-	  @else if not $fixed-gutter {
-	    #{$gutter-property}-#{$dir}: 0;
-	    #{$gutter-property}-#{$opp}: $gutter-span;
-	  }
-	}
-      }
-
-      @if $fixed-gutter {
-	@if $direction == 'rtl' {
-	  @if index($gutter-style, split) {
-	    #{$gutter-property}-#{$dir}: $gutter-span / 2;
-	    #{$gutter-property}-#{$opp}: $gutter-span / 2;
-	  }
-	  @else {
-	    #{$gutter-property}-#{$opp}: $gutter-span;
-	  }
-	}
-	@else if not index($gutter-style, split) {
-	  #{$gutter-property}-#{$opp}: $gutter-span;
-        }
-      }
-    }
+  @if $Start-Row {
+    $Location: 1;
+  }
+  @else if $End-Row {
+    $Location: column-count($Grid) - $Span;
   }
 
-  @include span-shared;
-}
-
-@mixin push-float($span, $location, $columns: false, $gutter: false) {
+  $Width: column-span($Span, $Location, $Grid, $Gutter, $Style);
+  $Margin-Span: column-span(($Location - 1), 1, $Grid, $Gutter, $Style);
+  $Gutter-Span: gutter-span($Gutter, $Grid);
 
-  @if type-of($location) == string {
-    $location: 1;
+  // Backwards Compatibility for Options
+  @if type-of($Options) != 'map' and $Options != null {
+    $Options: ('clear': unquote(nth($Options, 1)));
   }
 
-  // Find the columns and gutters
-  $columns: find-grid($columns);
-  $gutter: find-gutter($gutter);
+  $Dir: $Direction;
+  $Opp: opposite-direction($Dir);
 
-  // Combine the columns and gutters
-  $gutter: column-span($span, $location, $columns, $gutter) + gutter-span($gutter, $columns);
+  $Return: map-merge($Return, ('width': $Width));
+  $Return: map-merge($Return, ('clear': $Opp));
 
-  margin-left: $gutter;
-}
+  @if ($End-Row) {
+    $Return: map-merge($Return, ('float': $Opp));
 
-@mixin pull-float($span, $location, $columns: false, $gutter: false) {
+    @if $Split-Gutter and not $Fixed-Gutter {
+      $Return: map-merge($Return, ('#{$Gutter-Property}-#{$Dir}': 0));
+      $Return: map-merge($Return, ('#{$Gutter-Property}-#{$Opp}': $Gutter-Span / 2));
+    }
+    @else if not $Fixed-Gutter {
+      $Return: map-merge($Return, ('#{$Gutter-Property}-#{$Opp}': 0));
+    }
+  }
+  @else {
+    $Return: map-merge($Return, ('float': $Dir));
 
-  @if type-of($location) == string {
-    $location: 1;
+    @if $Split-Gutter and not $Fixed-Gutter {
+      $Return: map-merge($Return, ('#{$Gutter-Property}-#{$Dir}': $Gutter-Span / 2));
+      $Return: map-merge($Return, ('#{$Gutter-Property}-#{$Opp}': $Gutter-Span / 2));
+    }
+    @else if not $Fixed-Gutter {
+      @if $Start-Row {
+        $Return: map-merge($Return, ('#{$Gutter-Property}-#{$Dir}': 0));
+      }
+      $Return: map-merge($Return, ('#{$Gutter-Property}-#{$Opp}': $Gutter-Span));
+    }
+  }
+  // If options are set, we merge them in!
+  @if ($Options) {
+    $Return: map-merge($Return, $Options);
   }
 
-  // Find the columns and gutters
-  $columns: find-grid($columns);
-  $gutter: find-gutter($gutter);
+  // If CLear isn't already available, set it!
+  @if not map-has-key($Return, 'clear') {
+    $Return: map-merge($Return, ('clear': none));
+  }
 
-  // Combine the columns and gutters
-  $gutter: (column-span($span, $location, $columns, $gutter) + gutter-span($gutter, $columns)) * -1;
+  // Left Fixed Gutters
+  @if $Fixed-Gutter {
+    @if index($Style, 'split') {
+      $Return: map-merge($Return, ('#{$Gutter-Property}-#{$Dir}': $Gutter-Span / 2));
+      $Return: map-merge($Return, ('#{$Gutter-Property}-#{$Opp}': $Gutter-Span / 2));
+    }
+    @else {
+      @if not $End-Row {
+        $Return: map-merge($Return, ('#{$Gutter-Property}-#{$Opp}': $Gutter-Span));
+      }
+      @else {
+        $Return: map-merge($Return, ('#{$Gutter-Property}-#{$Opp}': 0));
+      }
+    }
+  }
 
-  margin-left: $gutter;
+  @return $Return;
 }
 
 //////////////////////////////
@@ -162,11 +100,13 @@
 //
 // Makes working with Float easier, as it allows you to walk the grid for symmetric grids and easy applying of 'last' and 'first', as well as automatically building the verbose grid-span mixin call
 //////////////////////////////
-@mixin float-span($span, $location: false, $grid: false, $gutter: false) {
+@mixin float-span($Span, $Location: false, $grid: false, $gutter: false, $gutter-style: false, $from: false) {
   $grid: find-grid($grid);
   $gutter: find-gutter($gutter);
   $row: false;
 
+  $Options: if($from, ('from': $from), null);
+
   // Working around SASS treating a number like a list with one element
   @if type-of($grid) == 'list' and length($grid) == 1 {
     $grid: nth($grid, 1);
@@ -175,27 +115,27 @@
   // Working with a symmetric grid
   @if type-of($grid) == 'number' {
     // Special treatment for non-numeric location
-    @if type-of($location) != 'number' {
-      @if $location == 'last' or $location == 'omega' {
-        $location: $grid - $span + 1;
+    @if type-of($Location) != 'number' {
+      @if $Location == 'last' or $Location == 'omega' {
+        $Location: $grid - $Span + 1;
       }
       @else {
-        @if $location == 'first' or $location == 'alpha' {
+        @if $Location == 'first' or $Location == 'alpha' {
           $row: true;
         }
-        $location: 1;
+        $Location: 1;
       }
     }
 
-    @include grid-span($span, $location, $grid, $gutter, 'float');
+    @include grid-span($Span, $Location, $grid, $gutter, 'float', $gutter-style, $Options);
 
     @if $row {
       clear: both;
     }
   }
   // Working with an asymmetric grid, should have location provided
-  @else if type-of($grid) == 'list' and $location != false {
-    @include grid-span($span, $location, $grid, $gutter, 'float');
+  @else if type-of($grid) == 'list' and $Location != false {
+    @include grid-span($Span, $Location, $grid, $gutter, 'float', $gutter-style, $Options);
   }
   @else {
     @warn 'Asymmetric Grids need a Location value as well as a span value in order to know where on the grid you are! Please include a location value!';