flint-gs 1.6.5 → 1.7.0

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

@@ -1,27 +1,27 @@
 // Creates a new instance, adds to global instance map
 // -------------------------------------------------------------------------------
-// @param $calcKey [string] : breakpoint key
-// @param $calcSpan [number] : span
-// @param $calcContext [number] : context
-// @param $calcGutter [number] : gutter
-// @param $calcShift [number] : shift 
-// @param $outputWidth [number] : width
-// @param $outputMarginRight [number] : right margin
-// @param $outputMarginLeft [number] : left margin 
+// @param $calc-key [string] : breakpoint key
+// @param $calc-span [number] : span
+// @param $calc-context [number] : context
+// @param $calc-gutter [number] : gutter
+// @param $calc-shift [number] : shift
+// @param $output-width [number] : width
+// @param $output-margin-right [number] : right margin
+// @param $output-margin-left [number] : left margin
 // -------------------------------------------------------------------------------
 // @output new instance map
 
-@mixin newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft) {
-	$flint__instances: 
-		instance(
-			$calcKey,
-			$calcSpan,
-			$calcContext,
-			$calcGutter,
-			$calcShift,
-			$outputWidth,
-			$outputMarginRight,
-			$outputMarginLeft
+@mixin flint-new-instance($calc-key, $calc-span, $calc-context, $calc-gutter, $calc-shift, $output-width, $output-margin-right, $output-margin-left) {
+	$flint__instances:
+		flint-instance(
+			$calc-key,
+			$calc-span,
+			$calc-context,
+			$calc-gutter,
+			$calc-shift,
+			$output-width,
+			$output-margin-right,
+			$output-margin-left
 		)
 	!global;
-}
+}

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

@@ -1,20 +1,20 @@
 // Prints debug properties
 // -------------------------------------------------------------------------------
-// @dependence `printInstance()`
+// @dependence `flint-print-instance()`
 // -------------------------------------------------------------------------------
-// @param $calcKey [string] : breakpoint key to search for instance
+// @param $calc-key [string] : breakpoint key to search for instance
 // -------------------------------------------------------------------------------
 // @output instance map
 
-@mixin debugPrintInstance($calcKey) {
-  // Lets clean up the selector a bit...
-  $selector-string: selector_string();
-  $selector-list: string-to-list($selector-string);
-  $selector-cleaned: list-to-string($selector-list, " ");
+@mixin flint-debug-instance($calc-key) {
+    @if flint-get-value("settings", "debug-mode") {
+        // Lets clean up the selector a bit...
+        $selector-string: selector_string();
+        $selector-list: flint-string-to-list($selector-string);
+        $selector-cleaned: flint-list-to-string($selector-list, " ");
 
-	@if get-value(settings, debug-mode) {
-		$printKey: "#{$selector-cleaned}" + "::" + "#{$calcKey}";
-		@include printInstance( map-get( $flint__instances, unquote($printKey) ) );
+		$printKey: "#{$selector-cleaned}" + "::" + "#{$calc-key}";
+		@include flint-print-instance( map-get( $flint__instances, unquote($printKey) ) );
 	}
 }
 
@@ -24,15 +24,15 @@
 // -------------------------------------------------------------------------------
 // @output instance map
 
-@mixin printInstance($instance) {
+@mixin flint-print-instance($instance) {
 
 	// Loop through each property in passed instance
 	@each $property, $value in $instance {
 
 		// Check if value is output map
-		@if is-map($value) {
-			@each $mod_property, $mod_value in $value {
-				-flint-output-#{$mod_property}: #{$mod_value};
+		@if flint-is-map($value) {
+			@each $p, $v in $value {
+				-flint-output-#{$p}: #{$v};
 			}
 		// Else, print values as flagged comments
 		} @else {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flint-gs
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.7.0
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -58,10 +58,10 @@ files:
 - stylesheets/flint/functions/lib/_calc-width.scss
 - stylesheets/flint/functions/lib/_exists.scss
 - stylesheets/flint/functions/lib/_fluid-width.scss
-- 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-value.scss
+- stylesheets/flint/functions/lib/_has-family-instance.scss
 - stylesheets/flint/functions/lib/_instance.scss
 - stylesheets/flint/functions/lib/_last.scss
 - stylesheets/flint/functions/lib/_list-to-string.scss

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

@@ -1,59 +0,0 @@
-// Checks if instance exists in selector familiy tree, falls back from current selector
-// -------------------------------------------------------------------------------
-// @param $key [string] : breakpoint key to search for matching instance
-// @param $syntax [string | null] : searches for instance using passed syntax
-// -------------------------------------------------------------------------------
-// @return matching instance | false
-
-@function get-family-instance($key: get-value("settings", "default"), $syntax: $flint__support-syntax) {
-	$selector-string: selector_string();
-
-	// Check for syntax support, try to find instance using it
-	@if $syntax {
-		$selector-list: use-syntax($selector-string);
-		$length: length($selector-list);
-
-		// Loop through transformed selectors
-		@for $i from 1 through $length {
-
-			// Check last selector in list
-			@if exists($flint__instances, "#{last($selector-list)}::#{$key}") {
-
-				// Return the matching instance key
-				@return "#{last($selector-list)}::#{$key}";
-
-			} @else {
-
-				// Else, remove the last selector and loop again
-				$selector-list: remove($selector-list, last($selector-list));
-
-			}
-		}
-
-		// Search for a parent instance normally
-		@return get-family-instance($key, null);
-
-	} @else {
-		$selector-list: string-to-list($selector-string);
-		$length: length($selector-list);
-
-		// Loop through length of list of selectors
-		@for $i from 1 through $length {
-
-			// Make sure that we're not counting the current selector string
-			@if exists($flint__instances, "#{list-to-string($selector-list, " ")}::#{$key}") and $selector-string != list-to-string($selector-list, " ") {
-
-				// Return the matching instance key
-				@return "#{list-to-string($selector-list, " ")}::#{$key}";
-
-			} @else {
-
-				// Else, remove the last selector and loop again
-				$selector-list: remove($selector-list, last($selector-list));
-
-			}
-		}
-
-		@return false;
-	}
-}