bourbon 4.0.2 → 4.1.0

data/app/assets/stylesheets/css3/_flex-box.scss

@@ -64,34 +64,34 @@
 // 2011 - display (flexbox | inline-flexbox)
 // 2012 - display (flex | inline-flex)
 @mixin display($value) {
-//  flex | inline-flex
-    @if $value == "flex" {
-        // 2009
-        display: -webkit-box;
-        display: -moz-box;
-        display: box;
-
-        // 2012
-        display: -webkit-flex;
-        display: -moz-flex;
-        display: -ms-flexbox; // 2011 (IE 10)
-        display: flex;
-    }
-
-    @elseif $value == "inline-flex" {
-        display: -webkit-inline-box;
-        display: -moz-inline-box;
-        display: inline-box;
-
-        display: -webkit-inline-flex;
-        display: -moz-inline-flex;
-        display: -ms-inline-flexbox;
-        display: inline-flex;
-    }
-
-    @else {
-        display: $value;
-    }
+// flex | inline-flex
+  @if $value == "flex" {
+    // 2009
+    display: -webkit-box;
+    display: -moz-box;
+    display: box;
+
+    // 2012
+    display: -webkit-flex;
+    display: -moz-flex;
+    display: -ms-flexbox; // 2011 (IE 10)
+    display: flex;
+  }
+
+  @else if $value == "inline-flex" {
+    display: -webkit-inline-box;
+    display: -moz-inline-box;
+    display: inline-box;
+
+    display: -webkit-inline-flex;
+    display: -moz-inline-flex;
+    display: -ms-inline-flexbox;
+    display: inline-flex;
+  }
+
+  @else {
+    display: $value;
+  }
 }
 
 // 2009 - box-flex (integer)
@@ -99,56 +99,56 @@
 // 2012 - flex (integer integer width)
 @mixin flex($value) {
 
-    // Grab flex-grow for older browsers.
-    $flex-grow: nth($value, 1);
+  // Grab flex-grow for older browsers.
+  $flex-grow: nth($value, 1);
 
-    // 2009
-    @include prefixer(box-flex, $flex-grow, webkit moz spec);
+  // 2009
+  @include prefixer(box-flex, $flex-grow, webkit moz spec);
 
-    // 2011 (IE 10), 2012
-    @include prefixer(flex, $value, webkit moz ms spec);
+  // 2011 (IE 10), 2012
+  @include prefixer(flex, $value, webkit moz ms spec);
 }
 
 // 2009 - box-orient ( horizontal | vertical | inline-axis | block-axis)
-//      - box-direction (normal | reverse)      
+//      - box-direction (normal | reverse)
 // 2011 - flex-direction (row | row-reverse | column | column-reverse)
 // 2012 - flex-direction (row | row-reverse | column | column-reverse)
 @mixin flex-direction($value: row) {
 
-    // Alt values.
-    $value-2009: $value;
-    $value-2011: $value;
-    $direction: "normal";
+  // Alt values.
+  $value-2009: $value;
+  $value-2011: $value;
+  $direction: "normal";
 
-    @if $value == row {
-        $value-2009: horizontal;
-    }
+  @if $value == row {
+    $value-2009: horizontal;
+  }
 
-    @elseif $value == "row-reverse" {
-        $value-2009: horizontal;
-        $direction: reverse;
-    }
+  @else if $value == "row-reverse" {
+    $value-2009: horizontal;
+    $direction: reverse;
+  }
 
-    @elseif $value == column {
-        $value-2009: vertical;
-    }
+  @else if $value == column {
+    $value-2009: vertical;
+  }
 
-    @elseif $value == "column-reverse" {
-        $value-2009: vertical;
-        $direction: reverse;
-    }
+  @else if $value == "column-reverse" {
+    $value-2009: vertical;
+    $direction: reverse;
+  }
 
-    // 2009
-    @include prefixer(box-orient, $value-2009, webkit moz spec);
-    @if $direction == "reverse" {
-        @include prefixer(box-direction, $direction, webkit moz spec);
-    }
+  // 2009
+  @include prefixer(box-orient, $value-2009, webkit moz spec);
+  @if $direction == "reverse" {
+    @include prefixer(box-direction, $direction, webkit moz spec);
+  }
 
-    // 2012
-    @include prefixer(flex-direction, $value, webkit moz spec);
+  // 2012
+  @include prefixer(flex-direction, $value, webkit moz spec);
 
-    // 2011 (IE 10)
-    -ms-flex-direction: $value;
+  // 2011 (IE 10)
+  -ms-flex-direction: $value;
 }
 
 // 2009 - box-lines (single | multiple)
@@ -156,94 +156,94 @@
 // 2012 - flex-wrap (nowrap | wrap | wrap-reverse)
 @mixin flex-wrap($value: nowrap) {
 
-    // Alt values.
-    $alt-value: $value;
-    @if $value == nowrap {
-        $alt-value: single;
-    }
+  // Alt values
+  $alt-value: $value;
+  @if $value == nowrap {
+    $alt-value: single;
+  }
 
-    @elseif $value == wrap {
-        $alt-value: multiple;
-    }
+  @else if $value == wrap {
+    $alt-value: multiple;
+  }
 
-    @elseif $value == "wrap-reverse" {
-        $alt-value: multiple;
-    }
+  @else if $value == "wrap-reverse" {
+    $alt-value: multiple;
+  }
 
-    @include prefixer(box-lines, $alt-value, webkit moz spec);
-    @include prefixer(flex-wrap, $value, webkit moz ms spec);
+  @include prefixer(box-lines, $alt-value, webkit moz spec);
+  @include prefixer(flex-wrap, $value, webkit moz ms spec);
 }
 
 // 2009 - TODO: parse values into flex-direction/flex-wrap
 // 2011 - TODO: parse values into flex-direction/flex-wrap
 // 2012 - flex-flow (flex-direction || flex-wrap)
 @mixin flex-flow($value) {
-    @include prefixer(flex-flow, $value, webkit moz spec);
+  @include prefixer(flex-flow, $value, webkit moz spec);
 }
 
 // 2009 - box-ordinal-group (integer)
 // 2011 - flex-order (integer)
 // 2012 - order (integer)
 @mixin order($int: 0) {
-    // 2009
-    @include prefixer(box-ordinal-group, $int, webkit moz spec);
+  // 2009
+  @include prefixer(box-ordinal-group, $int, webkit moz spec);
 
-    // 2012
-    @include prefixer(order, $int, webkit moz spec);
+  // 2012
+  @include prefixer(order, $int, webkit moz spec);
 
-    // 2011 (IE 10)
-    -ms-flex-order: $int;
+  // 2011 (IE 10)
+  -ms-flex-order: $int;
 }
 
 // 2012 - flex-grow (number)
 @mixin flex-grow($number: 0) {
-    @include prefixer(flex-grow, $number, webkit moz spec);
-    -ms-flex-positive: $number;
+  @include prefixer(flex-grow, $number, webkit moz spec);
+  -ms-flex-positive: $number;
 }
 
 // 2012 - flex-shrink (number)
 @mixin flex-shrink($number: 1) {
-    @include prefixer(flex-shrink, $number, webkit moz spec);
-    -ms-flex-negative: $number;
+  @include prefixer(flex-shrink, $number, webkit moz spec);
+  -ms-flex-negative: $number;
 }
 
 // 2012 - flex-basis (number)
 @mixin flex-basis($width: auto) {
-    @include prefixer(flex-basis, $width, webkit moz spec);
-    -ms-flex-preferred-size: $width;
+  @include prefixer(flex-basis, $width, webkit moz spec);
+  -ms-flex-preferred-size: $width;
 }
 
 // 2009 - box-pack (start | end | center | justify)
 // 2011 - flex-pack (start | end | center | justify)
 // 2012 - justify-content (flex-start | flex-end | center | space-between | space-around)
-@mixin justify-content ($value: flex-start) {
+@mixin justify-content($value: flex-start) {
 
-    // Alt values.
-    $alt-value: $value;
-    @if $value == "flex-start" {
-        $alt-value: start;
-    }
+  // Alt values.
+  $alt-value: $value;
+  @if $value == "flex-start" {
+    $alt-value: start;
+  }
 
-    @elseif $value == "flex-end" {
-        $alt-value: end;
-    }
+  @else if $value == "flex-end" {
+    $alt-value: end;
+  }
 
-    @elseif $value == "space-between" {
-        $alt-value: justify;
-    }
+  @else if $value == "space-between" {
+    $alt-value: justify;
+  }
 
-    @elseif $value == "space-around" {
-        $alt-value: center;
-    }
+  @else if $value == "space-around" {
+    $alt-value: distribute;
+  }
 
-    // 2009
-    @include prefixer(box-pack, $alt-value, webkit moz spec);
+  // 2009
+  @include prefixer(box-pack, $alt-value, webkit moz spec);
 
-    // 2012
-    @include prefixer(justify-content, $value, webkit moz ms o spec);
+  // 2012
+  @include prefixer(justify-content, $value, webkit moz ms o spec);
 
-    // 2011 (IE 10)
-    -ms-flex-pack: $alt-value;
+  // 2011 (IE 10)
+  -ms-flex-pack: $alt-value;
 }
 
 // 2009 - box-align (start | end | center | baseline | stretch)
@@ -251,71 +251,70 @@
 // 2012 - align-items (flex-start | flex-end | center | baseline | stretch)
 @mixin align-items($value: stretch) {
 
-    $alt-value: $value;
+  $alt-value: $value;
 
-    @if $value == "flex-start" {
-        $alt-value: start;
-    }    
+  @if $value == "flex-start" {
+    $alt-value: start;
+  }
 
-    @elseif $value == "flex-end" {
-        $alt-value: end;
-    }
+  @else if $value == "flex-end" {
+    $alt-value: end;
+  }
 
-    // 2009
-    @include prefixer(box-align, $alt-value, webkit moz spec);
+  // 2009
+  @include prefixer(box-align, $alt-value, webkit moz spec);
 
-    // 2012
-    @include prefixer(align-items, $value, webkit moz ms o spec);
-    
-    // 2011 (IE 10)
-    -ms-flex-align: $alt-value;    
+  // 2012
+  @include prefixer(align-items, $value, webkit moz ms o spec);
+
+  // 2011 (IE 10)
+  -ms-flex-align: $alt-value;
 }
 
 // 2011 - flex-item-align (auto | start | end | center | baseline | stretch)
 // 2012 - align-self (auto | flex-start | flex-end | center | baseline | stretch)
 @mixin align-self($value: auto) {
 
-    $value-2011: $value;
-    @if $value == "flex-start" {
-        $value-2011: start;
-    }    
+  $value-2011: $value;
+  @if $value == "flex-start" {
+    $value-2011: start;
+  }
 
-    @elseif $value == "flex-end" {
-        $value-2011: end;
-    }
+  @else if $value == "flex-end" {
+    $value-2011: end;
+  }
 
-    // 2012
-    @include prefixer(align-self, $value, webkit moz spec);
+  // 2012
+  @include prefixer(align-self, $value, webkit moz spec);
 
-    // 2011 (IE 10)
-    -ms-flex-item-align: $value-2011;
+  // 2011 (IE 10)
+  -ms-flex-item-align: $value-2011;
 }
 
 // 2011 - flex-line-pack (start | end | center | justify | distribute | stretch)
 // 2012 - align-content (flex-start | flex-end | center | space-between | space-around | stretch)
 @mixin align-content($value: stretch) {
 
-    $value-2011: $value;
-    @if $value == "flex-start" {
-        $value-2011: start;
-    }    
+  $value-2011: $value;
+  @if $value == "flex-start" {
+    $value-2011: start;
+  }
 
-    @elseif $value == "flex-end" {
-        $value-2011: end;
-    }
+  @else if $value == "flex-end" {
+    $value-2011: end;
+  }
 
-    @elseif $value == "space-between" {
-        $value-2011: justify;
-    }
+  @else if $value == "space-between" {
+    $value-2011: justify;
+  }
 
-    @elseif $value == "space-around" {
-        $value-2011: distribute;
-    }
+  @else if $value == "space-around" {
+    $value-2011: distribute;
+  }
 
-    // 2012
-    @include prefixer(align-content, $value, webkit moz spec);
+  // 2012
+  @include prefixer(align-content, $value, webkit moz spec);
 
-    // 2011 (IE 10)
-    -ms-flex-line-pack: $value-2011;
+  // 2011 (IE 10)
+  -ms-flex-line-pack: $value-2011;
 }
-

data/app/assets/stylesheets/css3/_font-face.scss

@@ -1,23 +1,24 @@
-// Order of the includes matters, and it is: normal, bold, italic, bold+italic.
+@mixin font-face(
+  $font-family,
+  $file-path,
+  $weight: normal,
+  $style: normal,
+  $asset-pipeline: $asset-pipeline,
+  $file-formats: eot woff2 woff ttf svg) {
+
+  $font-url-prefix: font-url-prefixer($asset-pipeline);
 
-@mixin font-face($font-family, $file-path, $weight: normal, $style: normal, $asset-pipeline: $asset-pipeline) {
   @font-face {
     font-family: $font-family;
-    font-weight: $weight;
     font-style: $style;
+    font-weight: $weight;
 
-    @if $asset-pipeline == true {
-      src: font-url('#{$file-path}.eot');
-      src: font-url('#{$file-path}.eot?#iefix')          format('embedded-opentype'),
-           font-url('#{$file-path}.woff')                format('woff'),
-           font-url('#{$file-path}.ttf')                 format('truetype'),
-           font-url('#{$file-path}.svg##{$font-family}') format('svg');
-    } @else {
-      src: url('#{$file-path}.eot');
-      src: url('#{$file-path}.eot?#iefix')               format('embedded-opentype'),
-           url('#{$file-path}.woff')                     format('woff'),
-           url('#{$file-path}.ttf')                      format('truetype'),
-           url('#{$file-path}.svg##{$font-family}')      format('svg');
-    }
+    src: font-source-declaration(
+      $font-family,
+      $file-path,
+      $asset-pipeline,
+      $file-formats,
+      $font-url-prefix
+    );
   }
 }

data/app/assets/stylesheets/css3/_hidpi-media-query.scss

@@ -3,8 +3,8 @@
   @media only screen and (-webkit-min-device-pixel-ratio: $ratio),
   only screen and (min--moz-device-pixel-ratio: $ratio),
   only screen and (-o-min-device-pixel-ratio: #{$ratio}/1),
-  only screen and (min-resolution: #{round($ratio*96)}dpi),
-  only screen and (min-resolution: #{$ratio}dppx) {
+  only screen and (min-resolution: round($ratio * 96dpi)),
+  only screen and (min-resolution: $ratio * 1dppx) {
     @content;
   }
 }

data/app/assets/stylesheets/css3/_selection.scss

@@ -0,0 +1,14 @@
+@mixin selection {
+  $before-colons: "";
+
+  @if & {
+    $before-colons: "&"
+  }
+
+  #{$before-colons}::selection {
+    @content;
+  }
+  #{$before-colons}::-moz-selection {
+    @content;
+  }
+}

data/app/assets/stylesheets/css3/_text-decoration.scss

@@ -0,0 +1,19 @@
+@mixin text-decoration($value) {
+// <text-decoration-line> || <text-decoration-style> || <text-decoration-color>
+  @include prefixer(text-decoration, $value, moz);
+}
+
+@mixin text-decoration-line($line: none) {
+// none || underline || overline || line-through
+  @include prefixer(text-decoration-line, $line, moz);
+}
+
+@mixin text-decoration-style($style: solid) {
+// solid || double || dotted || dashed || wavy
+  @include prefixer(text-decoration-style, $style, moz webkit);
+}
+
+@mixin text-decoration-color($color: currentColor) {
+// currentColor || <color>
+  @include prefixer(text-decoration-color, $color, moz);
+}

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

@@ -0,0 +1,12 @@
+// Test a Sass list to see if it contains a defined value
+// Allows for checking if a list contains several values at once
+
+@function contains($list, $values...) {
+  @each $value in $values {
+    @if type-of(index($list, $value)) != "number" {
+      @return false;
+    }
+  }
+
+  @return true;
+}

data/app/assets/stylesheets/functions/_is-length.scss

@@ -0,0 +1,7 @@
+// Check for a valid length
+
+@function is-length($value) {
+  @return type-of($value) != "null" and (str-slice($value + "", 1, 4) == 'calc'
+       or index(auto inherit initial 0, $value)
+       or (type-of($value) == "number" and not(unitless($value))));
+}

data/app/assets/stylesheets/functions/_is-size.scss

@@ -0,0 +1,6 @@
+// Check for a valid size
+
+@function is-size($value) {
+  @return is-length($value)
+          or contains("fill" "fit-content" "min-content" "max-content", $value);
+}

data/app/assets/stylesheets/functions/_modular-scale.scss

@@ -17,7 +17,10 @@ $major-eleventh:   2.667;
 $major-twelfth:    3;
 $double-octave:    4;
 
-@function modular-scale($value, $increment, $ratio) {
+$modular-scale-ratio: $perfect-fourth !default;
+$modular-scale-base: em($em-base) !default;
+
+@function modular-scale($increment, $value: $modular-scale-base, $ratio: $modular-scale-ratio) {
   $v1: nth($value, 1);
   $v2: nth($value, length($value));
   $value: $v1;

data/app/assets/stylesheets/helpers/_font-source-declaration.scss

@@ -0,0 +1,36 @@
+// Used for creating the source string for fonts using @font-face
+// Reference: http://goo.gl/Ru1bKP
+
+@function font-url-prefixer($asset-pipeline) {
+  @if $asset-pipeline == true {
+    @return font-url;
+  } @else {
+    @return url;
+  }
+}
+
+@function font-source-declaration(
+  $font-family,
+  $file-path,
+  $asset-pipeline,
+  $file-formats,
+  $font-url) {
+
+  $src: null;
+
+  $formats-map: (
+    eot:   $font-url + "(\"#{$file-path}.eot?#iefix\")" format("embedded-opentype"),
+    woff2: $font-url + "(\"#{$file-path}.woff2\")" format("woff2"),
+    woff:  $font-url + "(\"#{$file-path}.woff\")" format("woff"),
+    ttf:   $font-url + "(\"#{$file-path}.ttf\")" format("truetype"),
+    svg:   $font-url + "(\"#{$file-path}.svg##{$font-family}\")" format("svg")
+  );
+
+  @each $format, $file-path in $formats-map {
+    @if contains($file-formats, $format) {
+      $src: append($src, $file-path, comma);
+    }
+  }
+
+  @return $src;
+}

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

@@ -1,8 +1,5 @@
-//************************************************************************//
-// Helper for linear-gradient-parser
-//************************************************************************//
-@function _is-num($char) {
-  $values: '0' '1' '2' '3' '4' '5' '6' '7' '8' '9' 0 1 2 3 4 5 6 7 8 9;
-  $index: index($values, $char);
-  @return if($index, true, false);
+// Check for a valid number
+
+@function _is-num($value) {
+  @return contains('0' '1' '2' '3' '4' '5' '6' '7' '8' '9' 0 1 2 3 4 5 6 7 8 9, $value);
 }

data/bourbon.gemspec

@@ -1,31 +1,28 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "bourbon/version"
+# coding: utf-8
+$:.push File.expand_path('../lib', __FILE__)
+require 'bourbon/version'
 
 Gem::Specification.new do |s|
-  s.name        = "bourbon"
+  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.email       = ["support@thoughtbot.com"]
+  s.authors     = ['Andres Mejia', 'Chad Mazzola', 'Chris Lloyd', 'Gabe Berke-Williams', 'J. Edward Dewyea', 'Jeremy Raines', 'Kyle Fiedler', 'Matt Jankowski', 'Mike Burns', 'Nick Quaranto', 'Phil LaPier', 'Reda Lemeden', 'Travis Haynes', 'Tyson Gach', 'Will McMahan']
+  s.email       = 'design+bourbon@thoughtbot.com'
   s.license     = 'MIT'
-  s.homepage    = "https://github.com/thoughtbot/bourbon"
-  s.summary     = "Bourbon Sass Mixins using SCSS syntax."
+  s.homepage    = 'http://bourbon.io'
+  s.summary     = 'A simple and lightweight mixin library for Sass'
   s.description = <<-DESC
-Bourbon provides a comprehensive framework of
-sass mixins that are designed to be as vanilla as possible. Meaning they
-should not deter from the original CSS syntax. The mixins contain vendor
-specific prefixes for all CSS3 properties for support amongst modern
-browsers. The prefixes also ensure graceful degradation for older browsers
-that support only CSS3 prefixed properties.
+Bourbon is a library of pure Sass mixins that are designed to be simple and easy
+to use. No configuration required. The mixins aim to be as vanilla as possible,
+meaning they should be as close to the original CSS syntax as possible.
   DESC
 
-  s.rubyforge_project = "bourbon"
+  s.rubyforge_project = 'bourbon'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
   s.add_dependency('sass', '~> 3.3')
   s.add_dependency('thor')