gridle 1.3.29 → 1.3.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc0de88b3051757dc948acc3bf43f7040eeac03c
-  data.tar.gz: 59dd262b6ff7969e13b1abdec39215cf826592f4
+  metadata.gz: f16aa6ac68623dabed23586e2672a5ea50e958fb
+  data.tar.gz: e18e1935d3e0c0ef03761b0fb7e2566a179268c4
 SHA512:
-  metadata.gz: 533f1b2160466fee09163b37e271cfa2f483c237f8ac9461e02c9f2af3354201abffdcf321c462487a440b9733162667e8656656aa7b963545386ff8f2d7cc0c
-  data.tar.gz: fab65351c02cd0dfa3fb33fdce5b36998206906513524b3b2f9d599f3aeeb6d77d55ad41cf9b3882686bf493eb6c60276423ca5d3241e817508e7478915c9bd2
+  metadata.gz: 36fbccefae4ca51786949b96023d8fa13331000f12175c9e9e5bd8e9420c73338a61bf55c8cd44598a76585fb860ff5c869c730e71219cef673248bfc5b9b1a9
+  data.tar.gz: a115b76aedbe02dde0e272612615a0b96d0166be239c38d5a1fb619b94d9a598e8dfd341eb686b68ce93ec61713e391164393286d93d2b1c9e35b28a2f93bc5a

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

data/stylesheets/gridle/_default-states.scss

@@ -6,7 +6,7 @@
 
 // retina
 @include gridle_register_state("retina", (
-	query : "(-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi)",
+	query : "(-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi), (min-resolution: 2dppx)",
 	classes : false
 ) );
 

data/stylesheets/gridle/_functions.scss

@@ -57,6 +57,12 @@
 		@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;
 }

data/stylesheets/gridle/_gridle.scss

@@ -29,13 +29,13 @@
 // |------------------------------------------------------
 // |------------------------------------------------------
 // @created 	25.03.13
-// @updated 	22.07.14
+// @updated 	02.09.14
 // @author 	Olivier Bossel <olivier.bossel@gmail.com>
-// @version 	1.3.29
+// @version 	1.3.32
 // |------------------------------------------------------
 // |------------------------------------------------------
 
-$_gridle-version : "1.3.29";
+$_gridle-version : "1.3.32";
 
 
 

data/stylesheets/gridle/_mixins.scss

@@ -4,6 +4,92 @@
 // |------------------------------------------------------
 // |------------------------------------------------------
 
+// Helper to apply multiple config for a certain state with one mixin
+@mixin gridle_set(
+	$settings,
+	$state : default
+) {
+	
+	// loop on each settings
+	@each $settingName, $settingValue in $settings
+	{
+		$sn : unquote($settingName);
+		$sv : $settingValue;
+
+		// check if setting name is a state :
+		@if _gridle_has_state($sn) {
+			// process the state
+			@include gridle_set($sv, $sn);
+		} @else {
+			@if $sn == container {
+				@include gridle_container($state);
+			} @else if $sn == grid {
+				@include gridle($sv, $state);
+			} @else if $sn == push {
+				@include gridle_push($sv, $state);
+			} @else if $sn == pull {
+				@include gridle_pull($sv, $state);
+			} @else if $sn == prefix {
+				@include gridle_prefix($sv, $state);
+			} @else if $sn == suffix {
+				@include gridle_suffix($sv, $state);
+			} @else if $sn == pull {
+				@include gridle_pull($sv, $state);
+			} @else if $sn == clear_each {
+				@include gridle_clear_each(nth($sv,1), nth($sv,2), $state);
+			} @else if $sn == centered {
+				@include gridle_centered($state);
+			} @else if $sn == parent {
+				@include gridle_parent($state);
+			} @else if $sn == vertical_align {
+				@include gridle_vertical_align($sv, $state);
+			} @else if $sn == hide {
+				@if $sv == true {
+					@include gridle_hide($state);
+				} @else {
+					@include gridle_show($state);
+				}
+			} @else if $sn == show {
+				@if $sv == true {
+					@include gridle_show($state);
+				} @else {
+					@include gridle_hide($state);
+				}
+			} @else if $sn == visible {
+				@if $sv == true {
+					@include gridle_visible($state);
+				} @else {
+					@include gridle_not_visible($state);
+				}
+			} @else if $sn == not_visible {
+				@if $sv == true {
+					@include gridle_not_visible($state);
+				} @else {
+					@include gridle_visible($state);
+				}
+			} @else if $sn == show_inline {
+				@if $sv == true {
+					@include gridle_show_inline($state);
+				} @else {
+					@include gridle_hide($state);
+				}
+			} @else if $sn == float {
+				@include gridle_float($sv, $state);
+			} @else if $sn == clear {
+				@include gridle_clear($sv, $state);
+			} @else if $sn == no_gutter
+				or $sn == no_margin {
+				@include gridle_no_gutter($sv, $state);
+			} @else if $sn == gutter
+				or $sn == margin {
+				@include gridle_gutter($sv, $state);
+			} @else {
+				// we do nothing
+			}
+		}
+	}
+}
+
 // Responsive helpers mixins :
 @mixin gridle_state(
 	$states,

data/stylesheets/gridle/_settings-mixins.scss

@@ -29,7 +29,7 @@
 		generate-prefix-classes : true,
 		generate-suffix-classes : true,
 		generate-helpers-classes : true
-	), $settings);
+	), $settings) !global;
 
 	// register default state :
 	@include gridle_register_state(default, $_gridle-settings);
@@ -48,7 +48,7 @@
 	$settings : map-set($settings, name, $name);
 
 	// add state in maps :
-	$_gridle_states : map-set($_gridle_states, $name, $settings);
+	$_gridle_states : map-set($_gridle_states, $name, $settings) !global;
 }
 
 
@@ -66,7 +66,7 @@
 	);
 
 	// append to map :
-	$_gridle_clear_classes : map-set($_gridle_clear_classes, $count, $classMap);
+	$_gridle_clear_classes : map-set($_gridle_clear_classes, $count, $classMap) !global;
 }
 
 
@@ -82,7 +82,7 @@
 	$col : _gridle_create_column($name, $columns, $context);
 
 	// add column in maps :
-	$_gridle_columns : map-set($_gridle_columns, $name, $col);
+	$_gridle_columns : map-set($_gridle_columns, $name, $col) !global;
 }
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gridle
 version: !ruby/object:Gem::Version
-  version: 1.3.29
+  version: 1.3.32
 platform: ruby
 authors:
 - Olivier Bossel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass