jeet 6.0.0 → 6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5ad94b945af80f365d59181dff62ec59a0afc53
-  data.tar.gz: 54880370b2b82cc835f4dfcd1b521f6719b5b0bf
+  metadata.gz: 601f1bbda3877ad68e50cef49f75ecf0347bbbf8
+  data.tar.gz: 7ee2b2b95556ba7a853478915e767ce58fb9c7e3
 SHA512:
-  metadata.gz: 376f0cb907abbd41f622e90476ee0e8a8b510ca08e49e15a1914269bd08e4ed1f72dca93a12b08071f37e00f4367e0f2cdd299e306dd74cf3594219c84303610
-  data.tar.gz: 8b006fb6a444707436315b7cd06ec06aacdbbf84e9e2621eb523e675c7fae161eae6022564757ac7bb738157a3cad4c75fd0640cc2800407e8ae9363a94b35d0
+  metadata.gz: 78975f986c1a6b72c46a7d73ea0c6963739ce4edf69aa55f668e3357dd62c277425f74fc8ed1abe92a9f20f6d6ff7d433ce7bf037e283db63d84d6fcbb3c4f29
+  data.tar.gz: c2dadfe097371aa910ea42641437c736d486c2def0384552bf5ab31538edd78901c0a3f68286251ea0dd55f8dcd52d4bf46a62a7109ac2395fbe120796b730b3

data/Changelog.md

@@ -1,3 +1,6 @@
+## 6.1.2
+Upgrade to Jeet v6.1.2
+
 ## 6.0.0
 Upgrade to Jeet v6
 

data/lib/jeet/version.rb

@@ -1,3 +1,3 @@
 module Jeet
-  VERSION = '6.0.0'
+  VERSION = '6.1.2'
 end

data/vendor/assets/stylesheets/jeet.scss

@@ -12,6 +12,6 @@
   cf()
 */
 
-@import 'jeet/_settings';
-@import 'jeet/_functions';
-@import 'jeet/_grid';
+@import '_settings';
+@import '_functions';
+@import '_grid';

data/vendor/assets/stylesheets/jeet/_functions.scss

@@ -78,15 +78,24 @@
     $result: ();
 
     @for $i from length($list) * -1 through -1 {
-      $result: append($result, nth($list, abs($i)));
+      $item: nth($list, abs($i));
+
+      @if length($item) > 1 and $recursive {
+        $result: append($result, jeet-reverse($item, $recursive));
+      }
+      @else {
+        $result: append($result, $item);
+      }
     }
 
     @return $result;
   }
 
-  // Sass 3.3
-  @for $i from 1 through floor(length($list) / 2) + 1 {
+  // Sass 3.3+
+  @for $i from 1 through ceil(length($list)/2) {
     $tmp: nth($list, $i);
+    $tmp: if(length($tmp) > 1 and $recursive, reverse($tmp, $recursive), $tmp);
+
     $list: set-nth($list, $i, nth($list, -$i));
     $list: set-nth($list, -$i, $tmp);
   }

data/vendor/assets/stylesheets/jeet/_grid.scss

@@ -72,39 +72,19 @@
 /**
  * Get the width of a column and nothing else.
  * @param {number} [$ratios=1] - A width relative to its container as a fraction.
- * @param {number} [$g=$jeet-gutter] - Specify the gutter width as a percentage of the containers width.
+ * @param {number} [$gutter=$jeet-gutter] - Specify the gutter width as a percentage of the containers width.
  */
-@function column-width($ratios: 1, $g: $jeet-gutter) {
-  @if ($jeet-parent-first != 'true') {
-    $ratios: jeet-reverse($ratios);
-  }
-
-  $w: 100;
-
-  @each $ratio in $ratios {
-    $w: 100 * $ratio - $g + $ratio * $g;
-  }
-
-  @return unquote($w + '%');
+@function column-width($ratios: 1, $gutter: $jeet-gutter) {
+  @return unquote(nth(jeet-get-column($ratios, $gutter), 1) + '%');
 }
 
 /**
  * Get the gutter size of a column and nothing else.
  * @param {number} [ratios=1] - A width relative to its container as a fraction.
- * @param {number} [g=jeet.gutter] - Specify the gutter width as a percentage of the containers width.
+ * @param {number} [gutter=jeet.gutter] - Specify the gutter width as a percentage of the containers width.
  */
-@function column-gutter($ratios: 1, $g: $jeet-gutter) {
-  @if ($jeet-parent-first != 'true') {
-    $ratios: jeet-reverse($ratios);
-  }
-
-  $w: 100;
-
-  @each $ratio in $ratios {
-    $g: $g / $w * 100;
-  }
-
-  @return unquote($g + '%');
+@function column-gutter($ratios: 1, $gutter: $jeet-gutter) {
+  @return unquote(nth(jeet-get-column($ratios, $gutter), 2) + '%');
 }
 
 /**
@@ -127,8 +107,10 @@
  * Style an element as a column without any gutters for a seamless row.
  * @param {number} [$ratios=1] - A width relative to its container as a fraction.
  * @param {number} [$offset=0] - A offset specified as a fraction (see $ratios).
+ * @param {number} [cycle=0] - Easily create an nth column grid where cycle equals the number of columns.
+ * @param {number} [uncycle=0] - Undo a previous cycle value to allow for a new one.
  */
-@mixin span($ratio: 1, $offset: 0) {
+@mixin span($ratio: 1, $offset: 0, $cycle: 0, $uncycle: 0) {
   $side: jeet-get-layout-direction();
   $opposite-side: jeet-opposite-direction($side);
   $span-width: jeet-get-span($ratio);
@@ -152,6 +134,25 @@
     #{$side}: $margin-l * 1%;
     #{$opposite-side}: $margin-r * 1%;
   };
+
+  @if $cycle != 0 {
+    &:nth-child(#{$cycle}n) {
+      float: $opposite-side;
+    }
+    &:nth-child(#{$cycle}n + 1) {
+      clear: both;
+    }
+  }
+
+  @if $uncycle != 0 {
+    &:nth-child(#{$uncycle}n) {
+      float: $side;
+    }
+    &:nth-child(#{$uncycle}n + 1) {
+      clear: none;
+    }
+  }
+
 }
 
 /**
@@ -190,10 +191,17 @@
 /**
  * View the grid and its layers for easy debugging.
  * @param {string} [$color=black] - The background tint applied.
+ * @param {boolean} [$important=false] - Whether to apply the style as !important.
  */
-@mixin edit($color: black) {
-  * {
-    background: rgba($color, .05);
+@mixin edit($color: black, $important: false) {
+  @if $important {
+    * {
+      background: rgba($color, .05) !important;
+    }
+  } @else {
+    * {
+      background: rgba($color, .05);
+    }
   }
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jeet
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.2
 platform: ruby
 authors:
 - Cory Simmons
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-12 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass