flint-gs 1.10.0 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63ba26c499600324f23fb24bf1b0f4d9bf128478
-  data.tar.gz: 3882ee657a90d40d5ec896d8ff818ce6db99c688
+  metadata.gz: 2c6921c90e90b2904c2b9cab0882b90e15282788
+  data.tar.gz: 07a6ade201366461109d23c75329fc0d35df0a2a
 SHA512:
-  metadata.gz: 10ed7130f8c51a0d0fb780651373227605404e215b9a23f1ef7daec694d2e213d7cb7710896a5119c26cc19c1121dd87cb703f0f931d08ff5de5a465e84673ed
-  data.tar.gz: fa4e1b26f8c9cdaba11e94ebdfa8e957f55385ec497dd06125a593e5d2886fed0784330c693940f552edbc64a244debc636e632a41079a6a701ba3772fa433f4
+  metadata.gz: 314488f34a25e3c410d19b78f4d20ca7f52123629fe000b244e311ab246aab51776ce3fc25eee8d7be29abc5cf42f317953215766feb32fe99d031f5edd9a0eb
+  data.tar.gz: 56f17c69a719aa9be6bd5ae15fbe92df414da4e4d175355be2b4b4dba660772a81464b47538fd358bdadc0e7053ec1e20085a31ecc2fb3590984f5c52e104d32

data/README.md

@@ -1,4 +1,6 @@
-# Flint [![Gem Version](https://badge.fury.io/rb/flint-gs.svg)](http://badge.fury.io/rb/flint-gs)
+[![Flint - Grid System](http://flint.gs/wp-content/themes/flint/images/logo.png)](http://flint.gs)
+
+[![Gem Version](https://badge.fury.io/rb/flint-gs.svg)](http://badge.fury.io/rb/flint-gs)
 
 **Flint is designed to be a flexible layout toolkit that developers can use for any responsive grid-based project.** Built on Sass 3.3, Flint is capable of complex responsive layouts customized at each breakpoint; all while using a single mixin, having minimal output, as well as being completely semantic. All of your layout settings are housed in a simple config file that is immensely customizable. Flint will only output the code you need, and nothing else. We handle the  hard stuff, so you can focus on the rest.
 
@@ -181,6 +183,8 @@ Outputs,
 }
 ```
 
+You may also define a container for a specific breakpoint, `@include _(desktop, container)`, as well as chain a clearfix and container call together with `@include _(container, clearfix)`.
+
 ### Clear
 
 _Flint will attempt to use a local clearfix mixin named `clearfix`. If one is not found, it will use it's own._

data/lib/flint.rb

@@ -10,8 +10,8 @@ else
 end
 
 module Flint
-    VERSION = "1.10.0"
-    DATE = "2014-08-11"
+    VERSION = "1.11.2"
+    DATE = "2014-08-13"
 end
 
 # Custom functions

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

@@ -8,26 +8,45 @@
 
 @function flint-calc-breakpoint($n, $key, $i) {
     @if $n == "alias" {
+
         @if flint-get-value("settings", "grid") == "fixed" {
+
             @if flint-is-lowest-breakpoint($key) {
+
                 @return 0;
+
             } @else {
+
                 @return flint-get-value($key, "breakpoint");
+
             }
         } @else if flint-get-value("settings", "grid") == "fluid" {
+
             @return flint-get-value($key, "breakpoint");
+
         }
     } @else if $n == "next" {
+
         @if flint-is-lowest-breakpoint($key) {
+
             @return 0;
+
         } @else {
+
             @return flint-get-value(flint-steal-key(($i + 1)), "breakpoint");
+
         }
+
     } @else if $n == "prev" {
+
         @if flint-is-highest-breakpoint($key) {
+
             @return flint-get-value($key, "breakpoint");
+
         } @else {
+
             @return flint-get-value(flint-steal-key(($i - 1)), "breakpoint");
+
         }
     }
 }

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

@@ -15,6 +15,7 @@
 	}
 
 	@if flint-get-value("settings", "grid") == "fluid" {
+
 		@if $key == "container" or $span == "container" {
 
 			$result: flint-fluid-width(flint-get-value($key, "breakpoint"), flint-get-value($key, "breakpoint"));
@@ -29,6 +30,7 @@
 
 		}
 	} @if flint-get-value("settings", "grid") == "fixed" {
+		
 		@if $key == "container" or $span == "container" {
 
 			$result: flint-get-value($key, "breakpoint");

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

@@ -6,13 +6,14 @@
 // @return [bool]
 
 @function flint-exists($map, $value){
+	$is-map: flint-is-map($map);
+	$top-has-key: $is-map and map-has-key($map, $value) or false;
 
-	@if flint-is-map($map) {
-		@if map-has-key($map, $value) {
-			@return true;
-		}
-		@each $key, $i in $map {
-			@if flint-exists($i, $value) {
+	@if $top-has-key {
+		@return true;
+	} @else if $is-map {
+		@each $m, $k in $map {
+			@if flint-exists($k, $value) {
 				@return true;
 			}
 		}

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

@@ -9,7 +9,7 @@
 // @return [string]
 
 @function flint-get-instance-value($key, $value, $deep: null) {
-	@if $deep == null {
+	@if not $deep {
 		@return flint-map-fetch($flint__instances, flint-has-family-instance($key) $value);
 	} @else {
 		@return flint-map-fetch($flint__instances, flint-has-family-instance($key) $value $deep);

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

@@ -6,7 +6,7 @@
 // @return [literal]
 
 @function flint-get-value($key, $value: null) {
-	@if $value == null {
+	@if not $value {
 		@return flint-map-fetch($flint, "config" $key);
 	} @else {
 		@return flint-map-fetch($flint, "config" $key $value);

data/stylesheets/flint/functions/lib/_map-fetch.scss

@@ -6,25 +6,18 @@
 // @return fetched literal | false
 
 @function flint-map-fetch($map, $keys) {
-	$key: nth($keys, 1);
+	$has-key: flint-is-map($map) and map-has-key($map, nth($keys, 1)) and map-get($map, nth($keys, 1)) or false;
 	$length: length($keys);
-	$value: map-get($map, $key);
 
-	@if $value != null {
-		@if $length > 1 {
-			$rest: ();
+	@if $has-key and $length > 1 {
+		$remainder: ();
 
-			@for $i from 2 through $length {
-				$rest: append($rest, nth($keys, $i))
-			}
-
-			@return flint-map-fetch($value, $rest);
-
-		} @else {
-			@return $value;
+		@for $i from 2 through $length {
+			$remainder: append($remainder, nth($keys, $i))
 		}
-	} @else {
-		@warn "Invalid arguments passed to function: flint-map-fetch(#{$map}, #{$keys}). One or more of the keys do not exist.";
-		@return false;
+
+		@return flint-map-fetch($has-key, $remainder);
 	}
+
+	@return $has-key;
 }

data/stylesheets/flint/mixins/_mixins.scss

@@ -2,6 +2,7 @@
 // ----
 @import "lib/clearfix";
 @import "lib/box-sizing";
+@import "lib/container";
 @import "lib/new-instance";
 @import "lib/print-instance";
 @import "lib/calculate";

data/stylesheets/flint/mixins/lib/_container.scss

@@ -0,0 +1,47 @@
+// Container
+// -------------------------------------------------------------------------------
+// @param $key [string] : alias of individual breakpoint
+// -------------------------------------------------------------------------------
+// @output container styles
+
+@mixin flint-container($key: null, $i: null) {
+
+    // Check if inside of loop, and if so only output for default
+    @if $i == null or flint-is-default(flint-steal-key($i)) {
+        float: none;
+
+        @if $key {
+            width: flint-calc-width($key, "container");
+        }
+
+        // Check if max-width is set
+        @if flint-get-value("settings", "max-width") {
+
+            // Check if it's an number
+            @if flint-is-number(flint-get-value("settings", "max-width")) {
+                max-width: flint-get-value("settings", "max-width");
+            // If not, use highest breakpoint
+            } @else {
+                max-width: max(flint-get-all-breakpoints()...);
+            }
+
+        }
+
+        // Check if center container is set
+        @if flint-get-value("settings", "center-container") {
+            margin-right: auto;
+            margin-left: auto;
+        } @else {
+            margin-right: 0;
+            margin-left: 0;
+        }
+
+    // Inside of loop, so only output width
+    } @else {
+        @if $key {
+            width: flint-calc-width($key, "container");
+        }
+    }
+
+    @content;
+}

data/stylesheets/flint/mixins/lib/_main.scss

@@ -22,6 +22,51 @@
         @warn "The shift modifier has been deprecated due to it having such little-use and being a pain to maintain. It is set to be removed in version 2.0";
     }
 
+    // Clearfix
+    // -------------------------------------------------------------------------------
+    // @param [string] : clearfix instance
+    // -------------------------------------------------------------------------------
+    // @output clear styles | use existing clearfix mixin
+    @if $key == "clear" or $span == "clear" or $context == "clear" {
+
+        // Check if key exists as breakpoint
+        //  if so wrap in query to not affect others
+        @if flint-exists($flint, $key) {
+
+            @if flint-get-value("settings", "grid") == "fluid" {
+                @if flint-is-highest-breakpoint($key) {
+                    @media ( min-width: (flint-calc-breakpoint("next", $key, flint-get-index($key)) + if(flint-get-config-unit() == "em", flint-to-em(1px), 1)) ) {
+                        @include flint-clearfix;
+                        @content;
+                    }
+                } @else {
+                    @media ( min-width: (flint-calc-breakpoint("next", $key, flint-get-index($key)) + if(flint-is-lowest-breakpoint($key), 0, if(flint-get-config-unit() == "em", flint-to-em(1px), 1))) ) and ( max-width: flint-calc-breakpoint("alias", $key, flint-get-index($key)) ) {
+                        @include flint-clearfix;
+                        @content;
+                    }
+                }
+            } @else if flint-get-value("settings", "grid") == "fixed" {
+                @if flint-is-highest-breakpoint($key) {
+                    @media ( min-width: flint-calc-breakpoint("alias", $key, flint-get-index($key)) ) {
+                        @include flint-clearfix;
+                        @content;
+                    }
+                } @else {
+                    @media ( min-width: flint-calc-breakpoint("alias", $key, flint-get-index($key)) ) and ( max-width: (flint-calc-breakpoint("prev", $key, flint-get-index($key)) - if(flint-get-config-unit() == "em", flint-to-em(1px), 1)) ) {
+                        @include flint-clearfix;
+                        @content;
+                    }
+                }
+            }
+
+        } @else {
+
+            @include flint-clearfix;
+            @content;
+
+        }
+    }
+
     // Foundation
     // -------------------------------------------------------------------------------
     // @param $key [string] : foundation instance
@@ -38,24 +83,17 @@
         // ----
         @if $flint__foundation == "existant" {
             @at-root *, *:before, *:after {
-                @include flint-box-sizing();
+                @include flint-box-sizing;
                 @content;
             }
         }
 
-    // Clearfix
-    // ----
-    } @else if $key == "clear" {
-
-        @include flint-clearfix();
-
     // Container
     // -------------------------------------------------------------------------------
-    // @param $key [string] : container instance
+    // @param [string] : container instance
     // -------------------------------------------------------------------------------
     // @output container styles
-    } @else if $key == "container" {
-        float: none;
+    } @else if $key == "container" or $span == "container" or $context == "container" {
 
         // Apply individually if foundation is not set globally, but is set to true in config
         @if flint-get-value("settings", "border-box-sizing") and $flint__foundation == "nonexistant" {
@@ -72,19 +110,19 @@
 
         // Output container for each breakpoint if fixed grid
         // ----
-        @if flint-get-value("settings", "grid") == "fixed" {
+        @if $key == "container" and flint-get-value("settings", "grid") == "fixed" {
 
             @for $i from 1 through length($flint__all__keys) {
 
                 // Set up variables
                 $calc-key: flint-steal-key($i);
-                $calcContainer: $key;
 
                 // Key is default, no media queries
                 @if flint-is-default($calc-key) {
 
-                    width: flint-calc-width($calc-key, $calcContainer);
-                    @content;
+                    @include flint-container($calc-key, $i) {
+                        @content;
+                    }
 
                 // Not default, wrap in media queries
                 } @else {
@@ -93,53 +131,75 @@
                     @if flint-is-highest-breakpoint($calc-key) {
 
                         @media ( min-width: flint-calc-breakpoint("alias", $calc-key, $i) ) {
-                            width: flint-calc-width($calc-key, $calcContainer);
-                            @content;
+                            @include flint-container($calc-key, $i) {
+                                @content;
+                            }
                         }
 
                     } @else {
 
                         @media ( min-width: flint-calc-breakpoint("alias", $calc-key, $i) ) and ( max-width: (flint-calc-breakpoint("prev", $calc-key, $i) - if(flint-get-config-unit() == "em", flint-to-em(1px), 1)) ) {
-                            width: flint-calc-width($calc-key, $calcContainer);
-                            @content;
+                            @include flint-container($calc-key, $i) {
+                                @content;
+                            }
                         }
 
                     }
                 }
             }
-        }
 
-        // Check if max-width is set
+        // Output container for specific breakpoint if exists
         // ----
-        @if flint-get-value("settings", "max-width") {
+        } @else if flint-exists($flint, $key) and flint-get-value("settings", "grid") == "fixed" {
+
+            @if flint-is-highest-breakpoint($key) {
+
+                @media ( min-width: flint-calc-breakpoint("alias", $key, flint-get-index($key)) ) {
+                    @include flint-container($key) {
+                        @content;
+                    }
+                }
 
-            // Check if it's an number
-            @if flint-is-number(flint-get-value("settings", "max-width")) {
-                max-width: flint-get-value("settings", "max-width");
-            // Then use highest breakpoint
             } @else {
-                max-width: max(flint-get-all-breakpoints()...);
+
+                @media ( min-width: flint-calc-breakpoint("alias", $key, flint-get-index($key)) ) and ( max-width: (flint-calc-breakpoint("prev", $key, flint-get-index($key)) - if(flint-get-config-unit() == "em", flint-to-em(1px), 1)) ) {
+                    @include flint-container($key) {
+                        @content;
+                    }
+                }
+
             }
+        } @else if flint-exists($flint, $key) and flint-get-value("settings", "grid") == "fluid" {
+            @if flint-is-highest-breakpoint($key) {
 
-        }
+                @media ( min-width: (flint-calc-breakpoint("next", $key, flint-get-index($key)) + if(flint-get-config-unit() == "em", flint-to-em(1px), 1)) ) {
+                    @include flint-container {
+                        @content;
+                    }
+                }
 
-        // Center container is set
-        // ----
-        @if flint-get-value("settings", "center-container") {
-            margin-right: auto;
-            margin-left: auto;
+            } @else {
+
+                @media ( min-width: (flint-calc-breakpoint("next", $key, flint-get-index($key)) + if(flint-is-lowest-breakpoint($key), 0, if(flint-get-config-unit() == "em", flint-to-em(1px), 1))) ) and ( max-width: flint-calc-breakpoint("alias", $key, flint-get-index($key)) ) {
+                    @include flint-container {
+                        @content;
+                    }
+                }
+
+            }
         } @else {
-            margin-right: 0;
-            margin-left: 0;
+            @include flint-container {
+                @content;
+            }
         }
 
-    // Create a new instance, add to global instance map
-    // -------------------------------------------------------------------------------
+    // Creates a new instance, add to global instance map
+    // -----
     } @else {
 
         // Apply individually if foundation is not set globally, but is set to true in config
         @if flint-get-value("settings", "border-box-sizing") and $flint__foundation == "nonexistant" {
-            @include flint-box-sizing();
+            @include flint-box-sizing;
 
             // Warn to either set a global foundation, or turn border-box-sizing off
             @if global-variable-exists("global-foundation-is-set") == false {
@@ -383,7 +443,7 @@
                             @content;
                         }
                     } @else {
-                        @media ( min-width: flint-calc-breakpoint("alias", $key, flint-get-index($key)) ) and ( max-width: (flint-calc-breakpoint("prev", $key, flint-get-index($key)) - 1) ) {
+                        @media ( min-width: flint-calc-breakpoint("alias", $key, flint-get-index($key)) ) and ( max-width: (flint-calc-breakpoint("prev", $key, flint-get-index($key)) - if(flint-get-config-unit() == "em", flint-to-em(1px), 1)) ) {
                             @content;
                         }
                     }
@@ -580,7 +640,9 @@
         // @throw : invalid argument warning
         // -------------------------------------------------------------------------------
         } @else {
-            @warn "Invalid argument(s). Please double check and provide a valid argument. If you're calling by alias, please provide a single span argument for your breakpoint. See documentation for additional details.";
+            @if $key != "clear" {
+                @warn "Invalid argument(s). Please double check and provide a valid argument. If you're calling by alias, please provide a single span argument for your breakpoint. See documentation for additional details.";
+            }
         }
     }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flint-gs
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.2
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -69,6 +69,7 @@ files:
 - stylesheets/flint/mixins/lib/_box-sizing.scss
 - stylesheets/flint/mixins/lib/_calculate.scss
 - stylesheets/flint/mixins/lib/_clearfix.scss
+- stylesheets/flint/mixins/lib/_container.scss
 - stylesheets/flint/mixins/lib/_main.scss
 - stylesheets/flint/mixins/lib/_new-instance.scss
 - stylesheets/flint/mixins/lib/_print-instance.scss