gridle 1.0.9.3 → 1.0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5555850d30c1d4dd3e269fddad75eabfe43f25b7
-  data.tar.gz: 5931f964befad51bcef61f9fae1d18cb077ce170
+  metadata.gz: aa631d4f28fa885d928431ebe9eb43d6e11186a6
+  data.tar.gz: 9f337dce772c5d961aefc77129ba17956b2d16a2
 SHA512:
-  metadata.gz: 248d729e8f88c2265e48072e3a5d95765035f587fb91b09193e75abb0d56f3408aa8ff67274b74fc09877b3aced4cfe592d4b3abde6f637b679bfe56497614d3
-  data.tar.gz: 2cb83bb5b226fdb96744f9de4caafa0c32a442960c0b0976705809129cc08834927ec3e43dc243e5af78d4a3dec4511f782ab6fb5f829229071672093c041420
+  metadata.gz: dced0af914341f4d1fa38f9d83e10d396c448607269436a3a35e6214b6268f395dff9c0248f911ad20849a7d24b63e0c3fc3ead411e050fc33c72e1108cb8d2a
+  data.tar.gz: d7ddcecd023925d808cbcfca8bd2a90602ae042a6c35d5e3615800e420b011dacaa8759f5ac855527978a1b9b160398f41f3fee4481678f629eb00db2bd26271

data/lib/gridle.rb

@@ -17,7 +17,7 @@ Compass::Frameworks.register('gridle', :path => extension_path)
 #    a prerelease version
 #  Date is in the form of YYYY-MM-DD
 module Extension
-  VERSION = "1.0.9.3"
+  VERSION = "1.0.9.4"
   DATE = "2013-11-20"
 end
 

data/stylesheets/gridle/_gridle.scss

@@ -209,15 +209,11 @@ $_gridle-state-15-classes 			: true !default;
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
-
-	@extend %gridle-clearfix;
 }
 %gridle-parent-common {
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
-
-	@extend %gridle-clearfix;
 }
 %gridle-container-debug-common {
 	background-color:#f5f5f5;
@@ -277,6 +273,7 @@ $_gridle-state-15-classes 			: true !default;
 
 // Common css that cannot be extended cause of variables :
 @mixin _gridle_container_common() {
+	@extend %gridle-clearfix;
 	@extend %gridle-container-common;
 	// debug part :
 	@if ($gridle-debug == true) {
@@ -316,6 +313,7 @@ $_gridle-state-15-classes 			: true !default;
 	}
 }
 @mixin _gridle_parent_common() {
+	@extend %gridle-clearfix;
 	@extend %gridle-parent-common;
 }
 @mixin _gridle_push_common() {
@@ -1407,9 +1405,6 @@ $_gridle-state-15-classes 			: true !default;
 	#{_gridle_prefixed_class("centered#{$media}")} {
 		@include gridle_centered(null);
 	}
-	#{_gridle_prefixed_class("parent#{$media}")} {
-		@include gridle_parent(null);
-	}
 
 	@if $gridle-debug {
 		// debug color classes :
@@ -1486,26 +1481,26 @@ $_gridle-state-15-classes 			: true !default;
 	@for $i from 0 through $gridle-columns-count {
 
 		#{_gridle_prefixed_class("grid-#{$i*$gridle-name-multiplicator}")} {
-			@include _gridle($i);
+			@include gridle($i);
 		}
 		@if $gridle-generate-push-classes == true {
 			#{_gridle_prefixed_class("push-#{$i*$gridle-name-multiplicator}")} {
-				@include _gridle_push($i);
+				@include gridle_push($i);
 			}
 		}
 		@if $gridle-generate-pull-classes == true {
 			#{_gridle_prefixed_class("pull-#{$i*$gridle-name-multiplicator}")} {
-				@include _gridle_pull($i);
+				@include gridle_pull($i);
 			}
 		}
 		@if $gridle-generate-prefix-classes == true {
 			#{_gridle_prefixed_class("prefix-#{$i*$gridle-name-multiplicator}")} {
-				@include _gridle_prefix($i);
+				@include gridle_prefix($i);
 			}
 		}
 		@if $gridle-generate-suffix-classes == true {
 			#{_gridle_prefixed_class("suffix-#{$i*$gridle-name-multiplicator}")} {
-				@include _gridle_suffix($i);
+				@include gridle_suffix($i);
 			}
 		}
 	}
@@ -1513,71 +1508,12 @@ $_gridle-state-15-classes 			: true !default;
 	// helpers classes :
 	@if $gridle-generate-helpers-classes == true {
 		@include _gridle_generate_helper_classes();
-	}
-
-	// generate all selector for extends :
-	$push-common-selector : ();
-	$pull-common-selector : ();
-	$prefix-common-selector : ();
-	$suffix-common-selector : ();
-	$common-selector : ();
-	@for $i from 0 through $gridle-columns-count {
-		$push-common-selector : $push-common-selector, unquote("#{_gridle_prefixed_class("push-#{$i*$gridle-name-multiplicator}")}");
-		$pull-common-selector : $pull-common-selector, unquote("#{_gridle_prefixed_class("pull-#{$i*$gridle-name-multiplicator}")}");
-		$prefix-common-selector : $prefix-common-selector, unquote("#{_gridle_prefixed_class("prefix-#{$i*$gridle-name-multiplicator}")}");
-		$suffix-common-selector : $suffix-common-selector, unquote("#{_gridle_prefixed_class("suffix-#{$i*$gridle-name-multiplicator}")}");
-		$common-selector : $common-selector, unquote("#{_gridle_prefixed_class("grid-#{$i*$gridle-name-multiplicator}")}");
-
-		// generate all classes for media queries :
-		@for $j from 1 through 15 {
-			// setup vars :
-			$media : _gridle_get_media_query_vars($j,"name");
-			$min-width : _gridle_get_media_query_vars($j,"min-width");
-			$max-width : _gridle_get_media_query_vars($j,"max-width");
-			$classes : _gridle_get_media_query_vars($j,"classes");
-			@if $min-width == null { $min-width : 0; }
-			@if $max-width == null { $max-width : 999999; }
-
-			// generate classes :	
-			@if $media != null and $classes == true {
-				
-				$push-common-selector : $push-common-selector, unquote("#{_gridle_prefixed_class("push-#{$media}-#{$i*$gridle-name-multiplicator}")}");
-				$pull-common-selector : $pull-common-selector, unquote("#{_gridle_prefixed_class("pull-#{$media}-#{$i*$gridle-name-multiplicator}")}");
-				$prefix-common-selector : $prefix-common-selector, unquote("#{_gridle_prefixed_class("prefix-#{$media}-#{$i*$gridle-name-multiplicator}")}");
-				$suffix-common-selector : $suffix-common-selector, unquote("#{_gridle_prefixed_class("suffix-#{$media}-#{$i*$gridle-name-multiplicator}")}");
-				$common-selector : $common-selector, unquote("#{_gridle_prefixed_class("grid-#{$media}-#{$i*$gridle-name-multiplicator}")}");
-			}
-		}
 
-		// generate all classes for usefull states :
-		@if $gridle-generate-useful-states-classes != null {
-			@each $state in $gridle-generate-useful-states-classes {
-				$push-common-selector : $push-common-selector, unquote("#{_gridle_prefixed_class("push-#{$state}-#{$i*$gridle-name-multiplicator}")}");
-				$pull-common-selector : $pull-common-selector, unquote("#{_gridle_prefixed_class("pull-#{$state}-#{$i*$gridle-name-multiplicator}")}");
-				$prefix-common-selector : $prefix-common-selector, unquote("#{_gridle_prefixed_class("prefix-#{$state}-#{$i*$gridle-name-multiplicator}")}");
-				$suffix-common-selector : $suffix-common-selector, unquote("#{_gridle_prefixed_class("suffix-#{$state}-#{$i*$gridle-name-multiplicator}")}");
-				$common-selector : $common-selector, unquote("#{_gridle_prefixed_class("grid-#{$state}-#{$i*$gridle-name-multiplicator}")}");
-			}
+		#{_gridle_prefixed_class("parent")} {
+			@include gridle_parent();
 		}
 	}
 
-	// extends :
-	#{$push-common-selector} {
-		@include _gridle_push_common();
-	}
-	#{$pull-common-selector} {
-		@include _gridle_pull_common();
-	}
-	#{$prefix-common-selector} {
-		@include _gridle_prefix_common();
-	}
-	#{$suffix-common-selector} {
-		@include _gridle_suffix_common();
-	}
-	#{$common-selector} {
-		@include _gridle_grid_common();
-	}
-
 	// generate all classes for differents media queries :
 	@for $i from 1 through 15 {
 		// setup vars :
@@ -1587,7 +1523,7 @@ $_gridle-state-15-classes 			: true !default;
 		$classes : _gridle_get_media_query_vars($i,"classes");
 
 		// generate all media queries grid classes :
-		@if $media != null and $classes == true {
+		@if $media and $classes == true {
 
 			// manage body query :
 			$body-query : _get_media_query_for_state($media);
@@ -1598,42 +1534,79 @@ $_gridle-state-15-classes 			: true !default;
 					$gridle-settings-states : "#{$gridle-settings-states},\"#{$media}\":\"#{$body-query}\"";
 				}
 			}
+			
+			// extend common css :
+			@for $j from 0 through $gridle-columns-count {
+	
+				// extend classes :
+				#{_gridle_prefixed_class("grid-#{$media}-#{$j*$gridle-name-multiplicator}")} {
+					@include _gridle_grid_common();
+				}
+				@if $gridle-generate-push-classes == true {
+					#{_gridle_prefixed_class("push-#{$media}-#{$j*$gridle-name-multiplicator}")} {
+						@include _gridle_push_common();
+					}
+				}
+				@if $gridle-generate-pull-classes == true {
+					#{_gridle_prefixed_class("pull-#{$media}-#{$j*$gridle-name-multiplicator}")} {
+						@include _gridle_pull_common();
+					}
+				}
+				@if $gridle-generate-prefix-classes == true {
+					#{_gridle_prefixed_class("prefix-#{$media}-#{$j*$gridle-name-multiplicator}")} {
+						@include _gridle_prefix_common();
+					}
+				}
+				@if $gridle-generate-suffix-classes == true {
+					#{_gridle_prefixed_class("suffix-#{$media}-#{$j*$gridle-name-multiplicator}")} {
+						@include _gridle_suffix_common();
+					}	
+				}
+
+			}
 
 			// generate all the classes :
 			@include gridle_state($media, null, $has-parent) {
 		
-				@for $j from 0 through $gridle-columns-count {
+				@for $k from 0 through $gridle-columns-count {
 		
-					#{_gridle_prefixed_class("grid-#{$media}-#{$j*$gridle-name-multiplicator}")} {
-						@include _gridle($j,$media);
+					#{_gridle_prefixed_class("grid-#{$media}-#{$k*$gridle-name-multiplicator}")} {
+						@include _gridle($k,$media);
 					}
 					@if $gridle-generate-push-classes == true {
-						#{_gridle_prefixed_class("push-#{$media}-#{$j*$gridle-name-multiplicator}")} {
-							@include _gridle_push($j,$media);
+						#{_gridle_prefixed_class("push-#{$media}-#{$k*$gridle-name-multiplicator}")} {
+							@include _gridle_push($k,$media);
 						}
 					}
 					@if $gridle-generate-pull-classes == true {
-						#{_gridle_prefixed_class("pull-#{$media}-#{$j*$gridle-name-multiplicator}")} {
-							@include _gridle_pull($j,$media);
+						#{_gridle_prefixed_class("pull-#{$media}-#{$k*$gridle-name-multiplicator}")} {
+							@include _gridle_pull($k,$media);
 						}
 					}
 					@if $gridle-generate-prefix-classes == true {
-						#{_gridle_prefixed_class("prefix-#{$media}-#{$j*$gridle-name-multiplicator}")} {
-							@include _gridle_prefix($j,$media);
+						#{_gridle_prefixed_class("prefix-#{$media}-#{$k*$gridle-name-multiplicator}")} {
+							@include _gridle_prefix($k,$media);
 						}
 					}
 					@if $gridle-generate-suffix-classes == true {
-						#{_gridle_prefixed_class("suffix-#{$media}-#{$j*$gridle-name-multiplicator}")} {
-							@include _gridle_suffix($j,$media);
+						#{_gridle_prefixed_class("suffix-#{$media}-#{$k*$gridle-name-multiplicator}")} {
+							@include _gridle_suffix($k,$media);
 						}	
 					}
 				}
 
-				// media queries helpers classes :
-				@if $gridle-generate-helpers-classes == true and $media != null {
+				// media queries helpers classes (that not contain extend css) :
+				@if $gridle-generate-helpers-classes == true and $media {
 					@include _gridle_generate_helper_classes($media);
 				}
 			}
+
+			// helpers that have extend in them (can not been in the @media) :
+			@if $gridle-generate-helpers-classes == true and $media {
+				#{_gridle_prefixed_class("parent-#{$media}")} {
+					@include gridle_parent($media);
+				}
+			}
 		}
 	}
 
@@ -1647,40 +1620,78 @@ $_gridle-state-15-classes 			: true !default;
 				$gridle-settings-states : "#{$gridle-settings-states},\"#{$state}\":\"#{$body-query}\"";
 			}
 
+			// extend common css :
+			@for $l from 0 through $gridle-columns-count {
+	
+				// extend classes :
+				#{_gridle_prefixed_class("grid-#{$state}-#{$l*$gridle-name-multiplicator}")} {
+					@include _gridle_grid_common();
+				}
+				@if $gridle-generate-push-classes == true {
+					#{_gridle_prefixed_class("push-#{$state}-#{$l*$gridle-name-multiplicator}")} {
+						@include _gridle_push_common();
+					}
+				}
+				@if $gridle-generate-pull-classes == true {
+					#{_gridle_prefixed_class("pull-#{$state}-#{$l*$gridle-name-multiplicator}")} {
+						@include _gridle_pull_common();
+					}
+				}
+				@if $gridle-generate-prefix-classes == true {
+					#{_gridle_prefixed_class("prefix-#{$state}-#{$l*$gridle-name-multiplicator}")} {
+						@include _gridle_prefix_common();
+					}
+				}
+				@if $gridle-generate-suffix-classes == true {
+					#{_gridle_prefixed_class("suffix-#{$state}-#{$l*$gridle-name-multiplicator}")} {
+						@include _gridle_suffix_common();
+					}	
+				}
+
+			}
+
 			// creating classes :
 			@include gridle_state($state, null, $has-parent) {
 
-				@for $k from 0 through $gridle-columns-count {
+				@for $m from 0 through $gridle-columns-count {
 			
-					#{_gridle_prefixed_class("grid-#{$state}-#{$k*$gridle-name-multiplicator}")} {
-						@include _gridle($k,$state);
+					#{_gridle_prefixed_class("grid-#{$state}-#{$m*$gridle-name-multiplicator}")} {
+						@include _gridle($m,$state);
 					}
 					@if $gridle-generate-push-classes == true {
-						#{_gridle_prefixed_class("push-#{$state}-#{$k*$gridle-name-multiplicator}")} {
-							@include _gridle_push($k,$state);
+						#{_gridle_prefixed_class("push-#{$state}-#{$m*$gridle-name-multiplicator}")} {
+							@include _gridle_push($m,$state);
 						}
 					}
 					@if $gridle-generate-pull-classes == true {
-						#{_gridle_prefixed_class("pull-#{$state}-#{$k*$gridle-name-multiplicator}")} {
-							@include _gridle_pull($k,$state);
+						#{_gridle_prefixed_class("pull-#{$state}-#{$m*$gridle-name-multiplicator}")} {
+							@include _gridle_pull($m,$state);
 						}
 					}
 					@if $gridle-generate-prefix-classes == true {
-						#{_gridle_prefixed_class("prefix-#{$state}-#{$k*$gridle-name-multiplicator}")} {
-							@include _gridle_prefix($k,$state);
+						#{_gridle_prefixed_class("prefix-#{$state}-#{$m*$gridle-name-multiplicator}")} {
+							@include _gridle_prefix($m,$state);
 						}
 					}
 					@if $gridle-generate-suffix-classes == true {
-						#{_gridle_prefixed_class("suffix-#{$state}-#{$k*$gridle-name-multiplicator}")} {
-							@include _gridle_suffix($k,$state);
+						#{_gridle_prefixed_class("suffix-#{$state}-#{$m*$gridle-name-multiplicator}")} {
+							@include _gridle_suffix($m,$state);
 						}	
 					}
 				}
 				
+				// media queries helpers classes (that not contain extend css) :
 				@if $gridle-generate-helpers-classes == true {
 					@include _gridle_generate_helper_classes($state);	
 				}
 			}
+
+			// helpers that have extend in them (can not been in the @media) :
+			@if $gridle-generate-helpers-classes == true {
+				#{_gridle_prefixed_class("parent-#{$state}")} {
+					@include gridle_parent($state);
+				}
+			}
 		}
 	}
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gridle
 version: !ruby/object:Gem::Version
-  version: 1.0.9.3
+  version: 1.0.9.4
 platform: ruby
 authors:
 - Olivier Bossel