gridle 2.0.43 → 2.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d15976dcb11f6ba0b8209131ddcc1564d265348
-  data.tar.gz: e486684f36314ff5bc9245e6805278282c161a0b
+  metadata.gz: c3fe405b2623f4db63f1ffaa0d1c71ba2a4c78c4
+  data.tar.gz: edfaf3e818bd31943f86aa500f83cee16d305326
 SHA512:
-  metadata.gz: 0fd4cdd19537548955ed520ad14101e038dfe07f34db5dd28f0af5b9d1bb80f3e46d59e158a5235e2923720b23e9a5fef846865584ad6fee20f75c6721b9f98a
-  data.tar.gz: 1127503bd6f058ac46dc9ee01ab60455fb38af7bdbd056d1fa287e59a9125930e9f838c64ff302f0d932616a806d1c90751edfe681f4a391b3f6f80bebb3ca03
+  metadata.gz: 3c19c81f62a2cf7a134af9794891e825b71c07b2b6f95b465af8a863a5010f349a8732b1e19214e42d1e534cb571da143e811890f86ce609a2f3e3fc1a368280
+  data.tar.gz: 507888ca1a0030edf8891ba4313a6e0618fa310c551737ecec34e0e61d38e0431208d1984a25702f61ceba20c4d4cbc36518c1341bebb6830eca44a874bfb5cb

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.43"
-  DATE = "2015-11-03"
+  VERSION = "2.0.44"
+  DATE = "2015-12-23"
 end
 
 # This is where any custom SassScript should be placed. The functions will be  

data/stylesheets/gridle/_driver-default.scss

@@ -27,13 +27,18 @@
 		margin-left: -#{gridle_get_state_var(gutter-left)};
 		margin-right: -#{gridle_get_state_var(gutter-right)};
 		// font-size:0; // to avoid problems with inline-block margins
+	
+		#{_gridle_get_generic_selector(no-gutter)} > & {
+			margin-left: 0 !important;
+			margin-right: 0 !important;
+		}
 
 		// do this only when not in generate phase
 		// mean that we use the mixin directly
 		@if _gridle_is_in_generate_phase() == false {
 			@each $stateName, $state in gridle_get_states() {
 				@include gridle_state($state) {	
-					& #{str-replace(#{&},".state-#{gridle_get_state_var(name, $state)}","")} {
+					& #{str-replace(unquote("#{&}"),".state-#{gridle_get_state_var(name, $state)}","")} {
 						margin-left: -#{gridle_get_state_var(gutter-left, $state)};
 						margin-right: -#{gridle_get_state_var(gutter-right, $state)};
 					}
@@ -353,7 +358,13 @@
 	$clearWhat : both
 ) {
 	@include _gridle_call(clear-each) {
-		> *:nth-child(#{$clearEach}n+1) {
+		$grid : map-get($_gridle-packages, grid);
+		$sel : map-get($grid, generic-selector);
+		@if not $sel {
+			$sel : _gridle_get_generic_selector(grid);
+		}
+
+		> #{$sel}:nth-of-type(#{$clearEach}n+1) {
 			clear : $clearWhat;
 		}
 	}

data/stylesheets/gridle/_driver-flex.scss

@@ -21,6 +21,12 @@
 		padding-right: 0 !important;
 		margin-left: -#{gridle_get_state_var(gutter-left)};
 		margin-right: -#{gridle_get_state_var(gutter-right)};
+	
+		// handle row in no-gutter
+		#{_gridle_get_generic_selector(no-gutter)} > & {
+			margin-left: 0 !important;
+			margin-right: 0 !important;
+		}
 
 		// do this only when not in generate phase
 		// mean that we use the mixin directly

data/stylesheets/gridle/_functions.scss

@@ -719,7 +719,7 @@
 	}
 
 	// return generated class :
-	@return $sel;
+	@return unquote($sel);
 }
 
 
@@ -798,10 +798,40 @@
 
 
 //
-// Check if is in generate mode
+// Get generic selector for a class
 //
-@function _gridle_is_in_generate_phase() {
-	@return $_gridle_is_in_generate_phase;
+@function _gridle_get_generic_selector(
+	$package
+) {
+	$p : map-get($_gridle-packages, $package);
+	$sel : map-get($p, generic-selector);
+	@if $sel {
+		@return unquote($sel);
+	}
+	$sel : map-get($p, classname);
+	$generic : "";
+	$end : false;
+	$i : 1;
+	@each $part in $sel {
+		@if not $end {
+			// 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};	
+				} @else {
+					$end : true;
+				}
+			} @else {
+				@if str-slice($part,1,1) != '%' {
+					$generic : #{$generic}#{$part};	
+				} @else {
+					$end : true;
+				}
+			}
+		}
+		$i : $i + 1;
+	}
+	@return unquote('[class*="#{$generic}"]');
 }
 
 
@@ -858,6 +888,9 @@
 					$values : true;
 					@if length($prop_values) > 0 {
 						$values : $prop_values;
+						@if length($prop_values) == 1 {
+							$values : nth($prop_values,1);
+						}
 						$prop_values : ();
 					}
 					$map : map-set($map, $prop_name, $values);	

data/stylesheets/gridle/_generate-mixins.scss

@@ -452,7 +452,7 @@ $_gridle_generateOnlyOnce : true; // keep track of generate once classes
 		@if $classes {
 
 			// debug
-			@debug("Generate classes for state #{$stateName}");
+			// @debug("Generate classes for state #{$stateName}");
 
 			// scope all the classes in a media query
 			@include gridle_state($state, false) {

data/stylesheets/gridle/_init.scss

@@ -1,9 +1,9 @@
 // |------------------------------------------------------
 // |------------------------------------------------------
 // @created 	25.03.13
-// @updated 	03.11.15
+// @updated 	23.12.15
 // @author 		Olivier Bossel <olivier.bossel@gmail.com>
-// @version 	2.0.43
+// @version 	2.0.44
 // |------------------------------------------------------
 // |------------------------------------------------------
 
@@ -16,7 +16,7 @@
 // |------------------------------------------------------
 // |------------------------------------------------------
 
-$_gridle-version : "2.0.43";
+$_gridle-version : "2.0.44";
 
 
 

data/stylesheets/gridle/_mixins.scss

@@ -290,7 +290,7 @@
 	// if is an existing gridle state
 	@if gridle_has_state($stateName) {
 		// extend the "at-root" version for the .state-{stateName} classes
-		@if $states-classes and str-index(#{&}, unquote('.state-#{$_gridle_current_stateName}')) {
+		@if $states-classes and str-index(unquote("#{&}"), unquote('.state-#{$_gridle_current_stateName}')) {
 			// @at-root (without: media) { // seems not needed here, cause issues with libsass
 				// @debug("%at-root-#{$_gridle_current_stateName}-#{$package}");
 				@extend %at-root-#{$_gridle_current_stateName}-#{$package} !optional;
@@ -438,8 +438,8 @@ $_gridle_applied_for : ();
 			}
 		} @else {
 			@if $key != null and str-index($key, gridle) and mixin-exists($key) {
-				$set-name : str-replace($key, "gridle_", "");
-				$set-name : str-replace($set-name, "_", "-", 1);
+				$set-name : str-replace("#{$key}", "gridle_", "");
+				$set-name : str-replace("#{$set-name}", "_", "-", 1);
 				@include _gridle_set((
 					$set-name : $value
 				));

data/stylesheets/gridle/_settings-mixins.scss

@@ -145,6 +145,22 @@
 }
 
 
+//
+// Set a generic selector
+//
+@mixin gridle_set_generic_selector(
+	$for,
+	$selector
+) {
+	// get the map
+	$map : map-get($_gridle-packages, $for);
+	// set the new classname
+	$map : map-set($map, generic-selector, $selector);
+	// set the classmap
+	$_gridle-packages : map-set($_gridle-packages, $for, $map) !global;
+}
+
+
 //
 // Extend a gridle class
 //

data/stylesheets/gridle/_settings.scss

@@ -113,6 +113,7 @@ $_gridle-packages : (
 	),
 	no-gutter 							: (
 		classname 							: ('no','-','gutter','-','%side','@','%state'),
+		generic-selector 					: '[class*="no-gutter"]',
 		package 							: helpers no-gutter
 	),
 	auto-height 						: (

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gridle
 version: !ruby/object:Gem::Version
-  version: 2.0.43
+  version: 2.0.44
 platform: ruby
 authors:
 - Olivier Bossel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2015-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: gridle
-rubygems_version: 2.3.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Gridle is a set of complete and simple settings, mixins and classes that