bourbon 4.1.1 → 4.2.0.beta

Sign up to get free protection for your applications and to get access to all the features.
Files changed (107) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +4 -3
  3. data/.hound.yml +4 -0
  4. data/.npmignore +5 -2
  5. data/.scss-lint.yml +175 -0
  6. data/README.md +7 -12
  7. data/Rakefile +6 -4
  8. data/app/assets/stylesheets/_bourbon-deprecated-upcoming.scss +16 -7
  9. data/app/assets/stylesheets/_bourbon.scss +27 -26
  10. data/app/assets/stylesheets/addons/_border-color.scss +26 -0
  11. data/app/assets/stylesheets/addons/_border-radius.scss +48 -0
  12. data/app/assets/stylesheets/addons/_border-style.scss +25 -0
  13. data/app/assets/stylesheets/addons/_border-width.scss +25 -0
  14. data/app/assets/stylesheets/addons/_buttons.scss +64 -0
  15. data/app/assets/stylesheets/addons/_clearfix.scss +17 -10
  16. data/app/assets/stylesheets/addons/_ellipsis.scss +22 -0
  17. data/app/assets/stylesheets/addons/{_font-family.scss → _font-stacks.scss} +26 -0
  18. data/app/assets/stylesheets/addons/_hide-text.scss +23 -8
  19. data/app/assets/stylesheets/addons/_margin.scss +26 -0
  20. data/app/assets/stylesheets/addons/_padding.scss +26 -0
  21. data/app/assets/stylesheets/addons/_position.scss +24 -2
  22. data/app/assets/stylesheets/addons/_prefixer.scss +36 -15
  23. data/app/assets/stylesheets/addons/_size.scss +30 -1
  24. data/app/assets/stylesheets/addons/_text-inputs.scss +112 -0
  25. data/app/assets/stylesheets/addons/_timing-functions.scss +7 -5
  26. data/app/assets/stylesheets/addons/_triangle.scss +11 -11
  27. data/app/assets/stylesheets/addons/_word-wrap.scss +19 -0
  28. data/app/assets/stylesheets/css3/_animation.scss +14 -23
  29. data/app/assets/stylesheets/css3/_appearance.scss +1 -1
  30. data/app/assets/stylesheets/css3/_backface-visibility.scss +0 -3
  31. data/app/assets/stylesheets/css3/_background-image.scss +1 -1
  32. data/app/assets/stylesheets/css3/_background.scss +3 -3
  33. data/app/assets/stylesheets/css3/_border-image.scss +3 -3
  34. data/app/assets/stylesheets/css3/_calc.scss +1 -1
  35. data/app/assets/stylesheets/css3/_columns.scss +8 -8
  36. data/app/assets/stylesheets/css3/_filter.scss +0 -1
  37. data/app/assets/stylesheets/css3/_flex-box.scss +16 -47
  38. data/app/assets/stylesheets/css3/_font-feature-settings.scss +1 -7
  39. data/app/assets/stylesheets/css3/_hyphens.scss +2 -2
  40. data/app/assets/stylesheets/css3/_image-rendering.scss +6 -6
  41. data/app/assets/stylesheets/css3/_keyframes.scss +1 -0
  42. data/app/assets/stylesheets/css3/_linear-gradient.scss +11 -11
  43. data/app/assets/stylesheets/css3/_radial-gradient.scss +14 -14
  44. data/app/assets/stylesheets/css3/_selection.scss +39 -11
  45. data/app/assets/stylesheets/css3/_transform.scss +5 -5
  46. data/app/assets/stylesheets/css3/_transition.scss +17 -23
  47. data/app/assets/stylesheets/css3/_user-select.scss +2 -2
  48. data/app/assets/stylesheets/functions/{_assign.scss → _assign-inputs.scss} +2 -2
  49. data/app/assets/stylesheets/functions/_contains-falsy.scss +20 -0
  50. data/app/assets/stylesheets/functions/_contains.scss +16 -2
  51. data/app/assets/stylesheets/functions/_is-length.scss +5 -1
  52. data/app/assets/stylesheets/functions/_is-light.scss +21 -0
  53. data/app/assets/stylesheets/functions/_is-number.scss +11 -0
  54. data/app/assets/stylesheets/functions/_is-size.scss +8 -1
  55. data/app/assets/stylesheets/functions/_px-to-em.scss +2 -2
  56. data/app/assets/stylesheets/functions/_px-to-rem.scss +2 -2
  57. data/app/assets/stylesheets/functions/_shade.scss +24 -0
  58. data/app/assets/stylesheets/functions/_strip-units.scss +15 -3
  59. data/app/assets/stylesheets/functions/_tint.scss +24 -0
  60. data/app/assets/stylesheets/functions/_transition-property-name.scss +14 -14
  61. data/app/assets/stylesheets/functions/_unpack.scss +18 -8
  62. data/app/assets/stylesheets/helpers/_convert-units.scss +2 -2
  63. data/app/assets/stylesheets/helpers/_directional-values.scss +96 -0
  64. data/app/assets/stylesheets/helpers/_font-source-declaration.scss +2 -1
  65. data/app/assets/stylesheets/helpers/_linear-gradient-parser.scss +1 -1
  66. data/app/assets/stylesheets/helpers/_linear-positions-parser.scss +1 -1
  67. data/app/assets/stylesheets/helpers/_radial-arg-parser.scss +10 -10
  68. data/app/assets/stylesheets/helpers/_radial-gradient-parser.scss +4 -4
  69. data/app/assets/stylesheets/helpers/_radial-positions-parser.scss +2 -2
  70. data/app/assets/stylesheets/helpers/_str-to-num.scss +3 -3
  71. data/app/assets/stylesheets/settings/_asset-pipeline.scss +6 -0
  72. data/app/assets/stylesheets/settings/_prefixer.scss +5 -2
  73. data/bourbon.gemspec +4 -2
  74. data/bower.json +8 -6
  75. data/lib/bourbon/version.rb +1 -1
  76. data/package.json +1 -1
  77. data/spec/bourbon/functions/assign_inputs_spec.rb +50 -0
  78. data/spec/bourbon/functions/contains_spec.rb +27 -0
  79. data/spec/bourbon/functions/is_length_spec.rb +49 -0
  80. data/spec/bourbon/functions/is_light_spec.rb +37 -0
  81. data/spec/bourbon/functions/is_number_spec.rb +43 -0
  82. data/spec/bourbon/functions/is_size_spec.rb +43 -0
  83. data/spec/bourbon/functions/modular_scale_spec.rb +43 -0
  84. data/spec/bourbon/functions/px_to_em_spec.rb +31 -0
  85. data/spec/fixtures/_setup.scss +1 -0
  86. data/spec/fixtures/functions/assign-inputs.scss +19 -0
  87. data/spec/fixtures/functions/contains.scss +28 -0
  88. data/spec/fixtures/functions/is-length.scss +35 -0
  89. data/spec/fixtures/functions/is-light.scss +29 -0
  90. data/spec/fixtures/functions/is-number.scss +31 -0
  91. data/spec/fixtures/functions/is-size.scss +31 -0
  92. data/spec/fixtures/functions/modular-scale.scss +29 -0
  93. data/spec/fixtures/functions/px-to-em.scss +17 -0
  94. data/spec/spec_helper.rb +22 -0
  95. data/spec/support/matchers/be_contained_in.rb +10 -0
  96. data/spec/support/matchers/have_rule.rb +35 -0
  97. data/spec/support/matchers/have_value.rb +15 -0
  98. data/spec/support/parser_support.rb +16 -0
  99. data/spec/support/sass_support.rb +10 -0
  100. metadata +102 -19
  101. data/app/assets/stylesheets/addons/_directional-values.scss +0 -111
  102. data/app/assets/stylesheets/addons/_html5-input-types.scss +0 -90
  103. data/app/assets/stylesheets/css3/_border-radius.scss +0 -22
  104. data/app/assets/stylesheets/css3/_box-sizing.scss +0 -4
  105. data/app/assets/stylesheets/functions/_color-lightness.scss +0 -13
  106. data/app/assets/stylesheets/functions/_tint-shade.scss +0 -9
  107. data/app/assets/stylesheets/helpers/_is-num.scss +0 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 34af2723961b9a89e6513f9b89be85dcddc1ce9a
4
- data.tar.gz: 59153423a0c8950509e9330781dc52cc32d2792d
3
+ metadata.gz: 228db06896071d80380816a05898acb9ab858a01
4
+ data.tar.gz: c00cfbd1aa1b4d343558a986e22dfa3ba4ca3e10
5
5
  SHA512:
6
- metadata.gz: c9d9e1f7ea4dbd6edd16ef0f1d30e2488a9ba271a704e1326d63a810b5b573bc74f58ae7c5c518542447c8a89b8b25d35e6e9a8502e77c92773787c119ad5c7e
7
- data.tar.gz: 483a2be7af0498b89d3497bff4825e9f80692533b2c1e12155869d3074b0e47682ded577d3b12a647ee643fc15853eb529a9e668a325038ff3607d81ab38db0b
6
+ metadata.gz: 90f32776233e6fc0b262661b7a54840fccc1da05bf2a4f293cebc26c31c46840f716ea3d9238b7a4a93ce114d568c2e51dd3d3913e2ac1fb9a8a998b211a98fc
7
+ data.tar.gz: 7cda595c98807dc7827576ede093f2cd2aed37ff3d6114f2aefdea3715ace0be962f2bb92549ebe334d9642026d4294b164e0e1104d330de5c7864c09ef12c02
data/.gitignore CHANGED
@@ -1,7 +1,8 @@
1
- _site
2
- .DS_store
3
- .sass-cache
4
1
  *gem
5
2
  *swp
3
+ .DS_store
4
+ .sass-cache
5
+ _site
6
6
  Gemfile.lock
7
+ npm-debug.log
7
8
  tmp
@@ -0,0 +1,4 @@
1
+ ruby:
2
+ enabled: true
3
+ scss:
4
+ enabled: true
data/.npmignore CHANGED
@@ -1,12 +1,15 @@
1
1
  .gitignore
2
+ .hound.yml
3
+ _site
2
4
  app/
3
5
  bin/
4
6
  bourbon.gemspec
5
7
  bower.json
6
8
  CONTRIBUTING.md
7
9
  features/
8
- LICENSE.md
9
- lib/
10
10
  Gemfile
11
11
  Gemfile.lock
12
+ lib/
12
13
  Rakefile
14
+ sache.json
15
+ spec/
@@ -0,0 +1,175 @@
1
+ scss_files: "app/assets/stylesheets/**/*.scss"
2
+
3
+ linters:
4
+ BangFormat:
5
+ enabled: true
6
+ space_before_bang: true
7
+ space_after_bang: false
8
+
9
+ BorderZero:
10
+ enabled: false
11
+
12
+ ColorKeyword:
13
+ enabled: true
14
+ severity: warning
15
+
16
+ Comment:
17
+ enabled: true
18
+
19
+ DebugStatement:
20
+ enabled: true
21
+
22
+ DeclarationOrder:
23
+ enabled: true
24
+
25
+ DuplicateProperty:
26
+ enabled: true
27
+
28
+ ElsePlacement:
29
+ enabled: true
30
+ style: same_line
31
+
32
+ EmptyLineBetweenBlocks:
33
+ enabled: true
34
+ ignore_single_line_blocks: true
35
+
36
+ EmptyRule:
37
+ enabled: true
38
+
39
+ FinalNewline:
40
+ enabled: true
41
+ present: true
42
+
43
+ HexLength:
44
+ enabled: false
45
+ style: short
46
+
47
+ HexNotation:
48
+ enabled: true
49
+ style: lowercase
50
+
51
+ HexValidation:
52
+ enabled: true
53
+
54
+ IdWithExtraneousSelector:
55
+ enabled: true
56
+
57
+ ImportPath:
58
+ enabled: true
59
+ leading_underscore: false
60
+ filename_extension: false
61
+
62
+ Indentation:
63
+ enabled: true
64
+ character: space
65
+ width: 2
66
+
67
+ LeadingZero:
68
+ enabled: true
69
+ style: include_zero
70
+
71
+ MergeableSelector:
72
+ enabled: true
73
+ force_nesting: true
74
+
75
+ NameFormat:
76
+ enabled: true
77
+ convention: hyphenated_lowercase
78
+
79
+ NestingDepth:
80
+ enabled: true
81
+ max_depth: 4
82
+ severity: warning
83
+
84
+ PlaceholderInExtend:
85
+ enabled: false
86
+
87
+ PropertySortOrder:
88
+ enabled: true
89
+ ignore_unspecified: false
90
+ severity: warning
91
+
92
+ PropertySpelling:
93
+ enabled: true
94
+ extra_properties: []
95
+
96
+ QualifyingElement:
97
+ enabled: true
98
+ allow_with_attribute: false
99
+ allow_with_class: false
100
+ allow_with_id: false
101
+ severity: warning
102
+
103
+ SelectorDepth:
104
+ enabled: true
105
+ max_depth: 2
106
+ severity: warning
107
+
108
+ SelectorFormat:
109
+ enabled: true
110
+ convention: hyphenated_lowercase
111
+
112
+ Shorthand:
113
+ enabled: true
114
+ severity: warning
115
+
116
+ SingleLinePerProperty:
117
+ enabled: true
118
+ allow_single_line_rule_sets: true
119
+
120
+ SingleLinePerSelector:
121
+ enabled: true
122
+
123
+ SpaceAfterComma:
124
+ enabled: true
125
+
126
+ SpaceAfterPropertyColon:
127
+ enabled: true
128
+ style: one_space
129
+
130
+ SpaceAfterPropertyName:
131
+ enabled: true
132
+
133
+ SpaceBeforeBrace:
134
+ enabled: true
135
+ style: space
136
+ allow_single_line_padding: false
137
+
138
+ SpaceBetweenParens:
139
+ enabled: true
140
+ spaces: 0
141
+
142
+ StringQuotes:
143
+ enabled: true
144
+ style: double_quotes
145
+
146
+ TrailingSemicolon:
147
+ enabled: true
148
+
149
+ TrailingZero:
150
+ enabled: false
151
+
152
+ UnnecessaryMantissa:
153
+ enabled: true
154
+
155
+ UnnecessaryParentReference:
156
+ enabled: true
157
+
158
+ UrlFormat:
159
+ enabled: true
160
+
161
+ UrlQuotes:
162
+ enabled: true
163
+
164
+ VendorPrefixes:
165
+ enabled: true
166
+ identifier_list: bourbon
167
+ include: []
168
+ exclude: []
169
+
170
+ ZeroUnit:
171
+ enabled: true
172
+ severity: warning
173
+
174
+ Compass::*:
175
+ enabled: false
data/README.md CHANGED
@@ -17,8 +17,7 @@ The mixins contain vendor specific prefixes for all CSS3 properties for support
17
17
 
18
18
  ## Requirements
19
19
 
20
- - [Sass](https://github.com/sass/sass) 3.3+
21
- - :warning: If you are using **LibSass**, you need to [use Bourbon 3.2.3](#installing-older-versions-of-bourbon).
20
+ - [Sass](https://github.com/sass/sass) 3.4+ or [LibSass](https://github.com/sass/libsass) 3.1+
22
21
 
23
22
  ## Installation
24
23
 
@@ -72,11 +71,7 @@ For command line help, visit our wiki page on Bourbon’s [command line interfac
72
71
  mv app/assets/stylesheets/application.css app/assets/stylesheets/application.scss
73
72
  ```
74
73
 
75
- 4. Delete the Sprockets directive in `application.scss`:
76
-
77
- ```scss
78
- *= require_tree .
79
- ```
74
+ 4. Delete _all_ Sprockets directives in `application.scss` (`require`, `require_tree` and `require_self`) and use Sass’s native `@import` instead.
80
75
 
81
76
  5. Import Bourbon at the beginning of `application.scss`. All additional stylesheets should be imported below Bourbon:
82
77
 
@@ -99,18 +94,18 @@ For command line help, visit our wiki page on Bourbon’s [command line interfac
99
94
  2. Reinstall the Bourbon gem, using the `-v` flag to specify the version you need:
100
95
 
101
96
  ```bash
102
- gem install bourbon -v 3.2.3
97
+ gem install bourbon -v 3.2.4
103
98
  ```
104
99
 
105
100
  3. Follow the [instructions above](#installation) to install Bourbon into your project.
106
101
 
107
102
  ## Browser support
108
103
 
109
- - Chrome 10.0+
110
- - Firefox 3.6+
104
+ - Chrome 26+
105
+ - Firefox 29+
111
106
  - Internet Explorer 9+
112
- - Opera 12+
113
- - Safari 5.1+
107
+ - Opera 15+
108
+ - Safari 6.1+
114
109
 
115
110
  ## The Bourbon family
116
111
 
data/Rakefile CHANGED
@@ -1,9 +1,11 @@
1
1
  # encoding: utf-8
2
- require 'rubygems'
3
- require 'bundler'
4
- require 'cucumber/rake/task'
2
+ require "rubygems"
3
+ require "bundler"
4
+ require "cucumber/rake/task"
5
+ require "rspec/core/rake_task"
5
6
 
6
7
  Bundler::GemHelper.install_tasks
7
8
  Cucumber::Rake::Task.new
9
+ RSpec::Core::RakeTask.new(:spec)
8
10
 
9
- task :default => :cucumber
11
+ task :default => [:spec, :cucumber]
@@ -57,8 +57,8 @@
57
57
  }
58
58
 
59
59
  &:disabled {
60
- opacity: 0.5;
61
60
  cursor: not-allowed;
61
+ opacity: 0.5;
62
62
  }
63
63
 
64
64
  @warn "The button mixin is deprecated and will be removed in the next major version release";
@@ -145,9 +145,10 @@
145
145
  $stop-gradient-hover: grayscale($stop-gradient-hover);
146
146
  }
147
147
 
148
+ @include linear-gradient ($base-color-hover, $stop-gradient-hover);
149
+
148
150
  box-shadow: inset 0 1px 0 0 $inset-shadow-hover;
149
151
  cursor: pointer;
150
- @include linear-gradient ($base-color-hover, $stop-gradient-hover);
151
152
  }
152
153
 
153
154
  &:active:not(:disabled),
@@ -191,6 +192,8 @@
191
192
  $third-stop: grayscale($third-stop);
192
193
  }
193
194
 
195
+ @include linear-gradient(top, $base-color 0%, $second-stop 50%, $third-stop 50%, $fourth-stop 100%);
196
+
194
197
  border: 1px solid $border;
195
198
  border-bottom: 1px solid $border-bottom;
196
199
  border-radius: 5px;
@@ -199,7 +202,6 @@
199
202
  display: inline-block;
200
203
  font-size: $textsize;
201
204
  font-weight: bold;
202
- @include linear-gradient(top, $base-color 0%, $second-stop 50%, $third-stop 50%, $fourth-stop 100%);
203
205
  padding: $padding;
204
206
  text-align: center;
205
207
  text-decoration: none;
@@ -218,11 +220,11 @@
218
220
  $fourth-stop-hover: grayscale($fourth-stop-hover);
219
221
  }
220
222
 
221
- cursor: pointer;
222
223
  @include linear-gradient(top, $first-stop-hover 0%,
223
224
  $second-stop-hover 50%,
224
225
  $third-stop-hover 50%,
225
226
  $fourth-stop-hover 100%);
227
+ cursor: pointer;
226
228
  }
227
229
 
228
230
  &:active:not(:disabled),
@@ -296,13 +298,14 @@
296
298
  $text-shadow-hover: grayscale($text-shadow-hover);
297
299
  }
298
300
 
301
+ @include linear-gradient ($base-color-hover, $stop-gradient-hover);
302
+
303
+ background-clip: padding-box;
299
304
  border: 1px solid $border-top;
300
305
  border-color: $border-top $border-sides $border-bottom;
301
306
  box-shadow: inset 0 1px 0 0 $inset-shadow-hover;
302
307
  cursor: pointer;
303
- @include linear-gradient ($base-color-hover, $stop-gradient-hover);
304
308
  text-shadow: 0 -1px 1px $text-shadow-hover;
305
- background-clip: padding-box;
306
309
  }
307
310
 
308
311
  &:active:not(:disabled),
@@ -339,7 +342,7 @@
339
342
 
340
343
  background-color: $base-color;
341
344
  border-radius: 3px;
342
- border: none;
345
+ border: 0;
343
346
  color: $color;
344
347
  display: inline-block;
345
348
  font-size: $textsize;
@@ -400,3 +403,9 @@
400
403
 
401
404
  @warn "The golden-ratio function is deprecated and will be removed in the next major version release. Please use the modular-scale function, instead.";
402
405
  }
406
+
407
+ @mixin box-sizing($box) {
408
+ @include prefixer(box-sizing, $box, webkit moz spec);
409
+
410
+ @warn "The box-sizing mixin is deprecated and will be removed in the next major version release. This property can now be used un-prefixed.";
411
+ }
@@ -1,18 +1,32 @@
1
- // Bourbon 4.1.1
1
+ // Bourbon 4.2.0.beta
2
2
  // http://bourbon.io
3
3
  // Copyright 2011-2015 thoughtbot, inc.
4
4
  // MIT License
5
5
 
6
- // Settings
7
6
  @import "settings/prefixer";
8
7
  @import "settings/px-to-em";
9
8
  @import "settings/asset-pipeline";
10
9
 
11
- // Custom Helpers
10
+ @import "functions/assign-inputs";
11
+ @import "functions/contains";
12
+ @import "functions/contains-falsy";
13
+ @import "functions/is-length";
14
+ @import "functions/is-light";
15
+ @import "functions/is-number";
16
+ @import "functions/is-size";
17
+ @import "functions/px-to-em";
18
+ @import "functions/px-to-rem";
19
+ @import "functions/shade";
20
+ @import "functions/strip-units";
21
+ @import "functions/tint";
22
+ @import "functions/transition-property-name";
23
+ @import "functions/unpack";
24
+ @import "functions/modular-scale";
25
+
12
26
  @import "helpers/convert-units";
27
+ @import "helpers/directional-values";
13
28
  @import "helpers/font-source-declaration";
14
29
  @import "helpers/gradient-positions-parser";
15
- @import "helpers/is-num";
16
30
  @import "helpers/linear-angle-parser";
17
31
  @import "helpers/linear-gradient-parser";
18
32
  @import "helpers/linear-positions-parser";
@@ -24,29 +38,12 @@
24
38
  @import "helpers/shape-size-stripper";
25
39
  @import "helpers/str-to-num";
26
40
 
27
- // Custom Functions
28
- @import "functions/assign";
29
- @import "functions/color-lightness";
30
- @import "functions/contains";
31
- @import "functions/is-length";
32
- @import "functions/is-size";
33
- @import "functions/px-to-em";
34
- @import "functions/px-to-rem";
35
- @import "functions/strip-units";
36
- @import "functions/tint-shade";
37
- @import "functions/transition-property-name";
38
- @import "functions/unpack";
39
- @import "functions/modular-scale";
40
-
41
- // CSS3 Mixins
42
41
  @import "css3/animation";
43
42
  @import "css3/appearance";
44
43
  @import "css3/backface-visibility";
45
44
  @import "css3/background";
46
45
  @import "css3/background-image";
47
46
  @import "css3/border-image";
48
- @import "css3/border-radius";
49
- @import "css3/box-sizing";
50
47
  @import "css3/calc";
51
48
  @import "css3/columns";
52
49
  @import "css3/filter";
@@ -67,20 +64,24 @@
67
64
  @import "css3/transition";
68
65
  @import "css3/user-select";
69
66
 
70
- // Addons & other mixins
67
+ @import "addons/border-color";
68
+ @import "addons/border-radius";
69
+ @import "addons/border-style";
70
+ @import "addons/border-width";
71
+ @import "addons/buttons";
71
72
  @import "addons/clearfix";
72
- @import "addons/directional-values";
73
73
  @import "addons/ellipsis";
74
- @import "addons/font-family";
74
+ @import "addons/font-stacks";
75
75
  @import "addons/hide-text";
76
- @import "addons/html5-input-types";
76
+ @import "addons/margin";
77
+ @import "addons/padding";
77
78
  @import "addons/position";
78
79
  @import "addons/prefixer";
79
80
  @import "addons/retina-image";
80
81
  @import "addons/size";
82
+ @import "addons/text-inputs";
81
83
  @import "addons/timing-functions";
82
84
  @import "addons/triangle";
83
85
  @import "addons/word-wrap";
84
86
 
85
- // Soon to be deprecated Mixins
86
87
  @import "bourbon-deprecated-upcoming";