bourbon 5.0.0.beta.4 → 5.0.0.beta.5

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 (11) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +16 -1
  3. data/bower.json +1 -1
  4. data/core/_bourbon.scss +1 -1
  5. data/core/bourbon/library/_font-face.scss +2 -2
  6. data/lib/bourbon.rb +4 -1
  7. data/lib/bourbon/version.rb +1 -1
  8. data/package.json +1 -1
  9. data/spec/fixtures/library/font-face-3.scss +2 -2
  10. data/spec/fixtures/library/font-face-4.scss +1 -1
  11. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 178580e1dd1d1567bcc3b6cdde059452f740cdf9
4
- data.tar.gz: 55978441ae0c6251445b8720e524487a3e73dbbc
3
+ metadata.gz: bbcabb0de4099a8e82cae3ba0717c5067ef6d5bc
4
+ data.tar.gz: 23332a525fafb6e5b2febf8272829d6dbbc95a13
5
5
  SHA512:
6
- metadata.gz: 7e910047d448437ce4b80bdf6af9cf9cba77dcb359617ade8ef3b0507a6145be30699b0d360e72cd36ad498b7286375010c0bd8afbfc8649210530e32c275094
7
- data.tar.gz: 0535edd5b7f1329ceb49f66060b2c4ef418b1a961dc77e23fb53aad912be57d7656798094bab3913a6285d9bad5150ee52d329b34f368e3f65277c6da593a1e1
6
+ metadata.gz: f5ef886f1e4b3b503550a20ceeb3e2183c9c38c6351c32c304298e75d260de4dddfa3ec4b91ec02ec3f63cd984033982080bc063dbafcfaad29da5dfe4f0f751
7
+ data.tar.gz: cf1b84c963502b0c8f5909890a3cd72facc7f82f3100666fa80fd23d9901e26932a6793d3127e203b0ac7f21a34e68adfc51ebf1b85ee7c3412da88eecec5787
data/CHANGELOG.md CHANGED
@@ -5,7 +5,22 @@ project adheres to [Semantic Versioning](http://semver.org).
5
5
 
6
6
  ## [Unreleased]
7
7
 
8
- [Unreleased]: https://github.com/thoughtbot/bourbon/compare/v5.0.0.beta.4...HEAD
8
+ [Unreleased]: https://github.com/thoughtbot/bourbon/compare/v5.0.0.beta.5...HEAD
9
+
10
+ ## [5.0.0-beta.5] - 2016-03-23
11
+
12
+ ### Fixed
13
+
14
+ - Fixed a Sass load path issue that would intermittently break the importing of
15
+ Bourbon in Rails apps.
16
+
17
+ ### Changed
18
+
19
+ - Swapped the order of the `$file-formats` and `$asset-pipeline` arguments in
20
+ the `font-face` mixin, so that `$asset-pipeline` is last (because it has a
21
+ default and is likely used the least).
22
+
23
+ [5.0.0-beta.5]: https://github.com/thoughtbot/bourbon/compare/v5.0.0.beta.4...v5.0.0.beta.5
9
24
 
10
25
  ## [5.0.0-beta.4] - 2016-03-11
11
26
 
data/bower.json CHANGED
@@ -34,5 +34,5 @@
34
34
  "type": "git",
35
35
  "url": "https://github.com/thoughtbot/bourbon.git"
36
36
  },
37
- "version": "5.0.0-beta.4"
37
+ "version": "5.0.0-beta.5"
38
38
  }
data/core/_bourbon.scss CHANGED
@@ -1,4 +1,4 @@
1
- // Bourbon 5.0.0-beta.4
1
+ // Bourbon 5.0.0-beta.5
2
2
  // http://bourbon.io
3
3
  // Copyright 2011 thoughtbot, inc.
4
4
  // MIT License
data/core/bourbon/library/_font-face.scss CHANGED
@@ -43,8 +43,8 @@
43
43
  @mixin font-face(
44
44
  $font-family,
45
45
  $file-path,
46
- $asset-pipeline: _bourbon-get-setting("rails-asset-pipeline"),
47
- $file-formats: _bourbon-get-setting("global-font-file-formats")
46
+ $file-formats: _bourbon-get-setting("global-font-file-formats"),
47
+ $asset-pipeline: _bourbon-get-setting("rails-asset-pipeline")
48
48
  ) {
49
49
 
50
50
  @font-face {
data/lib/bourbon.rb CHANGED
@@ -1,4 +1,7 @@
1
1
  require "bourbon/generator"
2
2
 
3
3
  bourbon_path = File.expand_path("../../core", __FILE__)
4
- ENV["SASS_PATH"] = File.join([ENV["SASS_PATH"], bourbon_path].compact)
4
+ ENV["SASS_PATH"] = [
5
+ ENV["SASS_PATH"],
6
+ bourbon_path,
7
+ ].compact.join(File::PATH_SEPARATOR)
data/lib/bourbon/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Bourbon
2
- VERSION = "5.0.0.beta.4"
2
+ VERSION = "5.0.0.beta.5"
3
3
  end
data/package.json CHANGED
@@ -29,5 +29,5 @@
29
29
  "scripts": {
30
30
  "test": "bundle exec rake"
31
31
  },
32
- "version": "5.0.0-beta.4"
32
+ "version": "5.0.0-beta.5"
33
33
  }
data/spec/fixtures/library/font-face-3.scss CHANGED
@@ -3,6 +3,6 @@
3
3
  @include font-face(
4
4
  "pitch",
5
5
  "/fonts/pitch",
6
- true,
7
- "woff2"
6
+ "woff2",
7
+ $asset-pipeline: true
8
8
  );
data/spec/fixtures/library/font-face-4.scss CHANGED
@@ -3,5 +3,5 @@
3
3
  @include font-face(
4
4
  "circular",
5
5
  "/circular",
6
- $file-formats: ("woff2", "svg")
6
+ ("woff2", "svg")
7
7
  );
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: 5.0.0.beta.4
4
+ version: 5.0.0.beta.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Christian Reuter
@@ -17,7 +17,7 @@ authors:
17
17
  autorequire:
18
18
  bindir: bin
19
19
  cert_chain: []
20
- date: 2016-03-11 00:00:00.000000000 Z
20
+ date: 2016-03-23 00:00:00.000000000 Z
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency
23
23
  name: aruba