flint-gs 1.12.0 → 2.0.0.rc.1

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

@@ -1,24 +1,21 @@
-// Creates a new instance, adds to global instance map
-// -------------------------------------------------------------------------------
-// @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 flint-new-instance($calc-key, $calc-span, $calc-context, $calc-gutter, $calc-shift, $output-width, $output-margin-right, $output-margin-left) {
+/**
+ * Creates a new instance, adds to global instance map
+ *
+ * @param {String} $calc-key
+ * @param {Number} $calc-span
+ * @param {Number} $calc-context
+ * @param {Number} $calc-gutter
+ * @param {Number} $output-width
+ * @param {Number} $output-margin-right
+ * @param {Number} $output-margin-left
+ */
+@mixin flint-new-instance($calc-key, $calc-span, $calc-context, $calc-gutter, $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

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

@@ -1,27 +1,23 @@
-// Prints debug properties
-// -------------------------------------------------------------------------------
-// @param $calc-key [string] : breakpoint key to search for instance
-// -------------------------------------------------------------------------------
-// @output instance map
-
+/**
+ * Prints debug properties
+ *
+ * @param {String} $calc-key - breakpoint key to search for instance
+ */
 @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, " ");
-
-		$printKey: "#{$selector-cleaned}" + "::" + "#{$calc-key}";
-		@include flint-print-instance( map-get( $flint__instances, unquote($printKey) ) );
+        $selector: nth(&, 1);
+        // Append key to selector
+		$print-selector: "#{$selector}" + "::" + "#{$calc-key}";
+		@include flint-print-instance(map-get($flint__instances, unquote($print-selector)));
 	}
 }
 
-// Prints all contents of instance
-// -------------------------------------------------------------------------------
-// @param $instance [map] : instance
-// -------------------------------------------------------------------------------
-// @output instance map
-
+/**
+ * Prints all contents of instance map
+ *
+ * @param {Map} $instance - instance map
+ */
 @mixin flint-print-instance($instance) {
 
 	// Loop through each property in passed instance
@@ -29,8 +25,8 @@
 
 		// Check if value is output map
 		@if flint-is-map($value) {
-			@each $p, $v in $value {
-				-flint-output-#{$p}: #{$v};
+			@each $prop, $val in $value {
+				-flint-output-#{$prop}: #{$val};
 			}
 		// 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.12.0
+  version: 2.0.0.rc.1
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -24,7 +24,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
-description: Flint is a highly advanced Sass grid-system designed for rapid responsive
+description: Flint is a highly advanced Sass grid system designed for rapid responsive
   development.
 email:
 - ezekg@yahoo.com
@@ -38,7 +38,6 @@ files:
 - stylesheets/flint/functions/_functions.scss
 - stylesheets/flint/functions/helpers/_helpers.scss
 - stylesheets/flint/functions/lib/_calc-breakpoint.scss
-- stylesheets/flint/functions/lib/_calc-margin.scss
 - stylesheets/flint/functions/lib/_calc-width.scss
 - stylesheets/flint/functions/lib/_exists.scss
 - stylesheets/flint/functions/lib/_fluid-width.scss

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

@@ -1,57 +0,0 @@
-// Calculate margin
-// -------------------------------------------------------------------------------
-// @param $key [string] : key for lookup
-// @param $span [number] : span value of element
-// @param $context [number] : context value of element
-// -------------------------------------------------------------------------------
-// @return calculated value | false
-
-@function flint-calc-margin($key, $span, $context: null) {
-	$result: false;
-
-	// Check to see if value has been cached
-	@if map-has-key($flint__cached-values, "#{$key, $span, $context}::margin") and $context != "auto" {
-		@return map-get($flint__cached-values, "#{$key, $span, $context}::margin");
-	}
-
-	@if flint-get-value("settings", "grid") == "fluid" {
-
-		@if $key == "container" or $span == "container" {
-
-			$result: 0;
-
-		} @else if $context == null {
-
-			$result: flint-fluid-width(flint-get-value("settings", "gutter"), flint-get-value($key, "breakpoint"));
-
-		} @else if $context <= flint-get-value($key, "columns") {
-
-			$result: flint-fluid-width(flint-get-value("settings", "gutter"), ((flint-get-value($key, "breakpoint") / flint-get-value($key, "columns") * $context)));
-
-		} @else {
-
-			$result: flint-fluid-width(flint-get-value("settings", "gutter") / flint-get-value($key, "columns") * $context, ((flint-get-value($key, "breakpoint") / flint-get-value($key, "columns") * $context)));
-
-		}
-
-	} @if flint-get-value("settings", "grid") == "fixed" {
-
-		@if $key == "container" or $span == "container" {
-
-			$result: 0;
-
-		} @else {
-
-			$result: flint-get-value("settings", "gutter");
-		}
-
-	}
-
-	// Save result to cache
-	@if $context != "auto" {
-		$flint__cached-values: map-merge($flint__cached-values, ("#{$key, $span, $context}::margin": $result));
-	}
-
-	// Return result
-	@return $result;
-}