gridle 2.0.44 → 2.0.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3fe405b2623f4db63f1ffaa0d1c71ba2a4c78c4
-  data.tar.gz: edfaf3e818bd31943f86aa500f83cee16d305326
+  metadata.gz: c92a05bad78d0ee99a46d7a8de0b46c7575bf44a
+  data.tar.gz: cb0eba8b1f2b143dc87abc3613a998cea9ae725c
 SHA512:
-  metadata.gz: 3c19c81f62a2cf7a134af9794891e825b71c07b2b6f95b465af8a863a5010f349a8732b1e19214e42d1e534cb571da143e811890f86ce609a2f3e3fc1a368280
-  data.tar.gz: 507888ca1a0030edf8891ba4313a6e0618fa310c551737ecec34e0e61d38e0431208d1984a25702f61ceba20c4d4cbc36518c1341bebb6830eca44a874bfb5cb
+  metadata.gz: e5e6e0c7da9d366f76c91b6cdb3e4ff327db7873f3ba7ebbc7b37c6132fa206beeedef6de51b9fa4a79bc7ad6d85eb0b0ba0afa2494cf00cad621face2c4e04e
+  data.tar.gz: 09943c67ae9db9371f64563d9358566688fd9bbe776b47f5c88b26cfde5a436ca3eee8934a453c0a387a8e8dd05a06b1d152b3b677172956d92814b5b8ea595e

data/lib/gridle.rb

@@ -17,8 +17,8 @@ Compass::Frameworks.register('gridle', :path => extension_path)
 #    a prerelease version
 #  Date is in the form of YYYY-MM-DD
 module Extension
-  VERSION = "2.0.44"
-  DATE = "2015-12-23"
+  VERSION = "2.0.45"
+  DATE = "2016-04-18"
 end
 
 # This is where any custom SassScript should be placed. The functions will be  

data/stylesheets/gridle/_api.scss

@@ -9,7 +9,7 @@
 		@include gridle_row();
 		@each $sel, $l in $layout {
 			> #{$sel} {
-				@include gridle($l);	
+				@include gridle($l);
 			}
 		}
 	}
@@ -91,7 +91,7 @@
 			$var : $var * -1;
 		}
 	}
-	
+
 	&[#{$op}~="#{$var}"] {
 		@content;
 	}
@@ -361,12 +361,12 @@
 		// }
 
 		// set value :
-		@if $direction == rtl { right:$width; }
-		@else { left:$width; }
+		@if $direction == rtl { right:$width;left:auto; }
+		@else { left:$width;right:auto; }
 		// handle direction attribute
 		@if gridle_get_state_var(dir-attribute) {
 			[dir="rtl"] & {
-				right: $width; 
+				right: $width;
 			}
 			[dir="ltr"] & {
 				left: $width;
@@ -423,12 +423,12 @@
 		// }
 
 		// set value :
-		@if $direction == rtl { left:$width; }
-		@else { right:$width; }
+		@if $direction == rtl { left:$width;right:auto; }
+		@else { right:$width;left:auto; }
 		// handle direction attribute
 		@if gridle_get_state_var(dir-attribute) {
 			[dir="rtl"] & {
-				left: $width; 
+				left: $width;
 			}
 			[dir="ltr"] & {
 				right: $width;
@@ -481,7 +481,7 @@
 		// handle direction attribute
 		@if gridle_get_state_var(dir-attribute) {
 			[dir="rtl"] & {
-				margin-right: $width; 
+				margin-right: $width;
 			}
 			[dir="ltr"] & {
 				margin-left: $width;
@@ -534,7 +534,7 @@
 		// handle direction attribute
 		@if gridle_get_state_var(dir-attribute) {
 			[dir="rtl"] & {
-				margin-left: $width; 
+				margin-left: $width;
 			}
 			[dir="ltr"] & {
 				margin-right: $width;
@@ -630,7 +630,7 @@
 		display: table;
 		clear: both;
 	}
-	
+
 }
 @mixin gridle_container(
 ) {
@@ -799,7 +799,7 @@
 	$side-or-size : top right bottom left
 ) {
 	@include _gridle_call(gutter) {
-		
+
 		// get a gutter map
 		$gutters : _gridle_forge_gutters_map($side-or-size);
 
@@ -811,4 +811,4 @@
 		}
 
 	}
-}
+}

data/stylesheets/gridle/_functions.scss

@@ -58,7 +58,7 @@
 //
 @function remove-nth($list, $index) {
   $result: null;
-		
+
   @if type-of($index) != number {
 	@warn "$index: #{quote($index)} is not a number for `remove-nth`.";
   }
@@ -73,7 +73,7 @@
 
   @else {
 	$result: ();
-	$index: if($index < 0, length($list) + $index + 1, $index);  
+	$index: if($index < 0, length($list) + $index + 1, $index);
 
 	@for $i from 1 through length($list) {
 	  @if $i != $index {
@@ -81,7 +81,7 @@
 	  }
 	}
   }
-		
+
   @return $result;
 }
 
@@ -125,7 +125,7 @@
 
 //
 // Get states count
-// 
+//
 // @return 	int 	The number of states defined
 //
 @function gridle_states_count() {
@@ -201,8 +201,8 @@
 		and type-of($stateMap-or-stateName) == map
 	{
 		// prepare state
-		$stateMap-or-stateName : _gridle_prepare_state_settings($stateMap-or-stateName);	
-		// create a new state by merging given one with defaul one
+		$stateMap-or-stateName : _gridle_prepare_state_settings($stateMap-or-stateName);
+		// create a new state by merging given one with default one
 		$state : map-merge($_gridle-settings, $stateMap-or-stateName);
 		// set the name with random name
 		$state : map-set($state, name, unique-id());
@@ -244,9 +244,9 @@
 //
 // Get a variable
 //
-// @param 	String 		$varName 				The variable name
+// @param 	String 		$varName 					The variable name
 // @param  	String 		$stateMap-or-stateName 	 	The state name or a map state value
-// @return 	Mixed 							The finded value
+// @return 	Mixed 									The finded value
 //
 @function gridle_get_state_var(
 	$varName,
@@ -262,7 +262,7 @@
 	@if map-has-key($state, unquote("#{$varName}")) {
 		@return map-get($state, unquote("#{$varName}"));
 	}
-	
+
 	// nothing finded :
 	@return null;
 }
@@ -331,14 +331,14 @@
 @function gridle_get_apply_css_for_map(
 	$for,
 	$stateName : default
-) {	
+) {
 	// check if has some extend for this state
 	$map : map-get($_gridle_apply_css_for, $stateName);
 	@if $map == null { @return null; }
 
 	// check if has some extend for the requested for
 	$extend : map-get($map, $for);
-	
+
 	// return the resulting extend map
 	@return $extend;
 }
@@ -350,14 +350,14 @@
 @function gridle_get_extend_class_map(
 	$for,
 	$stateName : default
-) {	
+) {
 	// check if has some extend for this state
 	$map : map-get($_gridle_extend_base_classes, $stateName);
 	@if $map == null { @return null; }
 
 	// check if has some extend for the requested for
 	$extend : map-get($map, $for);
-	
+
 	// return the resulting extend map
 	@return $extend;
 }
@@ -366,9 +366,9 @@
 //
 // Generate a column
 //
-// @param 	String 		$name 			The column name (often count)
-// @param 	int 		$columns 		The column count that the column will take
-// @param 	int 		$context 		The context on witch the with will be calculed
+// @param 	String 		$name 				The column name (often count)
+// @param 	int 		$columns 			The column count that the column will take
+// @param 	int 		$context 			The context on which the width will be calculed
 // @param 	Boolean 	$generateClasses 	Set if the column has to be generated in css
 //
 @function _gridle_create_column(
@@ -409,7 +409,7 @@
 
 		// // add column in columns map
 		$columnsMap : map-set($columnsMap, $columnName,  $col);
-	}	
+	}
 
 	// return columns
 	@return $columnsMap;
@@ -485,7 +485,7 @@
 		// otherwise, the base state is a custom one so we keep
 		// it and extend the wanted state with it
 		$new-state : map-remove($extend-state, name); // remove the name is important here!
-		@return map-merge($state, $new-state);	
+		@return map-merge($state, $new-state);
 	}
 }
 
@@ -516,7 +516,7 @@
 		);
 	} @else if type-of($side-or-size) == list or type-of($side-or-size) == string {
 
-		// check if is a full number list	
+		// check if is a full number list
 		$list-number : true;
 		@each $s in $side-or-size {
 			@if type-of($s) != number {
@@ -543,7 +543,7 @@
 					left : nth($side-or-size,4)
 				)
 			}
-		
+
 		} @else {
 			// forge the map with registered values
 			@each $side in (top right bottom left) {
@@ -567,7 +567,7 @@
 
 //
 // Get the attribute selector
-// 
+//
 @function gridle_selector(
 	$for,
 	$states : null,
@@ -594,11 +594,11 @@
 			@if $values != null {
 				$sel : append($sel, _gridle_classname($for, $stateName, $values), comma);
 			} @else if index($pattern, '%column') {
-				@each $columnName, $column in gridle_get_columns() {
+				@each $columnName, $column in _gridle_get_pattern_values(column) {
 					$sel : append($sel, _gridle_classname($for, $stateName, $columnName), comma);
 				}
 			} @else if index($pattern, '%column-count') {
-				@for $i from 0 through length(gridle_get_columns()) {
+				@for $i from 0 through _gridle_get_pattern_values(column-count) {
 					$sel : append($sel, _gridle_classname($for, $stateName, $i), comma);
 				}
 				@if $for == flex-order {
@@ -606,24 +606,24 @@
 					$sel : append($sel, _gridle_classname($for, $stateName, last), comma);
 				}
 			} @else if index($pattern, '%align') {
-				@each $a in map-get($_gridle-names-tokens, align) {
+				@each $a in _gridle_get_pattern_values(align) {
 					$sel : append($sel, _gridle_classname($for, $stateName, $a), comma);
 				}
 			} @else if index($pattern, '%count') and $for == clear-each {
-				@each $idx, $clearEach in $_gridle_clear_classes {
+				@each $idx, $clearEach in _gridle_get_pattern_values(count) {
 					$count : map-get($clearEach, clearEach);
 					$sel : append($sel, _gridle_classname($for, $stateName, $count), comma);
 				}
 			} @else if index($pattern, '%side') {
-				@each $side in map-get($_gridle-names-tokens, side) {
+				@each $side in _gridle_get_pattern_values(side) {
 					$sel : append($sel, _gridle_classname($for, $stateName, $side), comma);
 				}
 			} @else if index($pattern, '%float') {
-				@each $float in map-get($_gridle-names-tokens, float) {
+				@each $float in _gridle_get_pattern_values(float) {
 					$sel : append($sel, _gridle_classname($for, $stateName, $float), comma);
 				}
 			} @else if index($pattern, '%reverse') {
-				@each $reverse in map-get($_gridle-names-tokens, reverse) {
+				@each $reverse in _gridle_get_pattern_values(reverse) {
 					$sel : append($sel, _gridle_classname($for, $stateName, $reverse), comma);
 				}
 			} @else {
@@ -638,7 +638,7 @@
 //
 // Generate classname
 //
-// @param 	List 		$parrern 	The pattern to use to generate classname
+// @param 	List 		$pattern 	The pattern to use to generate classname
 // @param 	String 		$state 		The state
 // @param 	int 		$count 		The column count
 //
@@ -692,17 +692,20 @@
 					$removeSeparator : true;
 				}
 			}
+		} @else if $var == null {
+			$removeSeparator : true;
 		}
+
 	}
 
 	// clean selector
 	$list: ();
-    @each $var in $pattern {
-        @if $var {
-            $list: append($list, $var);
-        }
-    }
-    $pattern : $list;
+	@each $var in $pattern {
+		@if $var {
+			$list: append($list, $var);
+		}
+	}
+	$pattern : $list;
 
 	// build selector
 	$sel : "";
@@ -723,6 +726,87 @@
 }
 
 
+//
+// Unmatched patterns
+//
+// @param 	List 		$pattern 	The pattern to use to generate classname
+// @return  Map                     Map of unmatched pattern index:pattern
+//
+@function _gridle_unmatched_patterns(
+	$pattern
+) {
+	$unmatched : ();
+
+	// Loop each partern
+	@for $i from length($pattern) through 1 {
+		$var : nth($pattern, $i);
+		@if $var and str-index($var, '%') == 1 {
+			$token : str-slice($var, 2);
+			// check that the value is part of the token
+			$tokens : map-get($_gridle-names-tokens, $token);
+			@if $tokens == null {
+				$unmatched : map-set($unmatched, $i, $var);
+			}
+		}
+	}
+
+	@return $unmatched;
+}
+
+
+//
+// matched patterns
+//
+// @param 	List 		$pattern 	The pattern to use to generate classname
+// @return  Map                     Map of matched pattern index:pattern
+//
+@function _gridle_matched_patterns(
+	$pattern
+) {
+	$matched : ();
+
+	// Loop each partern
+	@for $i from length($pattern) through 1 {
+		$var : nth($pattern, $i);
+		@if $var and str-index($var, '%') == 1 {
+			$token : str-slice($var, 2);
+			// check that the value is part of the token
+			$tokens : map-get($_gridle-names-tokens, $token);
+			@if $tokens != null {
+				$matched : map-set($matched, $i, $var);
+			}
+		}
+	}
+
+	@return $matched;
+}
+
+
+//
+// Get dynamic pattern values
+//
+// @param 	String 		$for 			Name of the token
+// @return 	Mixed 					    Values of the token
+//
+@function _gridle_get_pattern_values(
+	$for
+){
+	@if $for == column {
+		@return gridle_get_columns();
+	}
+
+	@if $for == column-count {
+		@return length(gridle_get_columns());
+	}
+
+	@if $for == count {
+		@return $_gridle_clear_classes;
+	}
+
+	@return map-get($_gridle-names-tokens, $for);
+}
+
+
 //
 // Get the current driver
 //
@@ -817,13 +901,13 @@
 			// if we have a separator, check the next value to see if it's a variable
 			@if index($_gridle-names-separators, $part) and $i < length($sel) {
 				@if nth($sel,$i + 1) != '%state' {
-					$generic : #{$generic}#{$part};	
+					$generic : #{$generic}#{$part};
 				} @else {
 					$end : true;
 				}
 			} @else {
 				@if str-slice($part,1,1) != '%' {
-					$generic : #{$generic}#{$part};	
+					$generic : #{$generic}#{$part};
 				} @else {
 					$end : true;
 				}
@@ -835,6 +919,14 @@
 }
 
 
+//
+// Check if gridle is in generation phase
+//
+@function _gridle_is_in_generate_phase() {
+	@return $_gridle_is_in_generate_phase;
+}
+
+
 //
 // Parse gridle mixin list
 //
@@ -881,7 +973,7 @@
 	$prop_name : null;
 	$list : append($list, _gridle-last);
 	@each $param in $list {
-		
+
 		@if $param != with and $param != 'and' {
 			@if map-get($_gridle-packages, $param) or $param == _gridle-last {
 				@if $prop_name {
@@ -893,7 +985,7 @@
 						}
 						$prop_values : ();
 					}
-					$map : map-set($map, $prop_name, $values);	
+					$map : map-set($map, $prop_name, $values);
 				}
 				$prop_name : $param;
 			} @else {
@@ -901,6 +993,11 @@
 			}
 		}
 	}
+	
+	// // check if we don't have any gutter parameters
+	// @if not map-get($map, gutter) and not map-get($map, no-gutter) {
+	// 	$map : map-set($map, gutter, true);
+	// }
 
 	// return the map
 	@return $map;
@@ -938,14 +1035,15 @@
 			$map : map-set($map, $stateName, null);
 		}
 	}
+	
 	@return $map;
 }
 
 
 //
-// Get the media query for a particular state, or with, etc...
+// Get the media query for a particular state, or width, etc...
 //
-// @param 	Mixed 		$state-or-min-width 		The state name of the min with
+// @param 	Mixed 		$state-or-min-width 		The state name of the min width
 // @param 	Mixed 		$max-width 			The max width if first param is a min width
 // @return 	String 						The media query string without the @media
 //
@@ -980,7 +1078,7 @@
 		@if $query
 		{
 			@return $query;
-		} 
+		}
 		@else if $min-width and $max-width
 		{
 			@return "screen and (min-width: #{$min-width}) and (max-width: #{$max-width})";
@@ -998,9 +1096,9 @@
 			@return null;
 		}
 
-	} 
+	}
 	@else
 	{
 		@return null;
 	}
-}
+}

data/stylesheets/gridle/_generate-mixins.scss

@@ -13,11 +13,12 @@
 //
 @mixin gridle_generate_custom_class(
 	$pattern,
-	$statesNames : null
+	$statesNames : null,
+	$replacements...
 ) {
 	// manage states to generate :
 	$states : ();
-	@if $statesNames == null {
+	@if $statesNames == null or $statesNames == all {
 		// loop on each states to generate names list :
 		@each $stateName, $state in $_gridle_states {
 			$states : append($states, $stateName);
@@ -26,6 +27,30 @@
 		$states : $statesNames;
 	}
 
+	// Get all pattern
+	$unmatched_patterns :  _gridle_unmatched_patterns($pattern);
+	$matched_patterns :  _gridle_matched_patterns($pattern);
+
+    // Adjust the replacement list length to be the same as unmatched_patterns
+    @while length( $unmatched_patterns ) != length( $replacements ) {
+        @if length( $unmatched_patterns ) < length( $replacements ) {
+            $replacements : list-pop($replacements);
+        }@else{
+            $replacements : append($replacements, (null));
+        }
+    }
+
+    // for each valid pattern, get replacement list
+    @each $index, $pattern in $matched_patterns {
+        @if $pattern == "%state" {
+            $matched_patterns : map-remove($matched_patterns, $index);
+        }@else{
+            $replacements : append($replacements, _gridle_get_pattern_values(str-slice($pattern, 2)));
+        }
+    }
+
+    $found_patterns : map-merge($unmatched_patterns, $matched_patterns);
+
 	// loop on each states :
 	@each $stateName in $states
 	{
@@ -41,8 +66,59 @@
 		@if $classes
 		{
 			@include gridle_state($stateName, false) {
-				#{_gridle_classname($pattern, $stateName)} {
-					@content;
+				$length_a:length($found_patterns);
+				$length_b:length($replacements);
+				@if $length_a > 0 and $length_a <= $length_b {
+					$list_indexes : ();
+					@for $i from 1 through $length_a {
+						$list_indexes : append($list_indexes, 1);
+					}
+
+					@while nth($list_indexes, 1) <= length( nth($replacements, 1) ){
+						$gridle-scope : () !global;
+						$replacement_pattern : $pattern;
+						$replaced_count : 0;
+
+						// Work the replacement
+						@each $index, $flag in $found_patterns {
+							$replaced_count : $replaced_count + 1;
+
+							$current_replacement : nth( $replacements, $replaced_count );
+							$current_index : nth($list_indexes, $replaced_count);
+
+							$replacement_pattern : set-nth( $replacement_pattern, $index, nth( $current_replacement, $current_index ) );
+
+							$var_name : str-slice($flag, 2);
+
+							$gridle-scope : map-set( $gridle-scope, $var_name, nth( $current_replacement, $current_index ) ) !global;
+						}
+
+						#{_gridle_classname($replacement_pattern, $stateName)} {
+							@content;
+						}
+
+						$gridle-scope : () !global;
+
+						// Add 1 to indexes
+						$break : false;
+						$current_iteration_index : length( $list_indexes ); // The last index
+						@while $break == false {
+							$list_indexes : set-nth( $list_indexes, $current_iteration_index, nth( $list_indexes, $current_iteration_index ) + 1 );
+
+							@if nth( $list_indexes, $current_iteration_index ) > length( nth( $replacements, $current_iteration_index ) )
+								and $current_iteration_index != 1 {
+								$list_indexes : set-nth( $list_indexes, $current_iteration_index, 1);
+
+								$current_iteration_index : $current_iteration_index - 1;
+							}@else{
+								$break : true;
+							}
+						}
+					}
+				}@else{
+					#{_gridle_classname($pattern, $stateName)} {
+						@content;
+					}
 				}
 			}
 		}
@@ -290,11 +366,11 @@
 	$statesCount : length($_gridle_states);
 	$i : 0;
 	@each $stateName, $state in $_gridle_states {
-	
+
 		$name : $stateName;
 
 		$gridle-settings-states : "#{$gridle-settings-states} \"#{$name}\":{";
-	
+
 		@each $varName, $var in $state {
 
 			$value : null;
@@ -327,7 +403,7 @@
 		} @else {
 			$gridle-settings-states : "#{$gridle-settings-states} },";
 		}
-	
+
 		// update i :
 		$i : $i + 1;
 
@@ -337,10 +413,10 @@
 	$gridle-settings-states : "#{$gridle-settings-states}}";
 	$gridle-settings : "{";
 	$gridle-settings : "#{$gridle-settings} \"version\" : \"#{$_gridle-version}\"";
-	
+
 	// states :
 	$gridle-settings : "#{$gridle-settings}, \"states\" : #{$gridle-settings-states}";
-	
+
 	// settings :
 	$gridle-settings : "#{$gridle-settings} }";
 	#gridle-settings {
@@ -377,7 +453,7 @@ $_gridle_generateOnlyOnce : true; // keep track of generate once classes
 	$states : all,
 	$package : all,
 	$has-parent : false
-) {	
+) {
 
 	// set that we are in generate phase (that can be used anywhere)
 	$_gridle_is_in_generate_phase : true !global;
@@ -423,7 +499,7 @@ $_gridle_generateOnlyOnce : true; // keep track of generate once classes
 		// | ------------------------
 		// | Windows 8 fix
 		// | ------------------------
-		
+
 		// Windows 8 fix for snap mode
 		@media screen and (max-width: 400px) {
 			@-ms-viewport { width: device-width; }
@@ -432,7 +508,7 @@ $_gridle_generateOnlyOnce : true; // keep track of generate once classes
 		// | ------------------------
 		// | JSON Settings
 		// | ------------------------
-	 
+
 		// generate json settings
 		@if $gridle-generate-json-settings
 		{
@@ -456,7 +532,7 @@ $_gridle_generateOnlyOnce : true; // keep track of generate once classes
 
 			// scope all the classes in a media query
 			@include gridle_state($state, false) {
-			
+
 				// generate all classes for columns
 				$i : 0;
 				@each $columnName, $column in gridle_get_columns($state) {
@@ -496,18 +572,18 @@ $_gridle_generateOnlyOnce : true; // keep track of generate once classes
 					@if _gridle_need_to_generate(suffix, $package) {
 						#{_gridle_classname(suffix, $stateName, $columnName)} {
 							@include gridle_suffix($columnsCount, $columnsContext);
-						}   
+						}
 					}
 					@if _gridle_need_to_generate(order, $package) {
 						#{_gridle_classname(order, $stateName, first)} {
 							@include gridle_order(-1);
-						} 
+						}
 						#{_gridle_classname(order, $stateName, $i)} {
 							@include gridle_order($i);
-						}  
+						}
 						#{_gridle_classname(order, $stateName, last)} {
 							@include gridle_order(9999);
-						} 
+						}
 					}
 					// up $i
 					$i : $i + 1;
@@ -515,7 +591,7 @@ $_gridle_generateOnlyOnce : true; // keep track of generate once classes
 
 				// media queries helpers classes
 				@include _gridle_generate_helper_classes($stateName, $package);
-	
+
 				// handle direction on body
 				body {
 					direction: gridle_get_state_var(direction);
@@ -561,4 +637,4 @@ $_gridle_generateOnlyOnce : true; // keep track of generate once classes
 
 	// reset the variable that track if we are in generate phase or not
 	$_gridle_is_in_generate_phase : false !global;
-}
+}

data/stylesheets/gridle/_init.scss

@@ -1,9 +1,9 @@
 // |------------------------------------------------------
 // |------------------------------------------------------
 // @created 	25.03.13
-// @updated 	23.12.15
+// @updated 	18.04.16
 // @author 		Olivier Bossel <olivier.bossel@gmail.com>
-// @version 	2.0.44
+// @version 	2.0.45
 // |------------------------------------------------------
 // |------------------------------------------------------
 
@@ -16,7 +16,7 @@
 // |------------------------------------------------------
 // |------------------------------------------------------
 
-$_gridle-version : "2.0.44";
+$_gridle-version : "2.0.45";
 
 
 
@@ -34,10 +34,11 @@ $_gridle-names-tokens : (
 	align 								: left center right top middle bottom around between,
 	float 								: left right both,
 	count 								: true, // will represent a certain count
-	side 								: top right bottom left,
-	reverse 							: '' reverse
+	side 								: top right bottom left null,
+	reverse 							: '' reverse,
+	state 								: true // is a valid pattern
 );
-$_gridle-names-separators : ('-','--','_','__','@');	// all the allowed separators						
+$_gridle-names-separators : ('-','--','_','__','@');	// all the allowed separators
 $_gridle_is_in_generate_phase : false; 			// keep track if we are in generate phase or not anymore
 $_gridle_inited : false;						// keep track if gridle has been inited (silent classes, etc..) or not
 $_gridle_settings : (); 						// the default settings
@@ -56,6 +57,8 @@ $_content_arg_state : null; 					// this variable is used to pass state through
 
 $gridle-vendor-prefix : true; 					// set if need to add vendor prefixes when needed
 
+$gridle-scope : (); 					        // Variable scope used in mixin like `gridle_generate_custom_class`
+
 
 
 // |------------------------------------------------------
@@ -141,4 +144,4 @@ $gridle-vendor-prefix : true; 					// set if need to add vendor prefixes when ne
 // |------------------------------------------------------
 // |------------------------------------------------------
 
-@import 'default-states';
+@import 'default-states';

data/stylesheets/gridle/_mixins.scss

@@ -109,7 +109,6 @@
 	
 	// container
 	@if $package == container {
-
 		@include _gridle_common_container($state);
 	}
 
@@ -268,7 +267,7 @@
 	// extend and apply css for different states
 	@if $for {
 		@include _gridle_extend($for);
-		@if _gridle_is_in_generate_phase() == false {
+		@if not _gridle_is_in_generate_phase() {
 			@include _gridle_apply_css_for($for);
 		}
 	}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gridle
 version: !ruby/object:Gem::Version
-  version: 2.0.44
+  version: 2.0.45
 platform: ruby
 authors:
 - Olivier Bossel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
 description: Gridle is a set of complete and simple settings, mixins and classes that
   make the creation and usage of grid systems (even complex ones) really simple.
 email:
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: 2.0.14
 requirements: []
 rubyforge_project: gridle
 rubygems_version: 2.0.14