flint-gs 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea0073e3515246e3c814e48143e051115aa6acf3
-  data.tar.gz: 7b7a23b934e5438a093c42eee716b6a50d6fc5fe
+  metadata.gz: e7237e782b4c94642d2476f469a73f69bb2b8706
+  data.tar.gz: 711ed0e151e8e5bd31b9ec158eca87eebd1e8d6f
 SHA512:
-  metadata.gz: bacc7d66d3d0e733dfd1dc10e4b1bd45a7f7383225d759a56720886dadfb9bd9fff60182e87d143542248050bf0c4e7c2aa0a0a13e52dc40e7f2b143aa27bb54
-  data.tar.gz: 7195dc01e2d35c33bad0224075c6737b3ae7e116d54e14f1ad9fe7d5c34fd61994e637482de4ad9ecb8236a05419458d4449e034749256a52a13b0d195f5b6e1
+  metadata.gz: 9ac60c7a3e67f7fd08e39ee5f104acb6f46836767af8478941ec3b28772640dc51050987d258c399a7ab0fc99fc2914c4e4b7e075c4b0bdf0568f0b81010ec36
+  data.tar.gz: d67df883bb8d0bfed43c79ab2b1f860951640369e6c203a045c39705e351c38170d75f33735faf95fa49bfeb987f7d9f19cb6ca001e7d532c4065bd94d503f31

data/lib/flint.rb

@@ -5,8 +5,8 @@ Compass::Frameworks.register('flint', :path => extension_path)
 #  Version is a number. If a version contains alphas, it will be created as a prerelease version
 #  Date is in the form of YYYY-MM-DD
 module Flint
-  VERSION = "1.6.2"
-  DATE = "2014-07-03"
+  VERSION = "1.6.3"
+  DATE = "2014-07-08"
 end
 
 # Custom functions

data/stylesheets/flint/functions/_functions.scss

@@ -9,7 +9,6 @@
 @import "lib/map-fetch";
 @import "lib/get-value";
 @import "lib/get-index";
-@import "lib/get-substring";
 @import "lib/steal-key";
 @import "lib/steal-values";
 // Calculations
@@ -30,6 +29,7 @@
 @import "lib/remove";
 @import "lib/last";
 // String functions
+@import "lib/replace-substring";
 @import "lib/string-to-number";
 @import "lib/string-to-list";
 

data/stylesheets/flint/functions/lib/_calc-breakpoint.scss

@@ -1,12 +1,6 @@
 // Calculate from-to breakpoints
 // -------------------------------------------------------------------------------
-// @dependence `map-fetch()`
-// @dependence `get-value()`
-// @dependence `steal-key()`
-// @dependence `is-highest-breakpoint()`
-// @dependence `is-lowest-breakpoint()`
-// -------------------------------------------------------------------------------
-// @param $n [string] : how to calculate breakpoint 
+// @param $n [string] : how to calculate breakpoint
 // @param $key [string] : key of breakpoint
 // @param $i [number] : index of current breakpoint
 // -------------------------------------------------------------------------------
@@ -36,4 +30,4 @@
             @return get-value(steal-key(($i - 1)), "breakpoint");
         }
     }
-}
+}

data/stylesheets/flint/functions/lib/_calc-margin.scss

@@ -1,8 +1,5 @@
 // Calculate margin
 // -------------------------------------------------------------------------------
-// @dependence `get-value()`
-// @dependence `fluid-width()`
-// -------------------------------------------------------------------------------
 // @param $key [string] : key for lookup
 // @param $span [number] : span value of element
 // @param $context [number] : context value of element
@@ -29,4 +26,4 @@
 	} @else {
 		@return false;
 	}
-}
+}

data/stylesheets/flint/functions/lib/_calc-width.scss

@@ -1,8 +1,5 @@
 // Calculate width
 // -------------------------------------------------------------------------------
-// @dependence `get-value()`
-// @dependence `fluid-width()`
-// -------------------------------------------------------------------------------
 // @param $key [string] : key for lookup
 // @param $span [number] : span value of element
 // @param $context [number] : context value of element

data/stylesheets/flint/functions/lib/_get-index.scss

@@ -1,7 +1,5 @@
 // Gets the index of the passed key
 // -------------------------------------------------------------------------------
-// @dependence `steal-key()`
-// -------------------------------------------------------------------------------
 // @param $key [string] : breakpoint key
 // -------------------------------------------------------------------------------
 // @return [number]
@@ -12,4 +10,4 @@
 			@return $i;
 		}
 	}
-}
+}

data/stylesheets/flint/functions/lib/_get-instance-value.scss

@@ -1,7 +1,5 @@
 // Get single value from key in instance map based on $selector::$key
 // -------------------------------------------------------------------------------
-// @dependence `map-fetch()`
-// -------------------------------------------------------------------------------
 // @warning : all values @returned are strings and must be converted with `to-number()`
 // -------------------------------------------------------------------------------
 // @param $key [string] : key

data/stylesheets/flint/functions/lib/_get-value.scss

@@ -1,7 +1,5 @@
 // Get single value from key in instance map based on $selector::$key
 // -------------------------------------------------------------------------------
-// @dependence `map-fetch()`
-// -------------------------------------------------------------------------------
 // @param $key [string] : breakpoint key
 // @param $value [string] : key of value
 // -------------------------------------------------------------------------------

data/stylesheets/flint/functions/lib/_instance.scss

@@ -35,10 +35,10 @@
 			"output": (
 				"width": #{$outputWidth},
 				"margin-right": #{$outputMarginRight},
-				"margin-left": #{$outputMarginLeft},
-			),
-		),
+				"margin-left": #{$outputMarginLeft}
+			)
+		)
     );
-    
+
     @return map-merge($flint__instances, $flint__instance);
-}
+}

data/stylesheets/flint/functions/lib/_purge.scss

@@ -2,8 +2,6 @@
 // -------------------------------------------------------------------------------
 // @documentation http://sassylists.com/documentation.html#purge
 // -------------------------------------------------------------------------------
-// @dependence `is-true()`
-// -------------------------------------------------------------------------------
 // @param $list [list] : list
 // -------------------------------------------------------------------------------
 // @return [list]
@@ -18,4 +16,4 @@
 	}
 
 	@return $result;
-}
+}

data/stylesheets/flint/functions/lib/_remove.scss

@@ -2,8 +2,6 @@
 // -------------------------------------------------------------------------------
 // @documentation http://sassylists.com/documentation/#remove
 // -------------------------------------------------------------------------------
-// @dependence `replace()`
-// -------------------------------------------------------------------------------
 // @param $list [list] : list
 // @param $value [literal] : value to remove
 // @param $recursive [bool] : enable / disable recursivity
@@ -12,4 +10,4 @@
 
 @function remove($list, $value) {
 	@return replace($list, $value, null);
-}
+}

data/stylesheets/flint/functions/lib/_replace-substring.scss

@@ -0,0 +1,36 @@
+// Replace substring
+// -------------------------------------------------------------------------------
+// @param $string [string] : string that contains substring
+// @param $substring [string] : substring to replace
+// @param $new-substring [string] : new string to replace sub with
+// @param $recursive [bool] : recursively replace all substrings
+// -------------------------------------------------------------------------------
+// @return [string]
+
+@function replace-substring($string, $substring, $new-substring: " ", $recursive: true) {
+	// Loop through length of string
+	@for $i from 1 through str-length($string) {
+
+		// Get index and length of substring
+		$sub-index: str-index($string, $substring);
+		$sub-length: str-length($substring);
+
+		// If count is index of substring
+		@if $i == $sub-index {
+
+			// Slice string to exclude substring
+			$string-before: str-slice($string, 1, $i - 1);
+			$string-after: str-slice($string, $i + $sub-length, str-length($string));
+
+			// Create new string
+			$string: $string-before + $new-substring + $string-after;
+
+			@if $recursive {
+				$string: replace-substring($string, $substring, $new-substring);
+			}
+		}
+
+	}
+
+	@return $string;
+}

data/stylesheets/flint/functions/lib/_steal-values.scss

@@ -1,8 +1,5 @@
 // Steal value based on index number
 // -------------------------------------------------------------------------------
-// @dependence `map-fetch()`
-// @dependence `get-value()`
-// -------------------------------------------------------------------------------
 // @param $index [number] : index of breakpoint key in config
 // @param $value [number] : value
 // -------------------------------------------------------------------------------
@@ -14,4 +11,4 @@
 			@return get-value($key, $value);
 		}
 	}
-}
+}

data/stylesheets/flint/functions/lib/_support-syntax-bem.scss

@@ -5,8 +5,13 @@
 // @return [list] : parsed list of selectors according to syntax
 
 @function support-syntax-bem($selectors) {
-    $selectors: string-to-list($selectors, "_");
+    // Clean up selector, remove double underscores for spaces
+    $selectors: replace-substring($selectors, "__");
+    // Parse string to list
+    $selectors: string-to-list($selectors);
+    // Define top-most parent of selector
     $parent: nth($selectors, 1);
+    // Create new list of parsed selectors
     $selector-list: ($parent);
 
     // Loop over each selector and build list of selectors

data/stylesheets/flint/mixins/lib/_print-instance.scss

@@ -11,8 +11,8 @@
   $selector-string: selector_string();
   $selector-list: string-to-list($selector-string);
   $selector-cleaned: list-to-string($selector-list, " ");
-  
-	@if get-value(settings, debug-mode) == true {
+
+	@if get-value(settings, debug-mode) {
 		$printKey: "#{$selector-cleaned}" + "::" + "#{$calcKey}";
 		@include printInstance( map-get( $flint__instances, unquote($printKey) ) );
 	}
@@ -39,4 +39,4 @@
 			-flint-#{$property}: #{$value};
 		}
 	}
-}
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flint-gs
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -61,7 +61,6 @@ files:
 - stylesheets/flint/functions/lib/_get-family-instance.scss
 - stylesheets/flint/functions/lib/_get-index.scss
 - stylesheets/flint/functions/lib/_get-instance-value.scss
-- stylesheets/flint/functions/lib/_get-substring.scss
 - stylesheets/flint/functions/lib/_get-value.scss
 - stylesheets/flint/functions/lib/_instance.scss
 - stylesheets/flint/functions/lib/_last.scss
@@ -70,6 +69,7 @@ files:
 - stylesheets/flint/functions/lib/_next-index.scss
 - stylesheets/flint/functions/lib/_purge.scss
 - stylesheets/flint/functions/lib/_remove.scss
+- stylesheets/flint/functions/lib/_replace-substring.scss
 - stylesheets/flint/functions/lib/_replace.scss
 - stylesheets/flint/functions/lib/_steal-key.scss
 - stylesheets/flint/functions/lib/_steal-values.scss

data/stylesheets/flint/functions/lib/_get-substring.scss

@@ -1,24 +0,0 @@
-// Gets substring from string
-// -------------------------------------------------------------------------------
-// @dependence `string-to-list()`
-// -------------------------------------------------------------------------------
-// @param $full-string [string] : string that contains substring
-// @param $depth [number | string] : depth of substring
-// -------------------------------------------------------------------------------
-// @return [string]
-
-@function get-substring($full-string, $depth) {
-	@if is-string($full-string) {
-		$get-substring: string-to-list($full-string);
-
-		@if $depth == "last" {
-			@return nth($get-substring, length($get-substring));
-		} @else if $depth == "first" {
-			@return nth($get-substring, 1);
-		} @else {
-			@return nth($get-substring, $depth);
-		}
-	} @else {
-		@return "You did not input a valid string: #{$full-string}";
-	}
-}