gridle 2.0.42 → 2.0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a691251acdb9b9299be8b799d9a83d8d581183a0
-  data.tar.gz: b3a4fada10916e5b8de12c521423051a0193d50b
+  metadata.gz: 6d15976dcb11f6ba0b8209131ddcc1564d265348
+  data.tar.gz: e486684f36314ff5bc9245e6805278282c161a0b
 SHA512:
-  metadata.gz: 7ecaed447b4cd802f0bddf7a91099f03e20b20e904339a7bef70fc0448378b513c2231ff263bfdc78b69d02639cdf7d0fac1f233ecf7e5df0805fd905f80506d
-  data.tar.gz: 01fe0488f69f75e37e8c4278054a5518611d48816cbed819995c4ec2ec4a3ad1cb3a709bc2b5ad86a4bc72f259bd6f3db8d621a9cdfdcc93074c1d329c5aa0d3
+  metadata.gz: 0fd4cdd19537548955ed520ad14101e038dfe07f34db5dd28f0af5b9d1bb80f3e46d59e158a5235e2923720b23e9a5fef846865584ad6fee20f75c6721b9f98a
+  data.tar.gz: 1127503bd6f058ac46dc9ee01ab60455fb38af7bdbd056d1fa287e59a9125930e9f838c64ff302f0d932616a806d1c90751edfe681f4a391b3f6f80bebb3ca03

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 = "2.0.42"
+  VERSION = "2.0.43"
   DATE = "2015-11-03"
 end
 

data/stylesheets/gridle/_default-states.scss

@@ -4,32 +4,34 @@
 // |------------------------------------------------------
 // |------------------------------------------------------
 
-// retina
-@include gridle_register_state("retina", (
-	query : "(-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi), (min-resolution: 2dppx)",
-	classes : false
-) );
+@if $gridle-default-states {
+	// retina
+	@include gridle_register_state("retina", (
+		query : "(-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi), (min-resolution: 2dppx)",
+		classes : false
+	) );
 
-// tv
-@include gridle_register_state("tv", (
-	query : "only tv",
-	classes : false
-) );
+	// tv
+	@include gridle_register_state("tv", (
+		query : "only tv",
+		classes : false
+	) );
 
-// print
-@include gridle_register_state("print", (
-	query : "only print",
-	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
-) );
+	// 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
-) );
+	// landscape
+	@include gridle_register_state("landscape", (
+		query : "only screen and (orientation: landscape)",
+		classes : false
+	) );
+}

data/stylesheets/gridle/_driver-default.scss

@@ -175,6 +175,10 @@
 				$context : map-get($column, context);
 				$columns : map-get($column, columns);
 			} @else if type-of($columns) == number {
+				// check if we have a ratio
+				@if $columns < 1 {
+					$columns : $context / 100 * ($columns * 100);
+				}
 				$columns : $columns / $name-multiplicator;
 			} @else {
 				@error "the column #{$columns} does not exist...";

data/stylesheets/gridle/_driver-flex.scss

@@ -156,6 +156,10 @@
 				$context : map-get($column, context);
 				$columns : map-get($column, columns);
 			} @else if type-of($columns) == number {
+				// check if we have a ratio
+				@if $columns < 1 {
+					$columns : $context / 100 * ($columns * 100);
+				}
 				$columns : $columns / $name-multiplicator;
 			} @else {
 				@error "the column #{$columns} does not exist...";

data/stylesheets/gridle/_generate-mixins.scss

@@ -544,13 +544,16 @@ $_gridle_generateOnlyOnce : true; // keep track of generate once classes
 	// make nested grids working automatically
 	@if _gridle_need_to_generate(col, $package) or _gridle_need_to_generate(row, $package) {
 		@each $stateName, $state in gridle_get_states() {
-			$gutter-left : gridle_get_state_var(gutter-left, $state);
-			$gutter-right : gridle_get_state_var(gutter-right, $state);
-			@include _gridle_state($stateName, false) {
-				[class*="#{str-slice(_gridle_classname(grid),2)}"] > [class*="#{str-slice(_gridle_classname(row),2)}"],
-				[class*="#{str-slice(_gridle_classname(grid),2)}"] > [class*="#{str-slice(_gridle_classname(col),2)}"] {
-					margin-left: -#{$gutter-left};
-					margin-right: -#{$gutter-right};
+			$classes : gridle_get_state_var(classes, $state);
+			@if $classes {
+				$gutter-left : gridle_get_state_var(gutter-left, $state);
+				$gutter-right : gridle_get_state_var(gutter-right, $state);
+				@include _gridle_state($stateName, false) {
+					[class*="#{str-slice(_gridle_classname(grid),2)}"] > [class*="#{str-slice(_gridle_classname(row),2)}"],
+					[class*="#{str-slice(_gridle_classname(grid),2)}"] > [class*="#{str-slice(_gridle_classname(col),2)}"] {
+						margin-left: -#{$gutter-left};
+						margin-right: -#{$gutter-right};
+					}
 				}
 			}
 		}

data/stylesheets/gridle/_init.scss

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

data/stylesheets/gridle/_settings.scss

@@ -5,6 +5,7 @@
 // |------------------------------------------------------
 
 $gridle-generate-json-settings 			: true !default;
+$gridle-default-states 					: false !default; // register or not the states tv, print, retina, etc...
 $_gridle-packages : (
 	container 							: (
 		classname 							: ('container','@','%state'),

metadata

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