gridle 1.3.27 → 1.3.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a7e42d4f361620beea144a2a237fc5add61dbba
-  data.tar.gz: 113d7ad36be92c39b6768330e9ae19f61ab13478
+  metadata.gz: cc0de88b3051757dc948acc3bf43f7040eeac03c
+  data.tar.gz: 59dd262b6ff7969e13b1abdec39215cf826592f4
 SHA512:
-  metadata.gz: f6d436bc519a97772a4fbb7dc7e26056a7971182cf819129866d6dcc24b85f8594f675b87269445f5c9ed3ca7d9e33c61b0dba355220c470204b2ddb2363fa3a
-  data.tar.gz: 8e78044df9b95c6550298283956096c98e0401a8bf65aca2b1f537eabd204a87f6f00dc82d0a65dbd65845553c213335899464f7b5c3066e37f697d8a6c2b000
+  metadata.gz: 533f1b2160466fee09163b37e271cfa2f483c237f8ac9461e02c9f2af3354201abffdcf321c462487a440b9733162667e8656656aa7b963545386ff8f2d7cc0c
+  data.tar.gz: fab65351c02cd0dfa3fb33fdce5b36998206906513524b3b2f9d599f3aeeb6d77d55ad41cf9b3882686bf493eb6c60276423ca5d3241e817508e7478915c9bd2

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 = "1.3.27"
-  DATE = "2014-07-14"
+  VERSION = "1.3.29"
+  DATE = "2014-07-22"
 end
 
 # This is where any custom SassScript should be placed. The functions will be  

data/stylesheets/gridle/_common-mixins.scss

@@ -25,25 +25,29 @@
 	{
 		// 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);
 		
-		@include gridle_state($state) {
-			@if $direction == rtl {
-				float:right;
-				direction:rtl;
-			} @else {
-				float:left;
-				direction:ltr;
-			}
+		@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;
-		}
-		
-		@if $debug == true {
-			#{$gridle-debug-selector} {
-				@extend %gridle-grid-debug-common;
+				padding-left:$gutter-width/2;
+				padding-right:$gutter-width/2;
+			}
+			
+			@if $debug == true {
+				#{$gridle-debug-selector} {
+					@extend %gridle-grid-debug-common;
+				}
 			}
 		}
 	}

data/stylesheets/gridle/_default-states.scss

@@ -0,0 +1,35 @@
+// |------------------------------------------------------
+// |------------------------------------------------------
+// | Default states
+// |------------------------------------------------------
+// |------------------------------------------------------
+
+// retina
+@include gridle_register_state("retina", (
+	query : "(-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi)",
+	classes : false
+) );
+
+// tv
+@include gridle_register_state("tv", (
+	query : "only tv",
+	classes : false
+) );
+
+// print
+@include gridle_register_state("print", (
+	query : "only print",
+	classes : false
+) );
+
+// portrait
+@include gridle_register_state("portrait", (
+	query : "only screen and (orientation: portrait)",
+	classes : false
+) );
+
+// landscape
+@include gridle_register_state("landscape", (
+	query : "only screen and (orientation: landscape)",
+	classes : false
+) );

data/stylesheets/gridle/_functions.scss

@@ -44,13 +44,15 @@
 	$stateMap-or-stateName
 ) {
 	// check if has a state named like this :
-	@if (map-has-key($_gridle_states, unquote($stateMap-or-stateName)))
+	@if (type-of($stateMap-or-stateName) == string
+		and  map-has-key($_gridle_states, unquote($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);
 	}
@@ -178,12 +180,14 @@
 @function _gridle_create_column(
 	$name,
 	$columns,
-	$context
+	$context,
+	$name-multiplicator : 1 // used to extend the state on custom registered columns
 ) {
 	@return (
 		name : $name,
 		columns : $columns,
-		context : $context
+		context : $context,
+		name-multiplicator : $name-multiplicator
 	);
 }
 
@@ -325,26 +329,6 @@
 		}
 
 	} 
-	@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

@@ -34,10 +34,16 @@
 			$stateName : map-get($stateName, name);
 		}
 
+		// classes :
+		$classes : _gridle_get_var_value(classes, $stateName);
+
 		// genrate the classname :
-		@include gridle_state($stateName, false) {
-			#{_gridle_classname($pattern, $stateName)} {
-				@content;
+		@if $classes
+		{
+			@include gridle_state($stateName, false) {
+				#{_gridle_classname($pattern, $stateName)} {
+					@content;
+				}
 			}
 		}
 	}
@@ -402,7 +408,10 @@ $_gridle_generateOnlyOnce : true; // keep track of generate once classes
 		// // | ------------------------
 	 
 		// // generate json settings :
-		@include gridle_generate_json_settings();
+		@if $gridle-generate-json-settings
+		{
+			@include gridle_generate_json_settings();
+		}
 
 	}
 
@@ -456,9 +465,10 @@ $_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, $j,  $context);
+				$col : _gridle_create_column($columnName, $columnWidth, $context, $name-multiplicator);
 
 				// // add column in columns map :
 				$columnsMap : map-set($columnsMap, $columnName,  $col);
@@ -532,16 +542,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) {
 		 
@@ -553,9 +563,10 @@ $_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, $j,  $context);
+					$col : _gridle_create_column($columnName, $columnWidth, $context, $name-multiplicator);
 
 					// // add column in columns map :
 					$columnsMap : map-set($columnsMap, $columnName,  $col);
@@ -567,10 +578,12 @@ $_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
+						context : $columnsContext,
+						name-multiplicator : $columnsNameMultiplicator // inject the name multiplicator here getted from column to handle custom registered columns
 					));
 
 					// classes :

data/stylesheets/gridle/_gridle.scss

@@ -29,13 +29,13 @@
 // |------------------------------------------------------
 // |------------------------------------------------------
 // @created 	25.03.13
-// @updated 	14.07.14
+// @updated 	22.07.14
 // @author 	Olivier Bossel <olivier.bossel@gmail.com>
-// @version 	1.3.27
+// @version 	1.3.29
 // |------------------------------------------------------
 // |------------------------------------------------------
 
-$_gridle-version : "1.3.27";
+$_gridle-version : "1.3.29";
 
 
 
@@ -128,3 +128,14 @@ $_gridle_states_debug_devices : (); 				// save the debug states devices
 // |------------------------------------------------------
 
 @import 'generate-mixins';
+
+
+
+
+// |------------------------------------------------------
+// |------------------------------------------------------
+// | Default states
+// |------------------------------------------------------
+// |------------------------------------------------------
+
+@import 'default-states';

data/stylesheets/gridle/_settings.scss

@@ -4,6 +4,8 @@
 // |------------------------------------------------------
 // |------------------------------------------------------
 
+$gridle-generate-json-settings 			: true !default;
+
 $gridle-debug-selector 				: ".gridle-debug &, &.gridle-debug" !default;
 
 $gridle-class-prefix 					: '' !default;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gridle
 version: !ruby/object:Gem::Version
-  version: 1.3.27
+  version: 1.3.29
 platform: ruby
 authors:
 - Olivier Bossel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -35,6 +35,7 @@ files:
 - lib/gridle.rb
 - stylesheets/_gridle.scss
 - stylesheets/gridle/_common-mixins.scss
+- stylesheets/gridle/_default-states.scss
 - stylesheets/gridle/_functions.scss
 - stylesheets/gridle/_generate-mixins.scss
 - stylesheets/gridle/_gridle.scss