sugarcss 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a0d9bafb647b37300914c53cd6b1c818cadab8c
-  data.tar.gz: fe240a9dbce7dc1c99eac6275edcce94ae7d148d
+  metadata.gz: ccbb127713e013d6edcbe95d066b3b979b75ea24
+  data.tar.gz: e9153fd1d97e3a2c36cd725b4c4cfcee738cdbbb
 SHA512:
-  metadata.gz: 114ce415ff8142dc36d4623b240964031eb3597d5dce6a17aa85f75630ddbd0457b2a3e1a599a557b26aeea6295eacc961f14d53ce95b62921ce902ac56e7a58
-  data.tar.gz: 5539d4ec728cd50cdd568b39fa657650f3fc7e174141b42af650734480e715db7ea6cb60d1ec1c9728279f153fc75a5f1fb4290f4ceb53b8a31ec40682aa6eed
+  metadata.gz: 00d993652cb4dda3d82448a50b9d325e850b39be7e901a9a808ed4618e311c31e6a8c8d40be0d319d8c29436444bd69c30b2a7002504577deea3d879de7aa063
+  data.tar.gz: b8fd8afee7c0cc82b07814941a1b3bca144943e2695b42522f7522ffa2ec19b58d65e67aa4263e8c1f53ecfc3ee9fb2af6d2dd27b15ac663f7af743c40ad62da

data/lib/sugarcss.rb

@@ -17,8 +17,8 @@ Compass::Frameworks.register('sugarcss', :path => extension_path)
 #    a prerelease version
 #  Date is in the form of YYYY-MM-DD
 module Extension
-  VERSION = "1.0.1"
-  DATE = "2015-11-23"
+  VERSION = "1.0.2"
+  DATE = "2016-01-13"
 end
 
 # This is where any custom SassScript should be placed. The functions will be  

data/stylesheets/sugar/_animations.scss

@@ -10,17 +10,17 @@
 ) {
 	// loop on animations
 	$anims : ();
-	$current_delay : 0;
-	$current_duration : 0;
-	$previous_duration : 0;
+	$current_delay : 0s;
+	$current_duration : 0s;
+	$previous_duration : 0s;
 	@each $animation in $animations {
 		$animation : _sugar-parse-properties($animation, (
 			iteration : 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 infinite initial inherit,
 			direction : normal reverse alternate alternate-reverse initial inherit,
 			fill-mode : none forwards backwards both initial inherit,
 			name : string,
-			duration : number,
-			delay : number,
+			duration : second,
+			delay : second,
 			ease : string,
 			parallel : true
 		), (
@@ -33,6 +33,7 @@
 			fill-mode : fm,
 			parallel : p
 		));
+
 		$name : map-get-or($animation, name);
 		$duration : map-get-or($animation, duration, 1s);
 		$delay : map-get-or($animation, delay, 0s);

data/stylesheets/sugar/_functions.scss

@@ -99,7 +99,12 @@ $_s_nested_properties_depth : ();
 			@if $in_keywords {
 
 				// check explicit values
-				@if type-of($in_keywords) == list {
+				@if type-of($in_keywords) == string {
+					// check the type
+					@if s-is($value, $in_keywords) {
+						$new-map : map-set($new-map, $prop, $value);
+					}
+				} @else if type-of($in_keywords) == list {
 					// check if the passed value exist in possible values
 					@if type-of($value) == list and index($in_keywords, length) {
 						$new-map : map-set($new-map, $prop, $value);
@@ -108,11 +113,6 @@ $_s_nested_properties_depth : ();
 					} @else if index($in_keywords, $value) {
 						$new-map : map-set($new-map, $prop, $value);
 					}
-				} @else if type-of($in_keywords) == string {
-					// check the type
-					@if s-is($value, $in_keywords) {
-						$new-map : map-set($new-map, $prop, $value);
-					}
 				} @else {
 					// we do nothing but adding the value like this
 					$new-map : map-set($new-map, $prop, $value);
@@ -202,44 +202,28 @@ $_s_nested_properties_depth : ();
 					$found : false;
 					@each $name, $type in $keywords {
 						@if $found == false {
-							@if $type == url {
-								@if s-is($prop, url) {
-									$map : map-set($map, $name, $prop);
-									// remove the item from keywords
-									$keywords : map-remove($keywords, $name);
-									// stop searching
-									$found : true;
+							@if s-is($type, list) and index($type, $prop) {
+								$keywords-v : nth($type, index($type, $prop));
+								$ok : true;
+								@if s-is($prop, number) and index($type, length) {
+									$ok : true;
+								} @else if s-is($prop, number) and unit($prop) != unit($keywords-v) {
+									$ok : false;
 								}
-							} @else if $type == number or $type == color or $type == string or $type == list or $type == map {
-								@if type-of($prop) == $type {
-									$map : map-set($map, $name, $prop);
-									// remove the item from keywords
-									$keywords : map-remove($keywords, $name);
-									// stop searching
-									$found : true;
-								}
-							} @else if $type == degree {
-								@if s-is($prop, degree) {
-									$map : map-set($map, $name, $prop);
-									// remove the item from keywords
-									$keywords : map-remove($keywords, $name);
-									// stop searching
-									$found : true;
-								}
-							} @else {
-								@if type-of($prop) == list and index($type, length) {
-									$map : map-set($map, $name, $prop);
-									// remove the item from keywords
-									$keywords : map-remove($keywords, $name);
-									// stop searching
-									$found : true;
-								} @else if index($type, $prop) {
+
+								@if $ok {
 									$map : map-set($map, $name, $prop);
 									// remove the item from keywords
 									$keywords : map-remove($keywords, $name);
 									// stop searching
 									$found : true;
 								}
+							} @else if s-is($type, string) and s-is($prop, $type) {
+								$map : map-set($map, $name, $prop);
+								// remove the item from keywords
+								$keywords : map-remove($keywords, $name);
+								// stop searching
+								$found : true;
 							}
 						}
 					}
@@ -304,6 +288,8 @@ $_s_nested_properties_depth : ();
 		@return type-of($value) == number and not unitless($value) and unit($value) == in;
 	} @else if $type == pc {
 		@return type-of($value) == number and not unitless($value) and unit($value) == pc;
+	} @else if $type == s or $type == second {
+		@return type-of($value) == number and not unitless($value) and unit($value) == s;
 	} @else if $type == boolean or $type == bool {
 		@return _is-boolean($value);
 	} @else if $type == function {