gridle 1.3.3 → 1.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c99b2ecc45c9cc8c02c66f8f2a083c680f2ea51
-  data.tar.gz: 31cbc2085c7411d0e821b2d78fc4c51b92f1f185
+  metadata.gz: 25fa3ed88400ba41e7b6ceef686ed42b540b0b1d
+  data.tar.gz: f0d6ffa72c5367764dcd9feec78c21b02bad69c8
 SHA512:
-  metadata.gz: ea2a4913b98a8277baf084932cff4b8cd8b655ef149448408f4c9f9eaa740bc384c6788cfe5a43bedba38c9709edd037fcb2542ae596af092574544dbc8a5cc4
-  data.tar.gz: 3f2822149f0b360dabd0f6c98534aa531fc685024b76897f50f9c1796f4c5d6360ccd4e2672f1afd61a758221cbc27baa9c510f97511559e5d14706240ff43d4
+  metadata.gz: 5c20b35c956d35e10da537deb2c480fb648c05d571e0cf4a3d88cfc62111e69fb1dcf0426b0d40e55217a71d84955d8e6705e59a959fcb06ffde1e460063cebc
+  data.tar.gz: 064e220551da92e88b8e44b5f149680411cb5169ae80a65cc636e38c4380f2e7dbd6280c31c67018d0ad74b0684f7bb1e8fb8e65deee591863734129dd599481

data/lib/gridle.rb

@@ -2,13 +2,12 @@
 # These are the requires you would normally put in your config.rb file
 # By default, you should always included Compass. Do not include your
 #  extension.
-require 'compass'
 
 # This tells Compass what your Compass extension is called, and where to find
 #  its files
 # Replace 'extension' with the name of your extension. Spaces allowed.
-extension_path = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-Compass::Frameworks.register('gridle', :path => extension_path)
+# extension_path = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+# Compass::Frameworks.register('gridle', :path => extension_path)
 
 # Version and date of version for your Compass extension.
 # Replace Extension with the name of your extension
@@ -17,8 +16,8 @@ Compass::Frameworks.register('gridle', :path => extension_path)
 #    a prerelease version
 #  Date is in the form of YYYY-MM-DD
 module Extension
-  VERSION = "1.3.3"
-  DATE = "2014-07-22"
+  VERSION = "1.3.11"
+  DATE = "2014-05-15"
 end
 
 # This is where any custom SassScript should be placed. The functions will be  

data/stylesheets/gridle/_common-mixins.scss

@@ -5,7 +5,7 @@
 // |------------------------------------------------------
 
 @mixin _gridle_container_common(
-	$state : default
+	$state : null
 ) {
 	@extend %gridle-simple-clearfix;
 	@extend %gridle-container-common;
@@ -25,29 +25,24 @@
 	{
 		// vars :
 		$direction : _gridle_get_var_value(direction, $state);
-		$classes : _gridle_get_var_value(classes, $state);
 		$gutter-width : _gridle_get_var_value(gutter-width, $state);
 		$debug : _gridle_get_var_value(debug, $state);
 		
-		@if $classes
-		{
-			@include gridle_state($state) {
-				@if $direction == rtl {
-					float:right;
-					direction:rtl;
-				} @else {
-					float:left;
-					direction:ltr;
-				}
-
-				padding-left:$gutter-width/2;
-				padding-right:$gutter-width/2;
+		@include gridle_state($state) {
+			@if $direction == rtl {
+				float:right;
+				direction:rtl;
+			} @else {
+				float:left;
+				direction:ltr;
 			}
-			
-			@if $debug == true {
-				#{$gridle-debug-selector} {
-					@extend %gridle-grid-debug-common;
-				}
+
+			padding:0 $gutter-width/2;
+		}
+		
+		@if $debug == true {
+			#{$gridle-debug-selector} {
+				@extend %gridle-grid-debug-common;
 			}
 		}
 	}
@@ -57,7 +52,7 @@
 	@extend %gridle-parent-common;
 }
 @mixin _gridle_push_common(
-	$state : default
+	$state : null
 ) {
 	$debug : _gridle_get_var_value(debug, $state);
 
@@ -71,7 +66,7 @@
 	}
 }
 @mixin _gridle_pull_common(
-	$state : default
+	$state : null
 ) {
 	$debug : _gridle_get_var_value(debug, $state);
 
@@ -84,7 +79,7 @@
 	}
 }
 @mixin _gridle_prefix_common(
-	$state : default
+	$state : null
 ) {
 	$debug : _gridle_get_var_value(debug, $state);
 	@if $debug == true {
@@ -94,7 +89,7 @@
 	}
 }
 @mixin _gridle_suffix_common(
-	$state : default
+	$state : null
 ) {
 	$debug : _gridle_get_var_value(debug, $state);
 	@if $debug == true {

data/stylesheets/gridle/_functions.scss

@@ -44,25 +44,17 @@
 	$stateMap-or-stateName
 ) {
 	// check if has a state named like this :
-	@if (type-of($stateMap-or-stateName) == string
-		and  map-has-key($_gridle_states, unquote($stateMap-or-stateName)))
+	@if (map-has-key($_gridle_states, $stateMap-or-stateName))
 	{
 		@return map-get($_gridle_states, unquote($stateMap-or-stateName));
 	} 
 
 	// nothing finded, so return the default state :
 	@if $stateMap-or-stateName
-		and type-of($stateMap-or-stateName) == map
 	{
 		@return map-merge($_gridle-settings, $stateMap-or-stateName);
 	}
 
-	// return the default one if exist
-	@if map-has-key($_gridle_states, default)
-	{
-		@return map-get($_gridle_states, default);
-	}
-
 	// nothing finded, return the default state :
 	@return $_gridle-settings;
 }
@@ -186,14 +178,12 @@
 @function _gridle_create_column(
 	$name,
 	$columns,
-	$context,
-	$name-multiplicator : 1 // used to extend the state on custom registered columns
+	$context
 ) {
 	@return (
 		name : $name,
 		columns : $columns,
-		context : $context,
-		name-multiplicator : $name-multiplicator
+		context : $context
 	);
 }
 
@@ -238,34 +228,22 @@
 		@if $var == '%count' and $count {
 			$sel : "#{$sel}#{$count}";
 		}  
-		@if $var != '%state' and $var != '%count' and $var != '%-' and $var != '-' and $var != '--' and $var != '_' and $var != '__' and $var != '%prefix' {
+		@if $var != '%state' and $var != '%count' and $var != '%-' and $var != '%prefix' {
 			$sel : "#{$sel}#{$var}";
 		}
 
 		// handle separators :
-		@if ($var == '%-' or $var == '-' or $var == '--' or $var == '_' or $var == '__') and $i < length($pattern) {
+		@if $var == '%-' and $i < length($pattern) {
 			$index : $i + 1;
 			$value : nth($pattern, $index);
-			@if $value != '%state' and $value != '%count' and $value != '%-' and $value != '-' and $value != '--' and $value != '_' and $value != '__' and $value != '%prefix' {
-				@if $var == '%-' {
-					$sel : "#{$sel}#{$gridle-class-separator}";
-				} @else {
-					$sel : "#{$sel}#{$var}";
-				}
+			@if $value != '%state' and $value != '%count' and $value != '%-' and $value != '%prefix' {
+				$sel : "#{$sel}#{$gridle-class-separator}";
 			}
 			@if $value == '%state' and $state {
-				@if $var == '%-' {
-					$sel : "#{$sel}#{$gridle-class-separator}";
-				} @else {
-					$sel : "#{$sel}#{$var}";
-				}
+				$sel : "#{$sel}#{$gridle-class-separator}";
 			}
 			@if $value == '%count' and $count {
-				@if $var == '%-' {
-					$sel : "#{$sel}#{$gridle-class-separator}";
-				} @else {
-					$sel : "#{$sel}#{$var}";
-				}
+				$sel : "#{$sel}#{$gridle-class-separator}";
 			}
 		}
 
@@ -335,6 +313,26 @@
 		}
 
 	} 
+	@else if unquote($state-or-settings) == print
+	{
+		@return "only print";
+	} 
+	@else if unquote($state-or-settings) == tv
+	{
+		@return "only tv";
+	}
+	@else if unquote($state-or-settings) == portrait
+	{
+		@return "only screen and (orientation: portrait)";
+	}
+	@else if unquote($state-or-settings) == landscape
+	{
+		@return "only screen and (orientation: landscape)";
+	}
+	@else if unquote($state-or-settings) == retina
+	{
+		@return "only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx)";
+	}
 	@else
 	{
 		@return null;

data/stylesheets/gridle/_generate-mixins.scss

@@ -4,206 +4,117 @@
 // |------------------------------------------------------
 // |------------------------------------------------------
 
-
-/**
- * Generate a custom class for all the states
- *
- * @param 	list 	$pattern 		The name pattern of the class
- * @param 	list 	$statesNames 		The states names to generate
- */
-@mixin gridle_generate_custom_class(
-	$pattern,
-	$statesNames : null
-) {
-	// manage states to generate :
-	$states : ();
-	@if $statesNames == null {
-		// loop on each states to generate names list :
-		@each $stateName, $state in $_gridle_states {
-			$states : append($states, $stateName);
-		}
-	} @else {
-		$states : $statesNames;
-	}
-
-	// loop on each states :
-	@each $stateName in $states
-	{
-		// manage statename :
-		@if type-of($stateName) != string {
-			$stateName : map-get($stateName, name);
-		}
-
-		// classes :
-		$classes : _gridle_get_var_value(classes, $stateName);
-
-		// genrate the classname :
-		@if $classes
-		{
-			@include gridle_state($stateName, false) {
-				#{_gridle_classname($pattern, $stateName)} {
-					@content;
-				}
-			}
-		}
-	}
-}
-
 // Generate all helpers classes
 // All the classes generated are not wrapper in gridle_state
 // in this mixin... Just the names are generated accordingly to the
 // requested state
 @mixin _gridle_generate_helper_classes (
-	$state : null,
-	$what : null
+	$state : null
 ) {
 	// helpers :
-	@if $what == null or index($what, float) or index($what, helpers) {
-		#{_gridle_classname($gridle-float-left-name-pattern, $state)} {
-			@include gridle_float(left);
-		}
-		#{_gridle_classname($gridle-float-right-name-pattern, $state)} {
-			@include gridle_float(right);
-		}
+	#{_gridle_classname($gridle-hide-name-pattern, $state)} {
+		@include gridle_hide(null);
 	}
-
-	@if $what == null or index($what, clear) or index($what, helpers) {
-		#{_gridle_classname($gridle-clear-name-pattern, $state)} {
-			@include gridle_clear(both);
-		}
-		#{_gridle_classname($gridle-clear-left-name-pattern, $state)} {
-			@include gridle_clear(left);
-		}
-		#{_gridle_classname($gridle-clear-right-name-pattern, $state)} {
-			@include gridle_clear(right);
-		}
+	#{_gridle_classname($gridle-not-visible-name-pattern, $state)} {
+		@include gridle_not_visible(null);
 	}
-
-	@if $what == null or index($what, no_gutter) or index($what, no_margin) or index($what, helpers) {
-		#{_gridle_classname($gridle-no-gutter-name-pattern, $state)},
-		#{_gridle_classname($gridle-no-margin-name-pattern, $state)} {
-			@include gridle_no_margin();
-		}
-		#{_gridle_classname($gridle-no-gutter-left-name-pattern, $state)},
-		#{_gridle_classname($gridle-no-margin-left-name-pattern, $state)} {
-			@include gridle_no_margin(left);
-		}
-		#{_gridle_classname($gridle-no-gutter-right-name-pattern, $state)},
-		#{_gridle_classname($gridle-no-margin-right-name-pattern, $state)} {
-			@include gridle_no_margin(right);
-		}
-		#{_gridle_classname($gridle-no-gutter-top-name-pattern, $state)},
-		#{_gridle_classname($gridle-no-margin-top-name-pattern, $state)} {
-			@include gridle_no_margin(top);
-		}
-		#{_gridle_classname($gridle-no-gutter-bottom-name-pattern, $state)},
-		#{_gridle_classname($gridle-no-margin-bottom-name-pattern, $state)} {
-			@include gridle_no_margin(bottom);
-		}
+	#{_gridle_classname($gridle-show-name-pattern, $state)} {
+		@include gridle_show(null);
 	}
-
-	@if $what == null or index($what, gutter) or index($what, margin) or index($what, helpers) {
-		#{_gridle_classname($gridle-gutter-name-pattern, $state)},
-		#{_gridle_classname($gridle-margin-name-pattern, $state)} {
-			@include gridle_margin(left right);
-		}
-		#{_gridle_classname($gridle-gutter-left-name-pattern, $state)},
-		#{_gridle_classname($gridle-margin-left-name-pattern, $state)} {
-			@include gridle_margin(left);
-		}
-		#{_gridle_classname($gridle-gutter-right-name-pattern, $state)},
-		#{_gridle_classname($gridle-margin-right-name-pattern, $state)} {
-			@include gridle_margin(right);
-		}
-		#{_gridle_classname($gridle-gutter-top-name-pattern, $state)},
-		#{_gridle_classname($gridle-margin-top-name-pattern, $state)} {
-			@include gridle_margin(top);
-		}
-		#{_gridle_classname($gridle-gutter-bottom-name-pattern, $state)},
-		#{_gridle_classname($gridle-margin-bottom-name-pattern, $state)} {
-			@include gridle_margin(bottom);
-		}
+	#{_gridle_classname($gridle-visible-name-pattern, $state)} {
+		@include gridle_visible(null);
 	}
-
-	@if $what == null or index($what, auto_height) or index($what, helpers) {
-		#{_gridle_classname($gridle-auto-height-name-pattern, $state)} {
-			height:inherit;
-		}
+	#{_gridle_classname($gridle-float-left-name-pattern, $state)} {
+		@include gridle_float(left);
 	}
-
-	@if $what == null or index($what, centered) or index($what, helpers) {
-		#{_gridle_classname($gridle-centered-name-pattern, $state)} {
-			@include gridle_centered(null);
-		}
+	#{_gridle_classname($gridle-float-right-name-pattern, $state)} {
+		@include gridle_float(right);
 	}
-
-	@if $what == null or index($what, parent) or index($what, helpers) {
-		#{_gridle_classname($gridle-parent-name-pattern, $state)} {
-			@include _gridle_parent();
-		}
+	#{_gridle_classname($gridle-clear-name-pattern, $state)} {
+		@include gridle_clear(both);
 	}
-
-	@if $what == null or index($what, vertical_align) or index($what, helpers) {
-		#{_gridle_classname($gridle-vertical-align-middle-name-pattern, $state)} {
-			@include _gridle_vertical_align();
-		}
-		#{_gridle_classname($gridle-vertical-align-top-name-pattern, $state)} {
-			@include _gridle_vertical_align(top);
-		}
-		#{_gridle_classname($gridle-vertical-align-bottom-name-pattern, $state)} {
-			@include _gridle_vertical_align(bottom);
-		}
+	#{_gridle_classname($gridle-clear-left-name-pattern, $state)} {
+		@include gridle_clear(left);
 	}
-
-	/**
-	 * Visible, hide, etc...
-	 */
-	@if $what == null or index($what, hide) or index($what, helpers) {
-		#{_gridle_classname($gridle-hide-name-pattern, $state)} {
-			@include gridle_hide(null);
-		}
+	#{_gridle_classname($gridle-clear-right-name-pattern, $state)} {
+		@include gridle_clear(right);
 	}
-
-	@if $what == null or index($what, not_visible) or index($what, helpers) {
-		#{_gridle_classname($gridle-not-visible-name-pattern, $state)} {
-			@include gridle_not_visible(null);
-		}
+	#{_gridle_classname($gridle-no-gutter-name-pattern, $state)},
+	#{_gridle_classname($gridle-no-margin-name-pattern, $state)} {
+		@include gridle_no_margin();
 	}
-
-	@if $what == null or index($what, show) or index($what, helpers) {
-		#{_gridle_classname($gridle-show-name-pattern, $state)} {
-			@include gridle_show(null);
-		}
-		#{_gridle_classname($gridle-show-inline-name-pattern, $state)} {
-			@include gridle_show_inline(null);
-		}
+	#{_gridle_classname($gridle-no-gutter-left-name-pattern, $state)},
+	#{_gridle_classname($gridle-no-margin-left-name-pattern, $state)} {
+		@include gridle_no_margin(left);
 	}
-
-	@if $what == null or index($what, visible) or index($what, helpers) {
-		#{_gridle_classname($gridle-visible-name-pattern, $state)} {
-			@include gridle_visible(null);
-		}
+	#{_gridle_classname($gridle-no-gutter-right-name-pattern, $state)},
+	#{_gridle_classname($gridle-no-margin-right-name-pattern, $state)} {
+		@include gridle_no_margin(right);
+	}
+	#{_gridle_classname($gridle-no-gutter-top-name-pattern, $state)},
+	#{_gridle_classname($gridle-no-margin-top-name-pattern, $state)} {
+		@include gridle_no_margin(top);
+	}
+	#{_gridle_classname($gridle-no-gutter-bottom-name-pattern, $state)},
+	#{_gridle_classname($gridle-no-margin-bottom-name-pattern, $state)} {
+		@include gridle_no_margin(bottom);
+	}
+	#{_gridle_classname($gridle-gutter-name-pattern, $state)},
+	#{_gridle_classname($gridle-margin-name-pattern, $state)} {
+		@include gridle_margin(left right);
+	}
+	#{_gridle_classname($gridle-gutter-left-name-pattern, $state)},
+	#{_gridle_classname($gridle-margin-left-name-pattern, $state)} {
+		@include gridle_margin(left);
+	}
+	#{_gridle_classname($gridle-gutter-right-name-pattern, $state)},
+	#{_gridle_classname($gridle-margin-right-name-pattern, $state)} {
+		@include gridle_margin(right);
+	}
+	#{_gridle_classname($gridle-gutter-top-name-pattern, $state)},
+	#{_gridle_classname($gridle-margin-top-name-pattern, $state)} {
+		@include gridle_margin(top);
+	}
+	#{_gridle_classname($gridle-gutter-bottom-name-pattern, $state)},
+	#{_gridle_classname($gridle-margin-bottom-name-pattern, $state)} {
+		@include gridle_margin(bottom);
+	}
+	#{_gridle_classname($gridle-auto-height-name-pattern, $state)} {
+		height:inherit;
+	}
+	#{_gridle_classname($gridle-centered-name-pattern, $state)} {
+		@include gridle_centered(null);
+	}
+	#{_gridle_classname($gridle-parent-name-pattern, $state)} {
+		@include _gridle_parent();
+	}
+	#{_gridle_classname($gridle-vertical-align-middle-name-pattern, $state)} {
+		@include _gridle_vertical_align();
+	}
+	#{_gridle_classname($gridle-vertical-align-top-name-pattern, $state)} {
+		@include _gridle_vertical_align(top);
+	}
+	#{_gridle_classname($gridle-vertical-align-bottom-name-pattern, $state)} {
+		@include _gridle_vertical_align(bottom);
 	}
 
 	/**
 	 * Clear each class :
 	 */
-	@if $what == null or index($what, clear_each) or index($what, helpers) {
-		@each $clearName, $clearMap in $_gridle_clear_classes {
-			// get count :
-			$clearCount : map-get($clearMap, clearEach);
-			// what to clear :
-			$clearWhat : map-get($clearMap, clearWhat);
-			// generate the class :
-			#{_gridle_classname($gridle-clear-each-pattern, $state, $clearCount)} {
-				@include _gridle_clear_each($clearCount, $clearWhat);
-			}
+	@each $clearName, $clearMap in $_gridle_clear_classes {
+		// get count :
+		$clearCount : map-get($clearMap, clearEach);
+		// what to clear :
+		$clearWhat : map-get($clearMap, clearWhat);
+		// generate the class :
+		#{_gridle_classname($gridle-clear-each-pattern, $state, $clearCount)} {
+			@include _gridle_clear_each($clearCount, $clearWhat, $state);
 		}
 	}
 
 	// debug colors :
 	$debug : _gridle_get_var_value(debug, $state);
-	@if $debug and ( $what == null or index($what, debug_colors) or index($what, helpers) ) {
+	@if $debug {
 		// debug color classes :
 		#{_gridle_classname($gridle-debug-color-name-pattern, $state, 1)} {
 			#{$gridle-debug-selector} {
@@ -240,14 +151,14 @@
 
 
 // generate settings json :
-@mixin gridle_generate_json_settings() {
+@mixin gridle_generate_json_settings(
+	$scope : default
+) {
 
 	// settings content :
 	$gridle-settings-states : "{";
 
 	// generate all classes for differents media queries :
-	$statesCount : length($_gridle_states);
-	$i : 0;
 	@each $stateName, $state in $_gridle_states {
 	
 		$name : $stateName;
@@ -258,30 +169,22 @@
 
 			$value : null;
 			@if $varName == "query" {
-				$value : _gridle_get_media_query($stateName);
+				$value : _gridle_get_media_query_for_state($stateName);
 			} @else {
 				$value : map-get($state,$varName);
+				// $value : _gridle_get_state_var($i,$var);
 			}
 
 			@if $value == null {
 				$gridle-settings-states : "#{$gridle-settings-states} \"#{$varName}\" : null,";
-			} @elseif type-of($value) == bool {
+			} @elseif $var == 'context' or $var == 'classes' {
 				$gridle-settings-states : "#{$gridle-settings-states} \"#{$varName}\" : #{$value},";
 			} @else {
 				$gridle-settings-states : "#{$gridle-settings-states} \"#{$varName}\" : \"#{$value}\",";		
 			}
 		}
 
-		$gridle-settings-states : "#{$gridle-settings-states} \"_gridle\" : true";
-
-		@if $i >= $statesCount - 1 {
-			$gridle-settings-states : "#{$gridle-settings-states} }";
-		} @else {
-			$gridle-settings-states : "#{$gridle-settings-states} },";
-		}
-	
-		// update i :
-		$i : $i + 1;
+		$gridle-settings-states : "#{$gridle-settings-states} },";
 
 	}
 
@@ -298,12 +201,25 @@
 	@if length($_gridle_states_debug_devices) <= 0 {
 		$debug_devices : null;
 	}
-	// $gridle-settings : "#{$gridle-settings}, \"debugDevices\" : { #{$debug_devices} }";
+	$gridle-settings : "#{$gridle-settings}, \"debugDevices\" : { #{$debug_devices} }";
 
 	// settings :
-	// $gridle-settings : "#{$gridle-settings}, \"classPrefix\" : \"#{$gridle-class-prefix}\"";
+	$gridle-settings : "#{$gridle-settings}, \"columnsCount\" : #{$gridle-columns-count}";
+	$gridle-settings : "#{$gridle-settings}, \"gutterWidth\" : \"#{$gridle-gutter-width}\"";
+	$gridle-settings : "#{$gridle-settings}, \"nameMultiplicator\" : #{$gridle-name-multiplicator}";
+	$gridle-settings : "#{$gridle-settings}, \"direction\" : \"#{$gridle-direction}\"";
+	$gridle-settings : "#{$gridle-settings}, \"ie7Support\" : #{$gridle-ie7-support}";
+	$gridle-settings : "#{$gridle-settings}, \"debug\" : #{$gridle-debug}";
+	$gridle-settings : "#{$gridle-settings}, \"debugShowClassNames\" : #{$gridle-debug-show-class-names}";
+	$gridle-settings : "#{$gridle-settings}, \"htmlStatesClasses\" : #{$gridle-html-states-classes}";
+	$gridle-settings : "#{$gridle-settings}, \"generateHelpersClasses\" : #{$gridle-generate-helpers-classes}";
+	$gridle-settings : "#{$gridle-settings}, \"generatePushClasses\" : #{$gridle-generate-push-classes}";
+	$gridle-settings : "#{$gridle-settings}, \"generatePullClasses\" : #{$gridle-generate-pull-classes}";
+	$gridle-settings : "#{$gridle-settings}, \"generatePrefixClasses\" : #{$gridle-generate-prefix-classes}";
+	$gridle-settings : "#{$gridle-settings}, \"generateSuffixClasses\" : #{$gridle-generate-suffix-classes}";
+	$gridle-settings : "#{$gridle-settings}, \"classPrefix\" : \"#{$gridle-class-prefix}\"";
 	$gridle-settings : "#{$gridle-settings} }";
-	#gridle-settings {
+	#gridle-settings-#{$scope} {
 		content : $gridle-settings;
 	}
 }
@@ -312,125 +228,62 @@
 // gridle mixin :
 // Generate all the classes needed for a grid
 @mixin gridle_generate_classes(
-	$stateName : null,
-	$what : null,
 	$scope : null
 ) {
-	// if the what parameter is not null, mean that we need to generate only certain classes in a certain order :
-	@if $what
-	{
-		// loop on each what item to generate the corresponding classes :
-		@each $w in $what
-		{
-			// check if a scope exist :
-			@if $scope {
-				// wrapp grid into scope :
-				.#{$scope} {
-					@include _gridle_generate_classes($stateName, ( $w ), true);
-				}
-			} @else {
-				// generate classes :
-				@include _gridle_generate_classes($stateName, ( $w ), false);
-			}
-		}
-	}
-	@else
-	{
-		// don't have any "what" parameter so generate all the classes
-		// check if a scope exist :
-		@if $scope {
-			// wrapp grid into scope :
-			.#{$scope} {
-				@include _gridle_generate_classes($stateName, null, true);
-			}
-		} @else {
-			// generate classes :
-			@include _gridle_generate_classes($stateName, null, false);
+	// check if a scope exist :
+	@if $scope {
+		// wrapp grid into scope :
+		.#{$scope} {
+			@include _gridle_generate_classes(true);
 		}
+	} @else {
+		// generate classes :
+		@include _gridle_generate_classes(false);
 	}
 }
-$_gridle_generateOnlyOnce : true; // keep track of generate once classes
 @mixin _gridle_generate_classes(
-	$stateName : null,
-	$what : null,
-	$has-parent : false
+	$has-parent
 ) {
  
-	// generate these classes only once :
-	@if $_gridle_generateOnlyOnce
-	{
-
-		// update status :
-		$_gridle_generateOnlyOnce : false;
-
-		// | ------------------------
-		// | Windows 8 fix
-		// | ------------------------
-		
-		// Windows 8 fix for snap mode :
-		@media screen and (max-width: 400px) {
-			@-ms-viewport { width: device-width; }
-		}
-
-
-		// | ------------------------
-		// | Container
-		// | ------------------------
-	 
-		// generate container class :
-		@if $what == null or index($what, container) or index($what, default)
-		{
-			$container-selector : ();
-			$container-selector : append( $container-selector, unquote(_gridle_classname($gridle-container-name-pattern)), comma);
-			#{$container-selector} {
-				@include gridle_container();
-			}
-		}
-
-
-		// | ------------------------
-		// | Parent selector
-		// | ------------------------
-
-		// parent common css :
-		@if $what == null or index($what, parent) or index($what, default)
-		{
-			$parentSelector : _gridle_classname($gridle-parent-name-pattern,null,null);
-			#{$parentSelector} {
-				@extend %gridle-clearfix;
-				@extend %gridle-parent-common;
-			}
-		}
-
+	// | ------------------------
+	// | Windows 8 fix
+	// | ------------------------
+	
+	// Windows 8 fix for snap mode :
+	@media screen and (max-width: 400px) {
+		@-ms-viewport { width: device-width; }
+	}
 
-		// // | ------------------------
-		// // | JSON Settings
-		// // | ------------------------
-	 
-		// // generate json settings :
-		@if $gridle-generate-json-settings
-		{
-			@include gridle_generate_json_settings();
-		}
 
+	// | ------------------------
+	// | Container
+	// | ------------------------
+ 
+	// generate container class :
+	$container-selector : ();
+	$container-selector : append( $container-selector, unquote(_gridle_classname($gridle-container-name-pattern)), comma);
+	#{$container-selector} {
+		@include gridle_container();
 	}
 
 
 	// | ------------------------
-	// | Set the list of states to generate
+	// | Parent selector
 	// | ------------------------
-	$states : $_gridle_states;
-	@if $stateName and _gridle_has_state($stateName) {
-		$states : map-set((), $stateName, _gridle_get_state($stateName));
-	}
 
+	// parent common css :
+	$parentSelector : _gridle_classname($gridle-parent-name-pattern,null,null);
+	#{$parentSelector} {
+		@extend %gridle-clearfix;
+		@extend %gridle-parent-common;
+	}
 
 	// | ------------------------
 	// | Store all the generated common selectors
 	// | ------------------------
 
 	// generate all selector for extends :
-	$grid-common-selector : ();
+	$common-selector : ();
 	$push-common-selector : ();
 	$pull-common-selector : ();
 	$prefix-common-selector : ();
@@ -442,7 +295,7 @@ $_gridle_generateOnlyOnce : true; // keep track of generate once classes
 	// | ------------------------
 
 	// generate all classes for media queries :
-	@each $stateName, $state in $states {
+	@each $stateName, $state in $_gridle_states {
 	
 		// setup vars :
 		$media : $stateName;
@@ -465,10 +318,9 @@ $_gridle_generateOnlyOnce : true; // keep track of generate once classes
 				
 				// name :
 				$columnName : "#{$j*$name-multiplicator}";
-				$columnWidth : $j * $name-multiplicator;
 
 				// // create a column :
-				$col : _gridle_create_column($columnName, $columnWidth, $context, $name-multiplicator);
+				$col : _gridle_create_column($columnName, $j,  $context);
 
 				// // add column in columns map :
 				$columnsMap : map-set($columnsMap, $columnName,  $col);
@@ -478,19 +330,17 @@ $_gridle_generateOnlyOnce : true; // keep track of generate once classes
 			@each $columnName, $column in $columnsMap {
 		 	
 				// add selector :
-				@if $what == null or index($what, grid) or index($what, default) {
-					$grid-common-selector : append( $grid-common-selector, unquote(_gridle_classname($gridle-grid-name-pattern, $media, $columnName)), comma );
-				}
-				@if $generate-push-classes and ($what == null or index($what, push) or index($what, default)) {
+				$common-selector : append( $common-selector, unquote(_gridle_classname($gridle-grid-name-pattern, $media, $columnName)), comma );
+				@if $generate-push-classes {
 					$push-common-selector : append( $push-common-selector, unquote(_gridle_classname($gridle-push-name-pattern, $media, $columnName)), comma );
 				}
-				@if $generate-pull-classes and ($what == null or index($what, pull) or index($what, default)) {
+				@if $generate-pull-classes {
 					$pull-common-selector : append( $pull-common-selector, unquote(_gridle_classname($gridle-pull-name-pattern, $media, $columnName)), comma );
 				}
-				@if $generate-prefix-classes and ($what == null or index($what, prefix) or index($what, default)) {
+				@if $generate-prefix-classes {
 					$prefix-common-selector : append( $prefix-common-selector, unquote(_gridle_classname($gridle-prefix-name-pattern, $media, $columnName)), comma );
 				}
-				@if $generate-suffix-classes and ($what == null or index($what, suffix) or index($what, default)) {
+				@if $generate-suffix-classes {
 					$suffix-common-selector : append( $suffix-common-selector, unquote(_gridle_classname($gridle-suffix-name-pattern, $media, $columnName)), comma );
 				}
 			}
@@ -498,30 +348,20 @@ $_gridle_generateOnlyOnce : true; // keep track of generate once classes
 	}
  
 	// common css :
-	@if  $what == null or index($what, grid) or index($what, default) {
-		#{$grid-common-selector} {
-			@include _gridle_grid_common();
-		}
+	#{$push-common-selector} {
+		@include _gridle_push_common();
 	}
-	@if  $what == null or index($what, push) or index($what, default) {
-		#{$push-common-selector} {
-			@include _gridle_push_common();
-		}
+	#{$pull-common-selector} {
+		@include _gridle_pull_common();
 	}
-	@if  $what == null or index($what, pull) or index($what, default) {
-		#{$pull-common-selector} {
-			@include _gridle_pull_common();
-		}
+	#{$prefix-common-selector} {
+		@include _gridle_prefix_common();
 	}
-	@if  $what == null or index($what, prefix) or index($what, default) {
-		#{$prefix-common-selector} {
-			@include _gridle_prefix_common();
-		}
+	#{$suffix-common-selector} {
+		@include _gridle_suffix_common();
 	}
-	@if  $what == null or index($what, suffix) or index($what, default) {
-		#{$suffix-common-selector} {
-			@include _gridle_suffix_common();
-		}
+	#{$common-selector} {
+		@include _gridle_grid_common();
 	}
 
 
@@ -530,7 +370,7 @@ $_gridle_generateOnlyOnce : true; // keep track of generate once classes
 	// | ------------------------
  
 	// generate all classes for differents media queries :
-	@each $stateName, $state in $states {
+	@each $stateName, $state in $_gridle_states {
 		
 		// setup vars :
 		$classes : _gridle_get_var_value(classes, $state);
@@ -542,16 +382,16 @@ $_gridle_generateOnlyOnce : true; // keep track of generate once classes
 		$generate-suffix-classes : _gridle_get_var_value(generate-suffix-classes, $state);
 		$generate-helpers-classes : _gridle_get_var_value(generate-helpers-classes, $state);
 
+		// parent common css :
+		$parentSelector : _gridle_classname($gridle-parent-name-pattern,$stateName,null);
+		#{$parentSelector} {
+			@extend %gridle-clearfix;
+			@extend %gridle-parent-common;
+		}
+
 		// generate all media queries grid classes :
 		@if $classes == true {
 
-			// parent common css :
-			$parentSelector : _gridle_classname($gridle-parent-name-pattern,$stateName,null);
-			#{$parentSelector} {
-				@extend %gridle-clearfix;
-				@extend %gridle-parent-common;
-			}
-
 			// generate all the classes :
 			@include gridle_state($stateName, $has-parent) {
 		 
@@ -563,10 +403,9 @@ $_gridle_generateOnlyOnce : true; // keep track of generate once classes
 					
 					// name :
 					$columnName : "#{$j*$name-multiplicator}";
-					$columnWidth : $j * $name-multiplicator;
 
 					// // create a column :
-					$col : _gridle_create_column($columnName, $columnWidth, $context, $name-multiplicator);
+					$col : _gridle_create_column($columnName, $j,  $context);
 
 					// // add column in columns map :
 					$columnsMap : map-set($columnsMap, $columnName,  $col);
@@ -578,36 +417,32 @@ $_gridle_generateOnlyOnce : true; // keep track of generate once classes
 					// variables :
 					$columnsCount : map-get($column, columns);
 					$columnsContext : map-get($column, context);
-					$columnsNameMultiplicator : map-get($column, name-multiplicator);
 
 					// extend context in state (for columns) :
 					$extendedState : map-merge($state, (
-						context : $columnsContext,
-						name-multiplicator : $columnsNameMultiplicator // inject the name multiplicator here getted from column to handle custom registered columns
+						context : $columnsContext
 					));
 
 					// classes :
-					@if $what == null or index($what, grid) or index($what, default) {
-						#{_gridle_classname($gridle-grid-name-pattern, $stateName, $columnName)} {
-							@include _gridle($columnsCount, $extendedState);
-						}
+					#{_gridle_classname($gridle-grid-name-pattern, $stateName, $columnName)} {
+						@include _gridle($columnsCount, $extendedState);
 					}
-					@if $generate-push-classes == true and ($what == null or index($what, push) or index($what, default)) {
+					@if $generate-push-classes == true {
 						#{_gridle_classname($gridle-push-name-pattern, $stateName, $columnName)} {
 							@include _gridle_push($columnsCount, $extendedState);
 						}
 					}
-					@if $generate-pull-classes == true and ($what == null or index($what, pull) or index($what, default)) {
+					@if $generate-pull-classes == true {
 						#{_gridle_classname($gridle-pull-name-pattern, $stateName, $columnName)} {
 							@include _gridle_pull($columnsCount, $extendedState);
 						}
 					}
-					@if $generate-prefix-classes == true and ($what == null or index($what, prefix) or index($what, default)) {
+					@if $generate-prefix-classes == true {
 						#{_gridle_classname($gridle-prefix-name-pattern, $stateName, $columnName)} {
 							@include _gridle_prefix($columnsCount, $extendedState);
 						}
 					}
-					@if $generate-suffix-classes == true and ($what == null or index($what, suffix) or index($what, default)) {
+					@if $generate-suffix-classes == true {
 						#{_gridle_classname($gridle-suffix-name-pattern, $stateName, $columnName)} {
 							@include _gridle_suffix($columnsCount, $extendedState);
 						}   
@@ -616,9 +451,17 @@ $_gridle_generateOnlyOnce : true; // keep track of generate once classes
  
 				// media queries helpers classes :
 				@if $generate-helpers-classes == true {
-					@include _gridle_generate_helper_classes($stateName, $what);
+					@include _gridle_generate_helper_classes($stateName);
 				}
 			}
 		}
 	}
+
+
+	// // | ------------------------
+	// // | JSON Settings
+	// // | ------------------------
+ 
+	// // generate json settings :
+	// @include gridle_generate_json_settings();
 }