bourbon 4.0.1 → 4.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (19) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/_bourbon.scss +1 -0
  3. data/app/assets/stylesheets/addons/_retina-image.scss +1 -1
  4. data/app/assets/stylesheets/addons/_size.scss +1 -1
  5. data/app/assets/stylesheets/addons/_timing-functions.scss +1 -1
  6. data/app/assets/stylesheets/css3/_font-face.scss +1 -1
  7. data/app/assets/stylesheets/settings/_asset-pipeline.scss +1 -0
  8. data/bower.json +1 -1
  9. data/dist/_bourbon.scss +1 -0
  10. data/dist/addons/_retina-image.scss +1 -1
  11. data/dist/addons/_size.scss +1 -1
  12. data/dist/addons/_timing-functions.scss +1 -1
  13. data/dist/css3/_font-face.scss +1 -1
  14. data/dist/settings/_asset-pipeline.scss +1 -0
  15. data/lib/bourbon.rb +2 -1
  16. data/lib/bourbon/version.rb +1 -1
  17. data/package.json +1 -1
  18. data/readme.md +3 -3
  19. metadata +16 -14
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 41411be80fcec3ef639f565ce53acb117b97b404
4
- data.tar.gz: b55f7babf130479756b841b3187655f09e634bef
3
+ metadata.gz: 82349a03d66ed0c3f92abf6f96f1fac2a59b61a4
4
+ data.tar.gz: aa833788f3cd41270c5a7e947559b86296b5b435
5
5
  SHA512:
6
- metadata.gz: b908ff10e7e76c69c0ceb6b92686716a369e8e1d8a97c5a9940125ae6317c4ff431c04ac390ade56fafdbae4a825de0e356b474309ea648b50852fc74984d3a0
7
- data.tar.gz: 24a680d23e8097f2b11c535af877bd1bef0d46cf4dce359bbd83686b33830a9b89f3df6fc3cf86011fe65bbab9818985abd88564220e5786d6f4bdd4e1c6bb53
6
+ metadata.gz: 0e7f67108c6caca33adb567900a3f043424c55922cf7b3431246bf88c36f914df596d0449a215e38e0effd9d65b2c4ed56cc915f19cf81320b423500f5ac5428
7
+ data.tar.gz: d345ed538350de5860f11142eeb6543f69d754e69473cab581d3787d9c594516c086a5de59bad8374327897aef0abe57da94e5a68baa4f8e5700c63c7dac70d2
data/app/assets/stylesheets/_bourbon.scss CHANGED
@@ -1,6 +1,7 @@
1
1
  // Settings
2
2
  @import "settings/prefixer";
3
3
  @import "settings/px-to-em";
4
+ @import "settings/asset-pipeline";
4
5
 
5
6
  // Custom Helpers
6
7
  @import "helpers/convert-units";
data/app/assets/stylesheets/addons/_retina-image.scss CHANGED
@@ -1,4 +1,4 @@
1
- @mixin retina-image($filename, $background-size, $extension: png, $retina-filename: null, $retina-suffix: _2x, $asset-pipeline: false) {
1
+ @mixin retina-image($filename, $background-size, $extension: png, $retina-filename: null, $retina-suffix: _2x, $asset-pipeline: $asset-pipeline) {
2
2
  @if $asset-pipeline {
3
3
  background-image: image-url("#{$filename}.#{$extension}");
4
4
  }
data/app/assets/stylesheets/addons/_size.scss CHANGED
@@ -10,7 +10,7 @@
10
10
  height: $height;
11
11
  }
12
12
 
13
- @if $width == auto or (type-of($height) == number and not unitless($width)) {
13
+ @if $width == auto or (type-of($width) == number and not unitless($width)) {
14
14
  width: $width;
15
15
  }
16
16
  }
data/app/assets/stylesheets/addons/_timing-functions.scss CHANGED
@@ -1,5 +1,5 @@
1
1
  // CSS cubic-bezier timing functions. Timing functions courtesy of jquery.easie (github.com/jaukia/easie)
2
- // Timing functions are the same as demo'ed here: http://jqueryui.com/demos/effect/easing.html
2
+ // Timing functions are the same as demo'ed here: http://jqueryui.com/resources/demos/effect/easing.html
3
3
 
4
4
  // EASE IN
5
5
  $ease-in-quad: cubic-bezier(0.550, 0.085, 0.680, 0.530);
data/app/assets/stylesheets/css3/_font-face.scss CHANGED
@@ -1,6 +1,6 @@
1
1
  // Order of the includes matters, and it is: normal, bold, italic, bold+italic.
2
2
 
3
- @mixin font-face($font-family, $file-path, $weight: normal, $style: normal, $asset-pipeline: false ) {
3
+ @mixin font-face($font-family, $file-path, $weight: normal, $style: normal, $asset-pipeline: $asset-pipeline) {
4
4
  @font-face {
5
5
  font-family: $font-family;
6
6
  font-weight: $weight;
data/app/assets/stylesheets/settings/_asset-pipeline.scss ADDED
@@ -0,0 +1 @@
1
+ $asset-pipeline: false !default;
data/bower.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "bourbon",
3
3
  "homepage": "http://bourbon.io/",
4
- "version": "4.0.1",
4
+ "version": "4.0.2",
5
5
  "main": "dist/_bourbon.scss",
6
6
  "ignore": [
7
7
  "app",
data/dist/_bourbon.scss CHANGED
@@ -1,6 +1,7 @@
1
1
  // Settings
2
2
  @import "settings/prefixer";
3
3
  @import "settings/px-to-em";
4
+ @import "settings/asset-pipeline";
4
5
 
5
6
  // Custom Helpers
6
7
  @import "helpers/convert-units";
data/dist/addons/_retina-image.scss CHANGED
@@ -1,4 +1,4 @@
1
- @mixin retina-image($filename, $background-size, $extension: png, $retina-filename: null, $retina-suffix: _2x, $asset-pipeline: false) {
1
+ @mixin retina-image($filename, $background-size, $extension: png, $retina-filename: null, $retina-suffix: _2x, $asset-pipeline: $asset-pipeline) {
2
2
  @if $asset-pipeline {
3
3
  background-image: image-url("#{$filename}.#{$extension}");
4
4
  }
data/dist/addons/_size.scss CHANGED
@@ -10,7 +10,7 @@
10
10
  height: $height;
11
11
  }
12
12
 
13
- @if $width == auto or (type-of($height) == number and not unitless($width)) {
13
+ @if $width == auto or (type-of($width) == number and not unitless($width)) {
14
14
  width: $width;
15
15
  }
16
16
  }
data/dist/addons/_timing-functions.scss CHANGED
@@ -1,5 +1,5 @@
1
1
  // CSS cubic-bezier timing functions. Timing functions courtesy of jquery.easie (github.com/jaukia/easie)
2
- // Timing functions are the same as demo'ed here: http://jqueryui.com/demos/effect/easing.html
2
+ // Timing functions are the same as demo'ed here: http://jqueryui.com/resources/demos/effect/easing.html
3
3
 
4
4
  // EASE IN
5
5
  $ease-in-quad: cubic-bezier(0.550, 0.085, 0.680, 0.530);
data/dist/css3/_font-face.scss CHANGED
@@ -1,6 +1,6 @@
1
1
  // Order of the includes matters, and it is: normal, bold, italic, bold+italic.
2
2
 
3
- @mixin font-face($font-family, $file-path, $weight: normal, $style: normal, $asset-pipeline: false ) {
3
+ @mixin font-face($font-family, $file-path, $weight: normal, $style: normal, $asset-pipeline: $asset-pipeline) {
4
4
  @font-face {
5
5
  font-family: $font-family;
6
6
  font-weight: $weight;
data/dist/settings/_asset-pipeline.scss ADDED
@@ -0,0 +1 @@
1
+ $asset-pipeline: false !default;
data/lib/bourbon.rb CHANGED
@@ -22,6 +22,7 @@ module Bourbon
22
22
  end
23
23
  end
24
24
  else
25
- Sass.load_paths << File.expand_path("../../app/assets/stylesheets", __FILE__)
25
+ bourbon_path = File.expand_path("../../app/assets/stylesheets", __FILE__)
26
+ ENV["SASS_PATH"] = [ENV["SASS_PATH"], bourbon_path].compact.join(File::PATH_SEPARATOR)
26
27
  end
27
28
  end
data/lib/bourbon/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Bourbon
2
- VERSION = "4.0.1"
2
+ VERSION = "4.0.2"
3
3
  end
data/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "bourbon",
3
- "version": "4.0.1",
3
+ "version": "4.0.2",
4
4
  "description": "A simple and lightweight mixin library for Sass.",
5
5
  "main": "dist/_bourbon.scss",
6
6
  "scripts": {
data/readme.md CHANGED
@@ -4,7 +4,7 @@
4
4
  [![Gem Version](https://badge.fury.io/rb/bourbon.png)](http://badge.fury.io/rb/bourbon) [![Code Climate](https://codeclimate.com/github/thoughtbot/bourbon.png)](https://codeclimate.com/github/thoughtbot/bourbon) [![Gitter chat](https://badges.gitter.im/thoughtbot/bourbon.png)](https://gitter.im/thoughtbot/bourbon)
5
5
 
6
6
  -
7
- :warning: Bourbon **4.0.0** requires Sass **3.3.x**. If you are using **libsass** or **sass-rails** use **3.2.0**.
7
+ :warning: Bourbon **4.0.0** requires Sass **3.3.x**. If you are using **libsass** or **sass-rails** use Bourbon **3.2.x**.
8
8
 
9
9
  ## A lightweight mixin library for Sass
10
10
  Bourbon is a library of pure sass mixins that are designed to be simple
@@ -21,7 +21,7 @@ browsers that support only CSS3 prefixed properties. Bourbon uses SCSS syntax.
21
21
  ### [Documentation & Demo](http://bourbon.io)
22
22
 
23
23
  ### Requirements
24
- Sass 3.2+
24
+ Sass 3.3+
25
25
 
26
26
  ### Install for Rails 3.1+
27
27
  In your Gemfile:
@@ -86,7 +86,7 @@ Visit the [Command line tools wiki](https://github.com/thoughtbot/bourbon/wiki/C
86
86
  ##### [Bourbon v2.x install instructions](https://github.com/thoughtbot/bourbon/wiki/Bourbon-v2.x-or-Rails-2.3-Install)
87
87
 
88
88
 
89
- - [Changelog](https://github.com/thoughtbot/bourbon/wiki)
89
+ - [Changelog](https://github.com/thoughtbot/bourbon/releases)
90
90
  - [Browser support](https://github.com/thoughtbot/bourbon/wiki/Browser-Support)
91
91
 
92
92
  ### Chat with us
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bourbon
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.0.1
4
+ version: 4.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Phil LaPier
@@ -20,62 +20,62 @@ authors:
20
20
  autorequire:
21
21
  bindir: bin
22
22
  cert_chain: []
23
- date: 2014-04-23 00:00:00.000000000 Z
23
+ date: 2014-05-21 00:00:00.000000000 Z
24
24
  dependencies:
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: sass
27
27
  requirement: !ruby/object:Gem::Requirement
28
28
  requirements:
29
- - - "~>"
29
+ - - ~>
30
30
  - !ruby/object:Gem::Version
31
31
  version: '3.3'
32
32
  type: :runtime
33
33
  prerelease: false
34
34
  version_requirements: !ruby/object:Gem::Requirement
35
35
  requirements:
36
- - - "~>"
36
+ - - ~>
37
37
  - !ruby/object:Gem::Version
38
38
  version: '3.3'
39
39
  - !ruby/object:Gem::Dependency
40
40
  name: thor
41
41
  requirement: !ruby/object:Gem::Requirement
42
42
  requirements:
43
- - - ">="
43
+ - - '>='
44
44
  - !ruby/object:Gem::Version
45
45
  version: '0'
46
46
  type: :runtime
47
47
  prerelease: false
48
48
  version_requirements: !ruby/object:Gem::Requirement
49
49
  requirements:
50
- - - ">="
50
+ - - '>='
51
51
  - !ruby/object:Gem::Version
52
52
  version: '0'
53
53
  - !ruby/object:Gem::Dependency
54
54
  name: aruba
55
55
  requirement: !ruby/object:Gem::Requirement
56
56
  requirements:
57
- - - "~>"
57
+ - - ~>
58
58
  - !ruby/object:Gem::Version
59
59
  version: '0.4'
60
60
  type: :development
61
61
  prerelease: false
62
62
  version_requirements: !ruby/object:Gem::Requirement
63
63
  requirements:
64
- - - "~>"
64
+ - - ~>
65
65
  - !ruby/object:Gem::Version
66
66
  version: '0.4'
67
67
  - !ruby/object:Gem::Dependency
68
68
  name: rake
69
69
  requirement: !ruby/object:Gem::Requirement
70
70
  requirements:
71
- - - ">="
71
+ - - '>='
72
72
  - !ruby/object:Gem::Version
73
73
  version: '0'
74
74
  type: :development
75
75
  prerelease: false
76
76
  version_requirements: !ruby/object:Gem::Requirement
77
77
  requirements:
78
- - - ">="
78
+ - - '>='
79
79
  - !ruby/object:Gem::Version
80
80
  version: '0'
81
81
  description: |
@@ -92,8 +92,8 @@ executables:
92
92
  extensions: []
93
93
  extra_rdoc_files: []
94
94
  files:
95
- - ".gitignore"
96
- - ".npmignore"
95
+ - .gitignore
96
+ - .npmignore
97
97
  - Gemfile
98
98
  - Gemfile.lock
99
99
  - LICENSE
@@ -164,6 +164,7 @@ files:
164
164
  - app/assets/stylesheets/helpers/_render-gradients.scss
165
165
  - app/assets/stylesheets/helpers/_shape-size-stripper.scss
166
166
  - app/assets/stylesheets/helpers/_str-to-num.scss
167
+ - app/assets/stylesheets/settings/_asset-pipeline.scss
167
168
  - app/assets/stylesheets/settings/_prefixer.scss
168
169
  - app/assets/stylesheets/settings/_px-to-em.scss
169
170
  - bin/bourbon
@@ -235,6 +236,7 @@ files:
235
236
  - dist/helpers/_render-gradients.scss
236
237
  - dist/helpers/_shape-size-stripper.scss
237
238
  - dist/helpers/_str-to-num.scss
239
+ - dist/settings/_asset-pipeline.scss
238
240
  - dist/settings/_prefixer.scss
239
241
  - dist/settings/_px-to-em.scss
240
242
  - features/install.feature
@@ -260,12 +262,12 @@ require_paths:
260
262
  - lib
261
263
  required_ruby_version: !ruby/object:Gem::Requirement
262
264
  requirements:
263
- - - ">="
265
+ - - '>='
264
266
  - !ruby/object:Gem::Version
265
267
  version: '0'
266
268
  required_rubygems_version: !ruby/object:Gem::Requirement
267
269
  requirements:
268
- - - ">="
270
+ - - '>='
269
271
  - !ruby/object:Gem::Version
270
272
  version: '0'
271
273
  requirements: []