bourbon 5.0.0.beta.7 → 5.0.0.beta.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (42) hide show
  1. checksums.yaml +4 -4
  2. data/.npmignore +3 -1
  3. data/.ruby-version +1 -1
  4. data/.scss-lint.yml +4 -0
  5. data/CHANGELOG.md +145 -5
  6. data/CONTRIBUTING.md +24 -2
  7. data/LICENSE.md +1 -1
  8. data/README.md +64 -66
  9. data/RELEASING.md +7 -6
  10. data/bourbon.gemspec +6 -6
  11. data/bower.json +8 -7
  12. data/circle.yml +4 -1
  13. data/core/_bourbon.scss +3 -3
  14. data/core/bourbon/library/_contrast-switch.scss +5 -6
  15. data/core/bourbon/library/_ellipsis.scss +3 -4
  16. data/core/bourbon/library/_font-face.scss +10 -11
  17. data/core/bourbon/library/_hide-visually.scss +8 -5
  18. data/core/bourbon/library/_modular-scale.scss +5 -6
  19. data/core/bourbon/library/_position.scss +3 -5
  20. data/core/bourbon/library/_prefixer.scss +4 -5
  21. data/core/bourbon/library/_shade.scss +3 -4
  22. data/core/bourbon/library/_size.scss +3 -4
  23. data/core/bourbon/library/_tint.scss +3 -4
  24. data/core/bourbon/library/_triangle.scss +16 -16
  25. data/core/bourbon/library/_value-prefixer.scss +4 -5
  26. data/core/bourbon/utilities/_assign-inputs.scss +3 -4
  27. data/core/bourbon/utilities/_directional-property.scss +4 -5
  28. data/core/bourbon/utilities/{_retrieve-bourbon-setting.scss → _fetch-bourbon-setting.scss} +2 -2
  29. data/core/bourbon/utilities/_font-source-declaration.scss +5 -6
  30. data/core/bourbon/validators/_contains.scss +3 -4
  31. data/lib/bourbon.rb +2 -5
  32. data/lib/bourbon/generator.rb +1 -1
  33. data/lib/bourbon/version.rb +1 -1
  34. data/package.json +2 -1
  35. data/spec/bourbon/library/hide_visually_spec.rb +1 -1
  36. data/spec/bourbon/library/triangle_spec.rb +6 -6
  37. data/spec/bourbon/utilities/{retrieve_bourbon_setting_spec.rb → fetch_bourbon_setting_spec.rb} +4 -4
  38. data/spec/fixtures/library/font-face-2.scss +3 -3
  39. data/spec/fixtures/library/hide-visually.scss +1 -1
  40. data/spec/fixtures/library/triangle.scss +4 -4
  41. data/spec/fixtures/utilities/{retrieve-bourbon-setting.scss → fetch-bourbon-setting.scss} +2 -2
  42. metadata +20 -20
@@ -19,12 +19,11 @@
19
19
  /// @access private
20
20
 
21
21
  @function _font-source-declaration(
22
- $font-family,
23
- $file-path,
24
- $asset-pipeline,
25
- $file-formats
26
- ) {
27
-
22
+ $font-family,
23
+ $file-path,
24
+ $asset-pipeline,
25
+ $file-formats
26
+ ) {
28
27
  $src: ();
29
28
 
30
29
  $formats-map: (
@@ -13,10 +13,9 @@
13
13
  /// @access private
14
14
 
15
15
  @function _contains(
16
- $list,
17
- $values...
18
- ) {
19
-
16
+ $list,
17
+ $values...
18
+ ) {
20
19
  @each $value in $values {
21
20
  @if type-of(index($list, $value)) != "number" {
22
21
  @return false;
@@ -1,7 +1,4 @@
1
+ require "sass"
1
2
  require "bourbon/generator"
2
3
 
3
- bourbon_path = File.expand_path("../../core", __FILE__)
4
- ENV["SASS_PATH"] = [
5
- ENV["SASS_PATH"],
6
- bourbon_path,
7
- ].compact.join(File::PATH_SEPARATOR)
4
+ Sass.load_paths << File.expand_path("../../core", __FILE__)
@@ -55,7 +55,7 @@ module Bourbon
55
55
  end
56
56
 
57
57
  def remove_bourbon_directory
58
- FileUtils.rm_rf("bourbon")
58
+ FileUtils.rm_rf(install_path)
59
59
  end
60
60
 
61
61
  def make_install_directory
@@ -1,3 +1,3 @@
1
1
  module Bourbon
2
- VERSION = "5.0.0.beta.7"
2
+ VERSION = "5.0.0.beta.8"
3
3
  end
@@ -21,6 +21,7 @@
21
21
  ],
22
22
  "license": "MIT",
23
23
  "main": "index.js",
24
+ "style": "core/_bourbon.scss",
24
25
  "name": "bourbon",
25
26
  "repository": {
26
27
  "type": "git",
@@ -29,5 +30,5 @@
29
30
  "scripts": {
30
31
  "test": "bundle exec rake"
31
32
  },
32
- "version": "5.0.0-beta.7"
33
+ "version": "5.0.0-beta.8"
33
34
  }
@@ -9,7 +9,7 @@ describe "hide-visually" do
9
9
  it "adds properties to hide the element" do
10
10
  ruleset = "border: 0; " +
11
11
  "clip: rect(1px, 1px, 1px, 1px); " +
12
- "clip-path: circle(1% at 1% 1%); " +
12
+ "clip-path: inset(100%); " +
13
13
  "height: 1px; " +
14
14
  "overflow: hidden; " +
15
15
  "padding: 0; " +
@@ -10,10 +10,10 @@ describe "triangle" do
10
10
  ruleset = "border-style: solid; " +
11
11
  "height: 0; " +
12
12
  "width: 0; " +
13
- "border-color: transparent transparent currentColor; " +
14
- "border-width: 0 0.5rem 0.5rem;"
13
+ "border-color: transparent transparent #b25c9c; " +
14
+ "border-width: 0 1rem 1rem;"
15
15
 
16
- expect(".triangle").to have_ruleset(ruleset)
16
+ expect(".triangle--up").to have_ruleset(ruleset)
17
17
  end
18
18
  end
19
19
 
@@ -22,10 +22,10 @@ describe "triangle" do
22
22
  ruleset = "border-style: solid; " +
23
23
  "height: 0; " +
24
24
  "width: 0; " +
25
- "border-color: #b25c9c transparent transparent; " +
26
- "border-width: 20px 15px 0;"
25
+ "border-color: transparent transparent transparent #aaa; " +
26
+ "border-width: 6px 0 6px 5px;"
27
27
 
28
- expect(".triangle--with-arguments").to have_ruleset(ruleset)
28
+ expect(".triangle--right").to have_ruleset(ruleset)
29
29
  end
30
30
  end
31
31
  end
@@ -1,17 +1,17 @@
1
1
  require "spec_helper"
2
2
 
3
- describe "_retrieve-bourbon-setting" do
3
+ describe "fetch-bourbon-setting" do
4
4
  before(:all) do
5
- ParserSupport.parse_file("utilities/retrieve-bourbon-setting")
5
+ ParserSupport.parse_file("utilities/fetch-bourbon-setting")
6
6
  end
7
7
 
8
- context "gets the modular-scale-base setting" do
8
+ context "fetches the modular-scale-base setting" do
9
9
  it "and returns the default value" do
10
10
  expect(".test-1").to have_rule("content: 1em")
11
11
  end
12
12
  end
13
13
 
14
- context "gets the rails-asset-pipeline setting" do
14
+ context "fetches the rails-asset-pipeline setting" do
15
15
  it "and returns the user-overridden value" do
16
16
  expect(".test-2").to have_rule("content: true")
17
17
  end
@@ -1,9 +1,9 @@
1
1
  @import "setup";
2
2
 
3
3
  @include font-face(
4
- "calibre",
5
- "fonts/calibre"
6
- ) {
4
+ "calibre",
5
+ "fonts/calibre"
6
+ ) {
7
7
  font-style: normal;
8
8
  font-weight: 600;
9
9
  unicode-range: U+26;
@@ -5,5 +5,5 @@
5
5
  }
6
6
 
7
7
  .hide-visually--unhide {
8
- @include hide-visually(unhide);
8
+ @include hide-visually("unhide");
9
9
  }
@@ -1,9 +1,9 @@
1
1
  @import "setup";
2
2
 
3
- .triangle {
4
- @include triangle;
3
+ .triangle--up {
4
+ @include triangle("up", 2rem, 1rem, #b25c9c);
5
5
  }
6
6
 
7
- .triangle--with-arguments {
8
- @include triangle(down, #b25c9c, 30px, 20px);
7
+ .triangle--right {
8
+ @include triangle("right", 5px, 12px, #aaa);
9
9
  }
@@ -6,11 +6,11 @@ $bourbon: (
6
6
  );
7
7
 
8
8
  .test-1 {
9
- content: _retrieve-bourbon-setting("modular-scale-base");
9
+ content: _fetch-bourbon-setting("modular-scale-base");
10
10
  }
11
11
 
12
12
  .test-2 {
13
- content: _retrieve-bourbon-setting("rails-asset-pipeline");
13
+ content: _fetch-bourbon-setting("rails-asset-pipeline");
14
14
  }
15
15
 
16
16
  @include font-face("source-sans-pro", "source-sans-pro-regular");
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.7
4
+ version: 5.0.0.beta.8
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-11-03 00:00:00.000000000 Z
20
+ date: 2017-06-26 00:00:00.000000000 Z
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency
23
23
  name: aruba
@@ -39,84 +39,84 @@ dependencies:
39
39
  requirements:
40
40
  - - "~>"
41
41
  - !ruby/object:Gem::Version
42
- version: 1.4.1
42
+ version: '1.4'
43
43
  type: :development
44
44
  prerelease: false
45
45
  version_requirements: !ruby/object:Gem::Requirement
46
46
  requirements:
47
47
  - - "~>"
48
48
  - !ruby/object:Gem::Version
49
- version: 1.4.1
49
+ version: '1.4'
50
50
  - !ruby/object:Gem::Dependency
51
51
  name: rake
52
52
  requirement: !ruby/object:Gem::Requirement
53
53
  requirements:
54
54
  - - "~>"
55
55
  - !ruby/object:Gem::Version
56
- version: 11.1.2
56
+ version: '11.1'
57
57
  type: :development
58
58
  prerelease: false
59
59
  version_requirements: !ruby/object:Gem::Requirement
60
60
  requirements:
61
61
  - - "~>"
62
62
  - !ruby/object:Gem::Version
63
- version: 11.1.2
63
+ version: '11.1'
64
64
  - !ruby/object:Gem::Dependency
65
65
  name: rspec
66
66
  requirement: !ruby/object:Gem::Requirement
67
67
  requirements:
68
68
  - - "~>"
69
69
  - !ruby/object:Gem::Version
70
- version: 3.4.0
70
+ version: '3.4'
71
71
  type: :development
72
72
  prerelease: false
73
73
  version_requirements: !ruby/object:Gem::Requirement
74
74
  requirements:
75
75
  - - "~>"
76
76
  - !ruby/object:Gem::Version
77
- version: 3.4.0
77
+ version: '3.4'
78
78
  - !ruby/object:Gem::Dependency
79
79
  name: scss_lint
80
80
  requirement: !ruby/object:Gem::Requirement
81
81
  requirements:
82
82
  - - '='
83
83
  - !ruby/object:Gem::Version
84
- version: 0.48.0
84
+ version: '0.48'
85
85
  type: :development
86
86
  prerelease: false
87
87
  version_requirements: !ruby/object:Gem::Requirement
88
88
  requirements:
89
89
  - - '='
90
90
  - !ruby/object:Gem::Version
91
- version: 0.48.0
91
+ version: '0.48'
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: sass
94
94
  requirement: !ruby/object:Gem::Requirement
95
95
  requirements:
96
96
  - - "~>"
97
97
  - !ruby/object:Gem::Version
98
- version: 3.4.22
98
+ version: '3.4'
99
99
  type: :runtime
100
100
  prerelease: false
101
101
  version_requirements: !ruby/object:Gem::Requirement
102
102
  requirements:
103
103
  - - "~>"
104
104
  - !ruby/object:Gem::Version
105
- version: 3.4.22
105
+ version: '3.4'
106
106
  - !ruby/object:Gem::Dependency
107
107
  name: thor
108
108
  requirement: !ruby/object:Gem::Requirement
109
109
  requirements:
110
110
  - - "~>"
111
111
  - !ruby/object:Gem::Version
112
- version: 0.19.1
112
+ version: '0.19'
113
113
  type: :runtime
114
114
  prerelease: false
115
115
  version_requirements: !ruby/object:Gem::Requirement
116
116
  requirements:
117
117
  - - "~>"
118
118
  - !ruby/object:Gem::Version
119
- version: 0.19.1
119
+ version: '0.19'
120
120
  description: |2
121
121
  Bourbon is a library of pure Sass mixins and functions that are designed to
122
122
  make you a more efficient developer.
@@ -179,10 +179,10 @@ files:
179
179
  - core/bourbon/utilities/_compact-shorthand.scss
180
180
  - core/bourbon/utilities/_contrast-ratio.scss
181
181
  - core/bourbon/utilities/_directional-property.scss
182
+ - core/bourbon/utilities/_fetch-bourbon-setting.scss
182
183
  - core/bourbon/utilities/_font-source-declaration.scss
183
184
  - core/bourbon/utilities/_gamma.scss
184
185
  - core/bourbon/utilities/_lightness.scss
185
- - core/bourbon/utilities/_retrieve-bourbon-setting.scss
186
186
  - core/bourbon/utilities/_unpack-shorthand.scss
187
187
  - core/bourbon/validators/_contains-falsy.scss
188
188
  - core/bourbon/validators/_contains.scss
@@ -232,8 +232,8 @@ files:
232
232
  - spec/bourbon/utilities/assign_inputs_spec.rb
233
233
  - spec/bourbon/utilities/compact_shorthand_spec.rb
234
234
  - spec/bourbon/utilities/directional_property_spec.rb
235
+ - spec/bourbon/utilities/fetch_bourbon_setting_spec.rb
235
236
  - spec/bourbon/utilities/font_source_declaration_spec.rb
236
- - spec/bourbon/utilities/retrieve_bourbon_setting_spec.rb
237
237
  - spec/bourbon/utilities/unpack_spec.rb
238
238
  - spec/bourbon/validators/contains_spec.rb
239
239
  - spec/bourbon/validators/is_length_spec.rb
@@ -270,8 +270,8 @@ files:
270
270
  - spec/fixtures/utilities/assign-inputs.scss
271
271
  - spec/fixtures/utilities/compact-shorthand.scss
272
272
  - spec/fixtures/utilities/directional-property.scss
273
+ - spec/fixtures/utilities/fetch-bourbon-setting.scss
273
274
  - spec/fixtures/utilities/font-source-declaration.scss
274
- - spec/fixtures/utilities/retrieve-bourbon-setting.scss
275
275
  - spec/fixtures/utilities/unpack.scss
276
276
  - spec/fixtures/validators/contains.scss
277
277
  - spec/fixtures/validators/is-length.scss
@@ -303,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
303
303
  version: 1.3.1
304
304
  requirements: []
305
305
  rubyforge_project:
306
- rubygems_version: 2.5.2
306
+ rubygems_version: 2.6.12
307
307
  signing_key:
308
308
  specification_version: 4
309
309
  summary: A lightweight Sass tool set.
@@ -344,8 +344,8 @@ test_files:
344
344
  - spec/bourbon/utilities/assign_inputs_spec.rb
345
345
  - spec/bourbon/utilities/compact_shorthand_spec.rb
346
346
  - spec/bourbon/utilities/directional_property_spec.rb
347
+ - spec/bourbon/utilities/fetch_bourbon_setting_spec.rb
347
348
  - spec/bourbon/utilities/font_source_declaration_spec.rb
348
- - spec/bourbon/utilities/retrieve_bourbon_setting_spec.rb
349
349
  - spec/bourbon/utilities/unpack_spec.rb
350
350
  - spec/bourbon/validators/contains_spec.rb
351
351
  - spec/bourbon/validators/is_length_spec.rb
@@ -382,8 +382,8 @@ test_files:
382
382
  - spec/fixtures/utilities/assign-inputs.scss
383
383
  - spec/fixtures/utilities/compact-shorthand.scss
384
384
  - spec/fixtures/utilities/directional-property.scss
385
+ - spec/fixtures/utilities/fetch-bourbon-setting.scss
385
386
  - spec/fixtures/utilities/font-source-declaration.scss
386
- - spec/fixtures/utilities/retrieve-bourbon-setting.scss
387
387
  - spec/fixtures/utilities/unpack.scss
388
388
  - spec/fixtures/validators/contains.scss
389
389
  - spec/fixtures/validators/is-length.scss