bourbon 4.3.4 → 5.0.0.alpha.0

data/{app/assets/stylesheets → core/bourbon}/helpers/_directional-values.scss

@@ -4,7 +4,9 @@
 ///
 /// @ignore You can also use `false` instead of `null`.
 ///
-/// @param {List} $vals
+/// @access private
+///
+/// @param {List} $values
 ///   List of directional values
 ///
 /// @example scss - Usage
@@ -26,18 +28,13 @@
 ///
 /// @return {List}
 
-@function collapse-directionals($vals) {
-  @if $output-bourbon-deprecation-warnings == true {
-    @warn "[Bourbon] [Deprecation] `collapse-directionals` is deprecated and " +
-    "will be removed in 5.0.0.";
-  }
-
+@function collapse-directionals($values) {
   $output: null;
 
-  $a: nth($vals, 1);
-  $b: if(length($vals) < 2, $a, nth($vals, 2));
-  $c: if(length($vals) < 3, $a, nth($vals, 3));
-  $d: if(length($vals) < 2, $a, nth($vals, if(length($vals) < 4, 2, 4)));
+  $a: nth($values, 1);
+  $b: if(length($values) < 2, $a, nth($values, 2));
+  $c: if(length($values) < 3, $a, nth($values, 3));
+  $d: if(length($values) < 2, $a, nth($values, if(length($values) < 4, 2, 4)));
 
   @if $a == 0 { $a: 0; }
   @if $b == 0 { $b: 0; }
@@ -60,18 +57,13 @@
 ///   Prefix to use
 /// @param {String} $suf
 ///   Suffix to use
-/// @param {List} $vals
+/// @param {List} $values
 ///   List of values
 ///
 /// @require {function} collapse-directionals
 /// @require {function} contains-falsy
 
-@mixin directional-property($pre, $suf, $vals) {
-  @include _bourbon-deprecate("directional-property");
-
-  $user-deprecation-warnings-setting: $output-bourbon-deprecation-warnings;
-  $output-bourbon-deprecation-warnings: false !global;
-
+@mixin directional-property($pre, $suf, $values) {
   // Property Names
   $top:    $pre + "-top"    + if($suf, "-#{$suf}", "");
   $bottom: $pre + "-bottom" + if($suf, "-#{$suf}", "");
@@ -79,30 +71,28 @@
   $right:  $pre + "-right"  + if($suf, "-#{$suf}", "");
   $all:    $pre +             if($suf, "-#{$suf}", "");
 
-  $vals: collapse-directionals($vals);
+  $values: collapse-directionals($values);
 
-  @if contains-falsy($vals) {
-    @if nth($vals, 1) { #{$top}: nth($vals, 1); }
+  @if contains-falsy($values) {
+    @if nth($values, 1) { #{$top}: nth($values, 1); }
 
-    @if length($vals) == 1 {
-      @if nth($vals, 1) { #{$right}: nth($vals, 1); }
+    @if length($values) == 1 {
+      @if nth($values, 1) { #{$right}: nth($values, 1); }
     } @else {
-      @if nth($vals, 2) { #{$right}: nth($vals, 2); }
+      @if nth($values, 2) { #{$right}: nth($values, 2); }
     }
 
-    @if length($vals) == 2 {
-      @if nth($vals, 1) { #{$bottom}: nth($vals, 1); }
-      @if nth($vals, 2) { #{$left}:   nth($vals, 2); }
-    } @else if length($vals) == 3 {
-      @if nth($vals, 3) { #{$bottom}: nth($vals, 3); }
-      @if nth($vals, 2) { #{$left}:   nth($vals, 2); }
-    } @else if length($vals) == 4 {
-      @if nth($vals, 3) { #{$bottom}: nth($vals, 3); }
-      @if nth($vals, 4) { #{$left}:   nth($vals, 4); }
+    @if length($values) == 2 {
+      @if nth($values, 1) { #{$bottom}: nth($values, 1); }
+      @if nth($values, 2) { #{$left}: nth($values, 2); }
+    } @else if length($values) == 3 {
+      @if nth($values, 3) { #{$bottom}: nth($values, 3); }
+      @if nth($values, 2) { #{$left}: nth($values, 2); }
+    } @else if length($values) == 4 {
+      @if nth($values, 3) { #{$bottom}: nth($values, 3); }
+      @if nth($values, 4) { #{$left}: nth($values, 4); }
     }
   } @else {
-    #{$all}: $vals;
+    #{$all}: $values;
   }
-
-  $output-bourbon-deprecation-warnings: $user-deprecation-warnings-setting !global;
 }

data/{app/assets/stylesheets → core/bourbon}/helpers/_font-source-declaration.scss

@@ -2,11 +2,6 @@
 // Reference: http://goo.gl/Ru1bKP
 
 @function font-url-prefixer($asset-pipeline) {
-  @if $output-bourbon-deprecation-warnings == true {
-    @warn "[Bourbon] [Deprecation] `font-url-prefixer` is deprecated and " +
-    "will be removed in 5.0.0.";
-  }
-
   @if $asset-pipeline == true {
     @return font-url;
   } @else {
@@ -21,11 +16,6 @@
   $file-formats,
   $font-url) {
 
-  @if $output-bourbon-deprecation-warnings == true {
-    @warn "[Bourbon] [Deprecation] `font-source-declaration` is deprecated " +
-    "and will be removed in 5.0.0.";
-  }
-
   $src: ();
 
   $formats-map: (

data/{app/assets/stylesheets → core/bourbon}/settings/_asset-pipeline.scss

@@ -2,6 +2,6 @@
 
 /// A global setting to enable or disable the `$asset-pipeline` variable for all functions that accept it.
 ///
-/// @type Bool
+/// @type boolean
 
 $asset-pipeline: false !default;

data/core/bourbon/settings/_global-font-file-formats.scss

@@ -0,0 +1,12 @@
+@charset "UTF-8";
+
+/// A global setting for font file formats for the `font-face` mixin.
+///
+/// @see {mixin} font-face
+///
+/// @example scss
+/// $global-font-file-formats: woff2 woff;
+///
+/// @type list | string
+
+$global-font-file-formats: ttf woff2 woff !default;

data/core/bourbon/settings/_modular-scale.scss

@@ -0,0 +1,17 @@
+@charset "UTF-8";
+
+/// Global setting for the modular scale ratio
+///
+/// @see {function} modular-scale
+///
+/// @type number
+
+$modular-scale-ratio: $perfect-fourth !default;
+
+/// Global setting for the modular scale base value
+///
+/// @see {function} modular-scale
+///
+/// @type number
+
+$modular-scale-base: 1em !default;

data/core/bourbon/settings/_scales.scss

@@ -0,0 +1,27 @@
+@charset "UTF-8";
+
+////
+/// Pre-defined scales for use with the `modular-scale` function
+///
+/// @see {function} modular-scale
+///
+/// @type number
+////
+
+$minor-second:     1.067;
+$major-second:     1.125;
+$minor-third:      1.2;
+$major-third:      1.25;
+$perfect-fourth:   1.333;
+$augmented-fourth: 1.414;
+$perfect-fifth:    1.5;
+$minor-sixth:      1.6;
+$golden:           1.618;
+$major-sixth:      1.667;
+$minor-seventh:    1.778;
+$major-seventh:    1.875;
+$octave:           2;
+$major-tenth:      2.5;
+$major-eleventh:   2.667;
+$major-twelfth:    3;
+$double-octave:    4;

data/features/step_definitions/bourbon_steps.rb

@@ -6,7 +6,7 @@ Given /^I install bourbon to "([^"]*)"$/ do |path|
 end
 
 Then /^the sass directories(?: with "([^"]+)" prefix)? should have been generated$/ do |prefix|
-  sass_directories = ["addons", "css3", "functions"]
+  sass_directories = ["bourbon/addons", "bourbon/css3", "bourbon/functions"]
   sass_directories.map!{ |directory| bourbon_path(prefix, directory) }
   check_directory_presence(sass_directories, true)
 end

data/index.js

@@ -2,6 +2,6 @@ var path = require('path');
 
 module.exports = {
   includePaths: [
-    path.join(__dirname, 'app/assets/stylesheets')
+    path.join(__dirname, 'core')
   ]
 };

data/lib/bourbon/engine.rb

@@ -1,5 +1,5 @@
 module Bourbon
   class Engine < Rails::Engine
-    # auto wire
+    config.assets.paths << File.expand_path("../../../core", __FILE__)
   end
 end

data/lib/bourbon/generator.rb

@@ -70,7 +70,7 @@ module Bourbon
     end
 
     def stylesheets_directory
-      File.join(top_level_directory, "app", "assets", "stylesheets")
+      File.join(top_level_directory, "core")
     end
 
     def top_level_directory

data/lib/bourbon/version.rb

@@ -1,3 +1,3 @@
 module Bourbon
-  VERSION = "4.3.4"
+  VERSION = "5.0.0.alpha.0"
 end

data/package.json

@@ -1,10 +1,9 @@
 {
   "name": "bourbon",
-  "version": "4.3.4",
+  "version": "5.0.0.alpha.0",
   "description": "A simple and lightweight mixin library for Sass.",
   "keywords": [
     "css",
-    "eyeglass-module",
     "mixins",
     "sass",
     "scss"
@@ -13,10 +12,6 @@
   "bugs": {
     "url": "https://github.com/thoughtbot/bourbon/issues"
   },
-  "eyeglass": {
-    "needs": "*",
-    "exports": "eyeglass-exports.js"
-  },
   "license": "MIT",
   "author": {
     "name": "thoughtbot",

data/spec/bourbon/addons/buttons_spec.rb

@@ -6,9 +6,9 @@ describe "buttons" do
 
     @buttons_list = %w(
       button
-      input[type="button"]
-      input[type="reset"]
-      input[type="submit"]
+      [type="button"]
+      [type="reset"]
+      [type="submit"]
     )
   end
 

data/spec/bourbon/addons/font_stacks_spec.rb

@@ -7,19 +7,29 @@ describe "font-stacks" do
 
   context "stacks used in variable" do
     it "output stacks" do
-      georgia = '"Georgia", "Cambria", "Times New Roman", "Times", serif'
-      helvetica = '"Helvetica Neue", "Helvetica", "Roboto", ' +
-                  '"Arial", sans-serif'
-      lucida_grande = '"Lucida Grande", "Tahoma", "Verdana", ' +
-                      '"Arial", sans-serif'
-      monospace = '"Bitstream Vera Sans Mono", "Consolas", "Courier", monospace'
+      helvetica = '"Helvetica Neue", "Helvetica", "Arial", sans-serif'
+      lucida_grande = '"Lucida Grande", "Lucida Sans Unicode", ' +
+                      '"Lucida Sans", "Geneva", "Verdana", sans-serif'
       verdana = '"Verdana", "Geneva", sans-serif'
+      garamond = '"Garamond", "Baskerville", "Baskerville Old Face", ' +
+                 '"Hoefler Text", "Times New Roman", serif'
+      georgia = '"Georgia", "Times", "Times New Roman", serif'
+      hoefler_text = '"Hoefler Text", "Baskerville Old Face", ' +
+                     '"Garamond", "Times New Roman", serif'
+      consolas = '"Consolas", "monaco", monospace'
+      courier_new = '"Courier New", "Courier", "Lucida Sans Typewriter", ' +
+                    '"Lucida Typewriter", monospace'
+      monaco = '"monaco", "Consolas", "Lucida Console", monospace'
 
-      expect("$georgia").to have_value(georgia)
-      expect("$helvetica").to have_value(helvetica)
-      expect("$lucida-grande").to have_value(lucida_grande)
-      expect("$monospace").to have_value(monospace)
-      expect("$verdana").to have_value(verdana)
+      expect(".helvetica").to have_value(helvetica)
+      expect(".lucida-grande").to have_value(lucida_grande)
+      expect(".verdana").to have_value(verdana)
+      expect(".garamond").to have_value(garamond)
+      expect(".georgia").to have_value(georgia)
+      expect(".hoefler-text").to have_value(hoefler_text)
+      expect(".consolas").to have_value(consolas)
+      expect(".courier-new").to have_value(courier_new)
+      expect(".monaco").to have_value(monaco)
     end
   end
 end

data/spec/bourbon/addons/text_inputs_spec.rb

@@ -5,20 +5,20 @@ describe "text-inputs" do
     ParserSupport.parse_file("addons/text-inputs")
 
     @inputs_list = %w(
-      input[type="color"]
-      input[type="date"]
-      input[type="datetime"]
-      input[type="datetime-local"]
-      input[type="email"]
-      input[type="month"]
-      input[type="number"]
-      input[type="password"]
-      input[type="search"]
-      input[type="tel"]
-      input[type="text"]
-      input[type="time"]
-      input[type="url"]
-      input[type="week"]
+      [type="color"]
+      [type="date"]
+      [type="datetime"]
+      [type="datetime-local"]
+      [type="email"]
+      [type="month"]
+      [type="number"]
+      [type="password"]
+      [type="search"]
+      [type="tel"]
+      [type="text"]
+      [type="time"]
+      [type="url"]
+      [type="week"]
       input:not([type])
       textarea
     )

data/spec/bourbon/css3/font_face_spec_1.rb

@@ -0,0 +1,18 @@
+require "spec_helper"
+
+describe "font-face" do
+  before(:all) do
+    ParserSupport.parse_file("css3/font-face-1")
+  end
+
+  context "called with defaults" do
+    it "outputs defaults" do
+      ruleset = 'font-family: "source-sans-pro"; ' +
+                'font-style: normal; ' +
+                'font-weight: normal; ' +
+                'src: url("/fonts/source-sans-pro/source-sans-pro-regular.woff2") format("woff2"), url("/fonts/source-sans-pro/source-sans-pro-regular.woff") format("woff"), url("/fonts/source-sans-pro/source-sans-pro-regular.ttf") format("truetype");'
+
+      expect("@font-face").to have_ruleset(ruleset)
+    end
+  end
+end

data/spec/bourbon/css3/font_face_spec_2.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+describe "font-face" do
+  before(:all) do
+    ParserSupport.parse_file("css3/font-face-2")
+  end
+
+  context "called with defaults" do
+    it "outputs defaults" do
+      ruleset = 'font-family: "roboto"; ' +
+                'font-style: "italic"; ' +
+                'font-weight: "bold"; ' +
+                'src: url("/assets/fonts/Roboto-BoldItalic.ttf") ' +
+                'format("truetype");'
+
+      expect("@font-face").to have_ruleset(ruleset)
+    end
+  end
+end

data/spec/bourbon/css3/font_face_spec_3.rb

@@ -0,0 +1,18 @@
+require "spec_helper"
+
+describe "font-face" do
+  before(:all) do
+    ParserSupport.parse_file("css3/font-face-3")
+  end
+
+  context "called with defaults" do
+    it "outputs defaults" do
+      ruleset = 'font-family: "pitch"; ' +
+                'font-style: "normal"; ' +
+                'font-weight: "normal"; ' +
+                'src: url("/fonts/pitch.woff") format("woff");'
+
+      expect("@font-face").to have_ruleset(ruleset)
+    end
+  end
+end

data/spec/bourbon/css3/font_face_spec_4.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+describe "font-face" do
+  before(:all) do
+    ParserSupport.parse_file("css3/font-face-4")
+  end
+
+  context "called with defaults" do
+    it "outputs defaults" do
+      ruleset = 'font-family: "circular"; ' +
+                'font-style: "normal"; ' +
+                'font-weight: "normal"; ' +
+                'src: url("/circular.woff2") format("woff2"), ' +
+                'url("/circular.svg#circular") format("svg");'
+
+      expect("@font-face").to have_ruleset(ruleset)
+    end
+  end
+end

data/spec/bourbon/functions/assign_inputs_spec.rb

@@ -4,8 +4,8 @@ describe "assign-inputs" do
   before(:all) do
     ParserSupport.parse_file("functions/assign-inputs")
     @text_inputs_list = [
-      "input[type=\"password\"]",
-      "input[type=\"text\"]",
+      "[type=\"password\"]",
+      "[type=\"text\"]",
       "textarea"
     ]
   end
@@ -41,7 +41,7 @@ describe "assign-inputs" do
   context "expands text inputs when middle of list" do
     it "finds selectors" do
       list = @text_inputs_list.dup
-      list.unshift "input[type=\"file\"]"
+      list.unshift "[type=\"file\"]"
       list.each do |input|
         expect(input).to have_rule("color: #ff00ff")
       end