bourbon 3.2.4 → 4.0.0.rc1

data/app/assets/stylesheets/functions/_assign.scss

@@ -0,0 +1,11 @@
+@function assign-inputs($inputs, $pseudo: null) {
+  $list : ();
+
+  @each $input in $inputs {
+    $input: unquote($input);
+    $input: if($pseudo, $input + ":" + $pseudo, $input);
+    $list: append($list, $input, comma);
+  }
+
+  @return $list;
+}

data/app/assets/stylesheets/functions/_color-lightness.scss

@@ -3,11 +3,11 @@
 // More details here http://robots.thoughtbot.com/closer-look-color-lightness
 
 @function is-light($hex-color) {
-  $-local-red: red(rgba($hex-color, 1.0));
-  $-local-green: green(rgba($hex-color, 1.0));
-  $-local-blue: blue(rgba($hex-color, 1.0));
+  $red: red(rgba($hex-color, 1.0));
+  $green: green(rgba($hex-color, 1.0));
+  $blue: blue(rgba($hex-color, 1.0));
 
-  $-local-lightness: ($-local-red * 0.2126 + $-local-green * 0.7152 + $-local-blue * 0.0722) / 255;
+  $lightness: ($red * 0.2126 + $green * 0.7152 + $blue * 0.0722) / 255;
 
-  @return $-local-lightness > .6;
+  @return $lightness > .6;
 }

data/app/assets/stylesheets/helpers/_convert-units.scss

@@ -0,0 +1,15 @@
+//************************************************************************//
+// Helper function for str-to-num fn.
+// Source: http://sassmeister.com/gist/9647408
+//************************************************************************//
+@function _convert-units($number, $unit) {
+  $strings: 'px' 'cm' 'mm' '%' 'ch' 'pica' 'in' 'em' 'rem' 'pt' 'pc' 'ex' 'vw' 'vh' 'vmin' 'vmax', 'deg', 'rad', 'grad', 'turn';
+  $units:   1px  1cm  1mm  1%  1ch  1pica  1in  1em  1rem  1pt  1pc  1ex  1vw  1vh  1vmin  1vmax,  1deg,  1rad,  1grad, 1turn;
+  $index: index($strings, $unit);
+
+  @if not $index {
+    @warn "Unknown unit `#{$unit}`.";
+    @return false;
+  }
+  @return $number * nth($units, $index);
+}

data/app/assets/stylesheets/helpers/_is-num.scss

@@ -0,0 +1,8 @@
+//************************************************************************//
+// Helper for linear-gradient-parser
+//************************************************************************//
+@function _is-num($char) {
+  $strings: "0 1 2 3 4 5 6 7 8 9";
+  $index: str-index($strings, $char);
+  @return if($index, true, false);
+}

data/app/assets/stylesheets/helpers/_linear-angle-parser.scss

@@ -0,0 +1,25 @@
+// Private function for linear-gradient-parser
+@function _linear-angle-parser($image, $first-val, $prefix, $suffix) {
+  $offset: null;
+  $unit-short:  str-slice($first-val, str-length($first-val) - 2, str-length($first-val));
+  $unit-long:   str-slice($first-val, str-length($first-val) - 3, str-length($first-val));
+
+  @if ($unit-long == "grad") or
+      ($unit-long == "turn") {
+    $offset: if($unit-long == "grad", -100grad * 3, -0.75turn);
+  }
+
+  @else if ($unit-short == "deg") or
+           ($unit-short == "rad") {
+    $offset: if($unit-short == "deg", -90 * 3, 1.6rad);
+  }
+
+  @if $offset {
+    $num: _str-to-num($first-val);
+
+    @return (
+      webkit-image: -webkit- + $prefix + ($offset - $num) + $suffix,
+      spec-image: $image
+    );
+  }
+}

data/app/assets/stylesheets/helpers/_linear-gradient-parser.scss

@@ -0,0 +1,41 @@
+@function _linear-gradient-parser($image) {
+  $image: unquote($image);
+  $gradients: ();
+  $start: str-index($image, "(");
+  $end: str-index($image, ",");
+  $first-val: str-slice($image, $start + 1, $end - 1);
+
+  $prefix: str-slice($image, 0, $start);
+  $suffix: str-slice($image, $end, str-length($image));
+
+  $has-multiple-vals: str-index($first-val, " ");
+  $has-single-position: unquote(_position-flipper($first-val) + "");
+  $has-angle: _is-num(str-slice($first-val, 0, 0));
+
+  @if $has-multiple-vals {
+    $gradients: _linear-side-corner-parser($image, $first-val, $prefix, $suffix, $has-multiple-vals);
+  }
+
+  @else if $has-single-position != "" {
+    $pos: unquote($has-single-position + "");
+
+    $gradients: (
+      webkit-image: -webkit- + $image,
+      spec-image: $prefix + "to " + $pos + $suffix
+    );
+  }
+
+  @else if $has-angle {
+    // Rotate degree for webkit
+    $gradients: _linear-angle-parser($image, $first-val, $prefix, $suffix);
+  }
+
+  @else {
+    $gradients: (
+      webkit-image: -webkit- + $image,
+      spec-image: $image
+    );
+  }
+
+  @return $gradients;
+}

data/app/assets/stylesheets/helpers/_linear-side-corner-parser.scss

@@ -0,0 +1,31 @@
+// Private function for linear-gradient-parser
+@function _linear-side-corner-parser($image, $first-val, $prefix, $suffix, $has-multiple-vals) {
+  $val-1: str-slice($first-val, 0, $has-multiple-vals - 1 );
+  $val-2: str-slice($first-val, $has-multiple-vals + 1, str-length($first-val));
+  $val-3: null;
+  $has-val-3: str-index($val-2, " ");
+
+  @if $has-val-3 {
+    $val-3: str-slice($val-2, $has-val-3 + 1, str-length($val-2));
+    $val-2: str-slice($val-2, 0, $has-val-3 - 1);
+  }
+
+  $pos: _position-flipper($val-1) _position-flipper($val-2) _position-flipper($val-3);
+  $pos: unquote($pos + "");
+
+  // Use old spec for webkit
+  @if $val-1 == "to" {
+    @return (
+      webkit-image: -webkit- + $prefix + $pos + $suffix,
+      spec-image: $image
+    );
+  }
+
+  // Bring the code up to spec
+  @else {
+    @return (
+      webkit-image: -webkit- + $image,
+      spec-image: $prefix + "to " + $pos + $suffix
+    );
+  }
+}

data/app/assets/stylesheets/helpers/_radial-gradient-parser.scss

@@ -0,0 +1,50 @@
+@function _radial-gradient-parser($image) {
+  $image: unquote($image);
+  $gradients: ();
+  $start: str-index($image, "(");
+  $end: str-index($image, ",");
+  $first-val: str-slice($image, $start + 1, $end - 1);
+
+  $prefix: str-slice($image, 0, $start);
+  $suffix: str-slice($image, $end, str-length($image));
+
+  $is-spec-syntax: str-index($first-val, "at");
+
+  @if $is-spec-syntax and $is-spec-syntax > 1 {
+    $keyword: str-slice($first-val, 1, $is-spec-syntax - 2);
+    $pos: str-slice($first-val, $is-spec-syntax + 3, str-length($first-val));
+    $pos: append($pos, $keyword, comma);
+
+    $gradients: (
+      webkit-image: -webkit- + $prefix + $pos + $suffix,
+      spec-image: $image
+    )
+  }
+
+  @else if $is-spec-syntax == 1 {
+    $pos: str-slice($first-val, $is-spec-syntax + 3, str-length($first-val));
+
+    $gradients: (
+      webkit-image: -webkit- + $prefix + $pos + $suffix,
+      spec-image: $image
+    )
+  }
+
+  @else if str-index($image, "cover") or str-index($image, "contain") {
+    @warn "Radial-gradient needs to be updated to conform to latest spec.";
+
+    $gradients: (
+      webkit-image: null,
+      spec-image: $image
+    )
+  }
+
+  @else {
+    $gradients: (
+      webkit-image: -webkit- + $image,
+      spec-image: $image
+    )
+  }
+
+  @return $gradients;
+}

data/app/assets/stylesheets/helpers/_render-gradients.scss

@@ -16,11 +16,11 @@
   }
 
   @if $vendor {
-    $vendor-gradients: "-#{$vendor}-#{$gradient-type}-gradient(#{$pre-spec} #{$gradients})";
+    $vendor-gradients: -#{$vendor}-#{$gradient-type}-gradient(#{$pre-spec} $gradients);
   }
   @else if $vendor == false {
     $vendor-gradients: "#{$gradient-type}-gradient(#{$spec} #{$gradients})";
+    $vendor-gradients: unquote($vendor-gradients);
   }
-  $vendor-gradients: unquote($vendor-gradients);
   @return $vendor-gradients;
 }

data/app/assets/stylesheets/helpers/_str-to-num.scss

@@ -0,0 +1,50 @@
+//************************************************************************//
+// Helper function for linear/radial-gradient-parsers.
+// Source: http://sassmeister.com/gist/9647408
+//************************************************************************//
+@function _str-to-num($string) {
+  // Matrices
+  $strings: '0' '1' '2' '3' '4' '5' '6' '7' '8' '9';
+  $numbers:  0   1   2   3   4   5   6   7   8   9;
+
+  // Result
+  $result: 0;
+  $divider: 0;
+  $minus: false;
+
+  // Looping through all characters
+  @for $i from 1 through str-length($string) {
+    $character: str-slice($string, $i, $i);
+    $index: index($strings, $character);
+
+    @if $character == '-' {
+      $minus: true;
+    }
+
+    @else if $character == '.' {
+      $divider: 1;
+    }
+
+    @else {
+      @if not $index {
+        $result: if($minus, $result * -1, $result);
+        @return _convert-units($result, str-slice($string, $i));
+      }
+
+      $number: nth($numbers, $index);
+
+      @if $divider == 0 {
+        $result: $result * 10;
+      }
+
+      @else {
+        // Move the decimal dot to the left
+        $divider: $divider * 10;
+        $number: $number / $divider;
+      }
+
+      $result: $result + $number;
+    }
+  }
+  @return if($minus, $result * -1, $result);
+}

data/bourbon.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name        = "bourbon"
   s.version     = Bourbon::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Phil LaPier", "Chad Mazzola", "Matt Jankowski", "Nick Quaranto", "Jeremy Raines", "Mike Burns", "Andres Mejia", "Travis Haynes", "Chris Lloyd", "Gabe Berke-Williams", "J. Edward Dewyea", "Reda Lemeden", "Kyle Fiedler"]
+  s.authors     = ["Phil LaPier", "Chad Mazzola", "Matt Jankowski", "Nick Quaranto", "Jeremy Raines", "Mike Burns", "Andres Mejia", "Travis Haynes", "Chris Lloyd", "Gabe Berke-Williams", "J. Edward Dewyea", "Reda Lemeden"]
   s.email       = ["support@thoughtbot.com"]
   s.license     = 'MIT'
   s.homepage    = "https://github.com/thoughtbot/bourbon"
@@ -27,7 +27,7 @@ that support only CSS3 prefixed properties.
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('sass', '~> 3.2')
+  s.add_dependency('sass', '~> 3.3')
   s.add_dependency('thor')
 
   s.add_development_dependency('aruba', '~> 0.4')

data/bower.json

@@ -1,34 +1,17 @@
 {
   "name": "bourbon",
-  "description": "A simple and lightweight mixin library for Sass.",
-  "version": "3.2.4",
+  "homepage": "http://bourbon.io/",
+  "version": "4.0.0-rc.1",
   "main": "dist/_bourbon.scss",
-  "license": "MIT",
   "ignore": [
-    "**/.*",
     "app",
     "bin",
-    "bourbon.gemspec",
     "features",
-    "LICENSE.md",
     "lib",
+    ".gitignore",
     "Gemfile",
     "Gemfile.lock",
-    "package.json",
-    "Rakefile"
-  ],
-  "keywords": [
-    "css",
-    "mixins",
-    "sass",
-    "scss"
-  ],
-  "authors": [
-    "thoughtbot (http://thoughtbot.com)"
-  ],
-  "homepage": "http://bourbon.io",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/thoughtbot/bourbon.git"
-  }
+    "Rakefile",
+    "bourbon.gemspec"
+  ]
 }

data/dist/_bourbon-deprecated-upcoming.scss

@@ -2,12 +2,7 @@
 // These mixins/functions are deprecated
 // They will be removed in the next MAJOR version release
 //************************************************************************//
-@mixin box-shadow ($shadows...) {
-  @include prefixer(box-shadow, $shadows, spec);
-  @warn "box-shadow is deprecated and will be removed in the next major version release";
-}
-
-@mixin background-size ($lengths...) {
-  @include prefixer(background-size, $lengths, spec);
-  @warn "background-size is deprecated and will be removed in the next major version release";
+@mixin inline-block {
+  display: inline-block;
+  @warn "inline-block mixin is deprecated and will be removed in the next major version release";
 }

data/dist/_bourbon.scss

@@ -1,31 +1,30 @@
-// Bourbon 3.2.4
-// http://bourbon.io
-// Copyright 2011-2015 thoughtbot, inc.
-// MIT License
-
 // Settings
 @import "settings/prefixer";
 @import "settings/px-to-em";
-@import "settings/asset-pipeline";
 
 // Custom Helpers
+@import "helpers/convert-units";
 @import "helpers/gradient-positions-parser";
+@import "helpers/is-num";
+@import "helpers/linear-angle-parser";
+@import "helpers/linear-gradient-parser";
 @import "helpers/linear-positions-parser";
+@import "helpers/linear-side-corner-parser";
 @import "helpers/radial-arg-parser";
 @import "helpers/radial-positions-parser";
+@import "helpers/radial-gradient-parser";
 @import "helpers/render-gradients";
 @import "helpers/shape-size-stripper";
+@import "helpers/str-to-num";
 
 // Custom Functions
+@import "functions/assign";
 @import "functions/color-lightness";
 @import "functions/flex-grid";
 @import "functions/golden-ratio";
 @import "functions/grid-width";
-@import "functions/linear-gradient";
 @import "functions/modular-scale";
 @import "functions/px-to-em";
-@import "functions/px-to-rem";
-@import "functions/radial-gradient";
 @import "functions/strip-units";
 @import "functions/tint-shade";
 @import "functions/transition-property-name";
@@ -45,11 +44,9 @@
 @import "css3/filter";
 @import "css3/flex-box";
 @import "css3/font-face";
-@import "css3/font-feature-settings";
 @import "css3/hyphens";
 @import "css3/hidpi-media-query";
 @import "css3/image-rendering";
-@import "css3/inline-block";
 @import "css3/keyframes";
 @import "css3/linear-gradient";
 @import "css3/perspective";
@@ -69,11 +66,11 @@
 @import "addons/html5-input-types";
 @import "addons/position";
 @import "addons/prefixer";
+@import "addons/rem";
 @import "addons/retina-image";
 @import "addons/size";
 @import "addons/timing-functions";
 @import "addons/triangle";
-@import "addons/word-wrap";
 
 // Soon to be deprecated Mixins
 @import "bourbon-deprecated-upcoming";

data/dist/addons/_directional-values.scss

@@ -57,6 +57,9 @@
   $right:  $pre + "-right"  + if($suf, "-#{$suf}", "");
   $all:    $pre +             if($suf, "-#{$suf}", "");
 
+  // Get list inside $vals (is there a better way?)
+  @each $val in $vals { $vals: $val; }
+
   $vals: collapse-directionals($vals);
 
   @if contains-falsy($vals) {
@@ -91,21 +94,21 @@
 }
 
 @mixin margin($vals...) {
-  @include directional-property(margin, false, $vals...);
+  @include directional-property(margin, false, $vals);
 }
 
 @mixin padding($vals...) {
-  @include directional-property(padding, false, $vals...);
+  @include directional-property(padding, false, $vals);
 }
 
 @mixin border-style($vals...) {
-  @include directional-property(border, style, $vals...);
+  @include directional-property(border, style, $vals);
 }
 
 @mixin border-color($vals...) {
-  @include directional-property(border, color, $vals...);
+  @include directional-property(border, color, $vals);
 }
 
 @mixin border-width($vals...) {
-  @include directional-property(border, width, $vals...);
+  @include directional-property(border, width, $vals);
 }