gridle 1.3.33 → 1.3.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52aca5b3b3a820e74b1e18b2a201989474353153
-  data.tar.gz: cbd70f35f49c589ab7bb82bacf11363b8935f163
+  metadata.gz: 0c5a36c9fa41af697b19cd1aff401fb5ada19ab8
+  data.tar.gz: 96a7e6e48adc58689efa3f0746d7260647a1ee4b
 SHA512:
-  metadata.gz: 16b9a12073dc1235ed9827ef4dd151731c52195793155db25a608f947d4318e6b5ba7ea7246db8f41ddc42d7e9d655c4a4f454121b57e5a98066b190142a7ccb
-  data.tar.gz: 960d12e1ddcf52aaa9b9fa3d42ab4eb0e990adc5b320fde9bc14366c5817b428b80ffcad03ae63ace582ed71e6e43dd6da8d6c707a96d1b20843d0cc470f05dd
+  metadata.gz: 9893c0c849a4731d464bca731496e4aee8807e3f9df9eb85f0d83477d6a6d6265bfea30e571d1e67db9af7e3cadc285970a15896c8ad490885b112faa7434cc9
+  data.tar.gz: b7d5f9d76fef43c30af08700633fe036411622c309a14d837e7d56e0f017a3ba7c47f5eb8e34d98b6cb76e60623b9ed8af52d655b3afc124af456fa31d9e9c31

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.33"
-  DATE = "2014-10-06"
+  VERSION = "1.3.35"
+  DATE = "2015-01-06"
 end
 
 # This is where any custom SassScript should be placed. The functions will be  

data/stylesheets/gridle/_common-mixins.scss

@@ -9,7 +9,7 @@
 ) {
 	@extend %gridle-simple-clearfix;
 	@extend %gridle-container-common;
-	// debug part :
+	// debug part
 	$debug : _gridle_get_var_value(debug, $state);
 	@if ($debug == true) {
 		#{$gridle-debug-selector} {
@@ -17,31 +17,50 @@
 		}
 	}
 }
+$_gridle-already-generated : ();
 @mixin _gridle_grid_common() {
 	@extend %gridle-grid-common;
-	
+
+	// default values
+	$default-gutter-width : _gridle_get_var_value(gutter-width, default);
+	$default-direction : _gridle_get_var_value(direction, default);
+
 	// loop on each states :
 	@each $stateName, $state in $_gridle-states
 	{
-		// vars :
+		// selector key to be used in map
+		$key : "#{$stateName} #{&}";
+
+		// check if already generated classes
+		$already-generated : map-has-key($_gridle-already-generated, $key);
+
+		// 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
+
+		@if $already-generated != true and $classes and ( ($default-direction != $direction or $default-gutter-width != $gutter-width) or $stateName == default)
 		{
+			// set that we have already generated css for this selector
+			$_gridle-already-generated : map-set($_gridle-already-generated, $key, true) !global;
+			
+			// generate the css for this element
 			@include gridle_state($state) {
-				@if $direction == rtl {
-					float:right;
-					direction:rtl;
-				} @else {
-					float:left;
-					direction:ltr;
+				@if $direction != $default-direction or $stateName == default {
+					// content : "#{$key}";
+					@if $direction == rtl {
+						float:right;
+						direction:rtl;
+					} @else {
+						float:left;
+						direction:ltr;
+					}
+				}
+				@if $gutter-width != $default-gutter-width or $stateName == default {
+					padding-left:$gutter-width/2;
+					padding-right:$gutter-width/2;
 				}
-
-				padding-left:$gutter-width/2;
-				padding-right:$gutter-width/2;
 			}
 			
 			@if $debug == true {

data/stylesheets/gridle/_functions.scss

@@ -4,6 +4,41 @@
 // |------------------------------------------------------
 // |------------------------------------------------------
 
+/**
+ * Str replace
+ *
+ * @param {string}  $string    String that you want to replace
+ * @param {string}  $substr    String that is to be replaced by `$newsubstr`
+ * @param {string}  $newsubstr String that replaces `$substr`
+ * @param {number*} $all       Flag for replaceing all (1+) or not (0)
+ * @return {string}
+ */
+@function str-replace($string, $substr, $newsubstr, $all: 0) {
+	$position-found: str-index($string, $substr);
+	$processed: ();
+
+	@while ($position-found and $position-found > 0) {
+		$length-substr: str-length($substr);
+		$processed: append($processed, str-slice($string, 0, $position-found - 1));
+		$processed: append($processed, $newsubstr);
+		$string: str-slice($string, $position-found + $length-substr);
+
+		$position-found: 0;
+
+		@if ($all > 0) {
+			$position-found: str-index($string, $substr);
+		}
+	}
+
+	$processed: append($processed, $string);
+	$string: "";
+
+	@each $s in $processed {
+		$string: #{$string}#{$s};
+	}
+
+	@return $string;
+}
 
 /**
  * Map set
@@ -43,14 +78,14 @@
 @function _gridle_get_state(
 	$stateMap-or-stateName
 ) {
-	// check if has a state named like this :
+	// 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)))
 	{
 		@return map-get($_gridle_states, unquote($stateMap-or-stateName));
 	} 
 
-	// nothing finded, so return the default state :
+	// a map is passed, so it's a state himself
 	@if $stateMap-or-stateName
 		and type-of($stateMap-or-stateName) == map
 	{
@@ -63,7 +98,7 @@
 		@return map-get($_gridle_states, default);
 	}
 
-	// nothing finded, return the default state :
+	// nothing finded, return the default state
 	@return $_gridle-settings;
 }
 

data/stylesheets/gridle/_gridle.scss

@@ -29,13 +29,13 @@
 // |------------------------------------------------------
 // |------------------------------------------------------
 // @created 	25.03.13
-// @updated 	06.10.14
+// @updated 	06.01.15
 // @author 	Olivier Bossel <olivier.bossel@gmail.com>
-// @version 	1.3.33
+// @version 	1.3.34
 // |------------------------------------------------------
 // |------------------------------------------------------
 
-$_gridle-version : "1.3.33";
+$_gridle-version : "1.3.34";
 
 
 

data/stylesheets/gridle/_mixins.scss

@@ -183,34 +183,58 @@
 // Set the width of the specified grid column :
 @mixin gridle(
 	$columns,
+	$state-or-context : default,
 	$state : default
 ) {
+	// manage state and context :
+	$context : null;
+	@if type-of($state-or-context) == number {
+		$context : $state-or-context;
+	} @else {
+		$state : $state-or-context;
+	}
+
 	// common :
 	@include _gridle_grid_common();
 	// check if need media query :
 	@if $state {
 		@include gridle_state($state) {
-			@include _gridle($columns, $state);
+			@include _gridle($columns, $state, $context);
 		}
 	} @else {
-		@include _gridle($columns, $state);
+		@include _gridle($columns, $state, $context);
 	}
 }
 @mixin _gridle(
 	$columns,
-	$state : default
+	$state : default,
+	$context : null
 ) {
 	// vars :
 	$name : _gridle_get_var_value(name, $state);
-	$context : _gridle_get_var_value(context, $state);
+	@if type-of($context) != number {
+		$context : _gridle_get_var_value(context, $state);
+	}
 	$name-multiplicator : _gridle_get_var_value(name-multiplicator, $state);
 	$gutter-width : _gridle_get_var_value(gutter-width, $state);
 	$ie7-support : _gridle_get_var_value(ie7-support, $state);
 	$debug : _gridle_get_var_value(debug, $state);
 	$debug-show-class-names : _gridle_get_var_value(debug-show-class-names, $state);
 
+	// manage columns
+	@if type-of($columns) != number and map-has-key($_gridle_columns, $columns) {
+		// the columns is a saved one, get the context and column value
+		$column : map-get($_gridle_columns, $columns);
+		$context : map-get($column, context);
+		$columns : map-get($column, columns);
+	} @else if type-of($columns) == number {
+		$columns : $columns / $name-multiplicator;
+	} @else {
+		@error "the column #{$columns} does not exist...";
+	}
+
 	// vars :
-	$width : percentage(1 / $context * ($columns / $name-multiplicator) );
+	$width : percentage(1 / $context * $columns);
 
 	// set value :
 	width:$width;
@@ -246,27 +270,39 @@
 // Push the element of the count of column wanted
 @mixin gridle_push(
 	$columns,
+	$state-or-context : default,
 	$state : default
 ) {
+	// manage state and context
+	$context : null;
+	@if type-of($state-or-context) == number {
+		$context : $state-or-context;
+	} @else {
+		$state : $state-or-context;
+	}
+
 	// common :
 	@include _gridle_push_common($state);
 
 	// check if need media query :
 	@if $state {
 		@include gridle_state($state) {
-			@include _gridle_push($columns,$state);
+			@include _gridle_push($columns, $state, $context);
 		}
 	} @else {
-		@include _gridle_push($columns,$state);
+		@include _gridle_push($columns, $state, $context);
 	}
 }
 @mixin _gridle_push(
 	$columns,
-	$state : default
+	$state : default,
+	$context : null
 ) {
 	// variables :
 	$name : _gridle_get_var_value(name, $state);
-	$context : _gridle_get_var_value(context, $state);
+	@if type-of($context) != number {
+		$context : _gridle_get_var_value(context, $state);
+	}
 	$direction : _gridle_get_var_value(direction, $state);
 	$name-multiplicator : _gridle_get_var_value(name-multiplicator, $state);
 	$debug : _gridle_get_var_value(debug, $state);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gridle
 version: !ruby/object:Gem::Version
-  version: 1.3.33
+  version: 1.3.35
 platform: ruby
 authors:
 - Olivier Bossel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass