bourbon 5.0.0.alpha.0 → 5.0.0.beta.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (116) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -1
  3. data/.npmignore +1 -1
  4. data/.scss-lint.yml +223 -2
  5. data/Gemfile +1 -1
  6. data/LICENSE.md +1 -1
  7. data/NEWS.md +71 -0
  8. data/README.md +43 -24
  9. data/RELEASING.md +27 -0
  10. data/Rakefile +0 -2
  11. data/bin/bourbon +1 -2
  12. data/bourbon.gemspec +33 -24
  13. data/bower.json +3 -2
  14. data/circle.yml +7 -0
  15. data/core/_bourbon.scss +10 -11
  16. data/core/bourbon/addons/_border-color.scss +14 -15
  17. data/core/bourbon/addons/_border-radius.scss +17 -18
  18. data/core/bourbon/addons/_border-style.scss +13 -14
  19. data/core/bourbon/addons/_border-width.scss +13 -14
  20. data/core/bourbon/addons/_buttons.scss +48 -49
  21. data/core/bourbon/addons/_clearfix.scss +10 -10
  22. data/core/bourbon/addons/_contrast-switch.scss +47 -0
  23. data/core/bourbon/addons/_ellipsis.scss +22 -15
  24. data/core/bourbon/addons/_font-face.scss +60 -0
  25. data/core/bourbon/addons/_font-stacks.scss +77 -9
  26. data/core/bourbon/addons/_hide-text.scss +10 -9
  27. data/core/bourbon/addons/_hide-visually.scss +65 -0
  28. data/core/bourbon/addons/_margin.scss +14 -15
  29. data/core/bourbon/addons/_modular-scale.scss +113 -0
  30. data/core/bourbon/addons/_padding.scss +14 -15
  31. data/core/bourbon/addons/_position.scss +24 -19
  32. data/core/bourbon/addons/_prefixer.scss +20 -15
  33. data/core/bourbon/addons/_size.scss +24 -20
  34. data/core/bourbon/addons/_text-inputs.scss +106 -104
  35. data/core/bourbon/addons/_timing-functions.scss +2 -2
  36. data/core/bourbon/addons/_word-wrap.scss +10 -10
  37. data/core/bourbon/functions/_assign-inputs.scss +11 -7
  38. data/core/bourbon/functions/_collapse-directionals.scss +51 -0
  39. data/core/bourbon/functions/_contains-falsy.scss +5 -5
  40. data/core/bourbon/functions/_contains.scss +11 -7
  41. data/core/bourbon/{helpers → functions}/_font-source-declaration.scss +26 -17
  42. data/core/bourbon/functions/_is-length.scss +3 -3
  43. data/core/bourbon/functions/_is-light.scss +2 -2
  44. data/core/bourbon/functions/_is-number.scss +5 -5
  45. data/core/bourbon/functions/_is-size.scss +7 -7
  46. data/core/bourbon/functions/_shade.scss +14 -10
  47. data/core/bourbon/functions/_strip-unit.scss +3 -3
  48. data/core/bourbon/functions/_tint.scss +14 -10
  49. data/core/bourbon/functions/_unpack.scss +10 -10
  50. data/core/bourbon/helpers/_directional-values.scss +19 -59
  51. data/core/bourbon/settings/_bourbon-get-setting.scss +14 -0
  52. data/core/bourbon/settings/_scales.scss +1 -1
  53. data/core/bourbon/settings/_settings.scss +33 -0
  54. data/eyeglass-exports.js +7 -0
  55. data/features/step_definitions/bourbon_steps.rb +6 -1
  56. data/index.js +2 -2
  57. data/lib/bourbon.rb +2 -10
  58. data/lib/bourbon/generator.rb +8 -8
  59. data/lib/bourbon/version.rb +1 -1
  60. data/package.json +6 -1
  61. data/spec/bourbon/addons/border_color_spec.rb +7 -7
  62. data/spec/bourbon/addons/buttons_spec.rb +3 -3
  63. data/spec/bourbon/addons/clearfix_spec.rb +2 -2
  64. data/spec/bourbon/addons/contrast_switch_spec.rb +23 -0
  65. data/spec/bourbon/{css3 → addons}/font_face_spec_1.rb +0 -2
  66. data/spec/bourbon/addons/font_face_spec_2.rb +21 -0
  67. data/spec/bourbon/{css3 → addons}/font_face_spec_3.rb +2 -4
  68. data/spec/bourbon/{css3 → addons}/font_face_spec_4.rb +0 -2
  69. data/spec/bourbon/addons/font_stacks_spec.rb +6 -1
  70. data/spec/bourbon/addons/hide_visually_spec.rb +35 -0
  71. data/spec/bourbon/{functions → addons}/modular_scale_spec.rb +6 -6
  72. data/spec/bourbon/addons/text_inputs_spec.rb +24 -14
  73. data/spec/bourbon/functions/assign_inputs_spec.rb +6 -6
  74. data/spec/bourbon/functions/collapse_directionals.rb +25 -0
  75. data/spec/bourbon/{helpers → functions}/font_source_declaration_spec.rb +1 -1
  76. data/spec/bourbon/helpers/directional_values_spec.rb +1 -19
  77. data/spec/bourbon/settings/bourbon_get_setting_spec.rb +31 -0
  78. data/spec/fixtures/addons/border-color.scss +4 -4
  79. data/spec/fixtures/addons/contrast-switch.scss +9 -0
  80. data/spec/fixtures/addons/font-face-1.scss +6 -0
  81. data/spec/fixtures/addons/font-face-2.scss +10 -0
  82. data/spec/fixtures/addons/font-face-3.scss +8 -0
  83. data/spec/fixtures/addons/font-face-4.scss +7 -0
  84. data/spec/fixtures/addons/font-stacks.scss +13 -9
  85. data/spec/fixtures/addons/hide-visually.scss +9 -0
  86. data/spec/fixtures/{functions → addons}/modular-scale.scss +0 -0
  87. data/spec/fixtures/addons/text-inputs.scss +4 -0
  88. data/spec/fixtures/functions/assign-inputs.scss +8 -8
  89. data/spec/fixtures/functions/collapse-directionals.scss +17 -0
  90. data/spec/fixtures/functions/contains.scss +1 -1
  91. data/spec/fixtures/functions/font-source-declaration.scss +11 -0
  92. data/spec/fixtures/functions/is-length.scss +1 -1
  93. data/spec/fixtures/functions/is-light.scss +2 -2
  94. data/spec/fixtures/functions/is-number.scss +1 -1
  95. data/spec/fixtures/functions/is-size.scss +1 -1
  96. data/spec/fixtures/functions/shade.scss +1 -1
  97. data/spec/fixtures/functions/tint.scss +1 -1
  98. data/spec/fixtures/functions/unpack.scss +4 -4
  99. data/spec/fixtures/helpers/directional-values.scss +3 -19
  100. data/spec/fixtures/settings/bourbon-get-setting.scss +16 -0
  101. data/spec/support/matchers/have_value.rb +1 -1
  102. metadata +88 -78
  103. data/.travis.yml +0 -8
  104. data/core/bourbon/_bourbon-deprecated.scss +0 -1
  105. data/core/bourbon/css3/_font-face.scss +0 -50
  106. data/core/bourbon/functions/_modular-scale.scss +0 -101
  107. data/core/bourbon/settings/_asset-pipeline.scss +0 -7
  108. data/core/bourbon/settings/_global-font-file-formats.scss +0 -12
  109. data/core/bourbon/settings/_modular-scale.scss +0 -17
  110. data/spec/bourbon/css3/font_face_spec_2.rb +0 -19
  111. data/spec/fixtures/css3/font-face-1.scss +0 -3
  112. data/spec/fixtures/css3/font-face-2.scss +0 -3
  113. data/spec/fixtures/css3/font-face-3.scss +0 -3
  114. data/spec/fixtures/css3/font-face-4.scss +0 -3
  115. data/spec/fixtures/helpers/font-source-declaration.scss +0 -10
  116. data/spec/support/matchers/be_contained_in.rb +0 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: dbf56be144883e8047194e7b3ee50699aebcf6fe
4
- data.tar.gz: fd466ccc77bab8d3b3ec05a52848d7a3bb50808b
3
+ metadata.gz: 0049bb742840704492f57b929d7c3df6d547b688
4
+ data.tar.gz: df186a0c88d922d31829d0ebc24eb3e137c2908f
5
5
  SHA512:
6
- metadata.gz: 35dbc943a28010b3fe70c7fc33ef380d450d0f346d784108727a3eca6ae45a56bf1405ef465f2487c5e4921671c3c220a9206a117527a6df1512b7afd2f724d8
7
- data.tar.gz: 0ce817e404ff8b9bef4eadd40d0f48efc0e0928c2741ac8e5f08e70f0a8ede692044c9dd90204acce10f67e5a66e245d11e160f9797265b57ca9c28607cbefac
6
+ metadata.gz: c0068eb60a455c7bd834902663c044b91df1042717f11c1db054588304c3ac8379ae314a0c8ea8cc10a4c347308d5647fd0fa254a2a0ac6d52c4ca674995ce8d
7
+ data.tar.gz: ddfad619c7ca124897b4bed3e8d8ef86cd830b44bb8101dc268af8d58a68291c1be5413957a92eb8cd1b62cb744f8cd10e217726fa113eb5b4838a2643583808
data/.gitignore CHANGED
@@ -5,4 +5,4 @@
5
5
  _site
6
6
  Gemfile.lock
7
7
  npm-debug.log
8
- tmp
8
+ tmp/
data/.npmignore CHANGED
@@ -2,7 +2,6 @@
2
2
  .hound.yml
3
3
  .sass-cache
4
4
  .scss-lint.yml
5
- .travis.yml
6
5
  _site
7
6
  bin/
8
7
  bourbon.gemspec
@@ -13,5 +12,6 @@ Gemfile.lock
13
12
  lib/
14
13
  pkg/
15
14
  Rakefile
15
+ RELEASING.md
16
16
  sache.json
17
17
  spec/
@@ -1,14 +1,235 @@
1
- scss_files: "core/**/*.scss"
1
+ scss_files: "**/*.scss"
2
+
3
+ severity: warning
4
+
2
5
  linters:
6
+ BangFormat:
7
+ enabled: true
8
+ space_before_bang: true
9
+ space_after_bang: false
10
+
11
+ BemDepth:
12
+ enabled: false
13
+
3
14
  BorderZero:
15
+ enabled: true
16
+ convention: zero
17
+
18
+ ChainedClasses:
4
19
  enabled: false
20
+
21
+ ColorKeyword:
22
+ enabled: true
23
+
5
24
  ColorVariable:
6
25
  enabled: false
26
+
27
+ Comment:
28
+ enabled: true
29
+ style: silent
30
+
31
+ DebugStatement:
32
+ enabled: true
33
+
34
+ DeclarationOrder:
35
+ enabled: true
36
+
37
+ DisableLinterReason:
38
+ enabled: false
39
+
40
+ DuplicateProperty:
41
+ enabled: true
42
+
43
+ ElsePlacement:
44
+ enabled: true
45
+ style: same_line
46
+
47
+ EmptyLineBetweenBlocks:
48
+ enabled: true
49
+ ignore_single_line_blocks: true
50
+
51
+ EmptyRule:
52
+ enabled: true
53
+
54
+ ExtendDirective:
55
+ enabled: false
56
+
57
+ FinalNewline:
58
+ enabled: true
59
+ present: true
60
+
61
+ HexLength:
62
+ enabled: true
63
+ style: short
64
+
65
+ HexNotation:
66
+ enabled: true
67
+ style: lowercase
68
+
69
+ HexValidation:
70
+ enabled: true
71
+
72
+ IdSelector:
73
+ enabled: true
74
+
75
+ ImportantRule:
76
+ enabled: true
77
+
78
+ ImportPath:
79
+ enabled: true
80
+ leading_underscore: false
81
+ filename_extension: false
82
+
83
+ Indentation:
84
+ enabled: true
85
+ allow_non_nested_indentation: false
86
+ character: space
87
+ width: 2
88
+
7
89
  LeadingZero:
8
90
  enabled: true
9
91
  style: include_zero
10
- SelectorFormat:
92
+
93
+ MergeableSelector:
94
+ enabled: true
95
+ force_nesting: true
96
+
97
+ NameFormat:
98
+ enabled: true
99
+ allow_leading_underscore: true
100
+ convention: hyphenated_lowercase
101
+
102
+ NestingDepth:
103
+ enabled: true
104
+ max_depth: 3
105
+ ignore_parent_selectors: false
106
+
107
+ PlaceholderInExtend:
108
+ enabled: true
109
+
110
+ PropertyCount:
11
111
  enabled: false
112
+
113
+ PropertySortOrder:
114
+ enabled: true
115
+ ignore_unspecified: false
116
+ min_properties: 2
117
+ separate_groups: false
118
+
119
+ PropertySpelling:
120
+ enabled: true
121
+ extra_properties: []
122
+ disabled_properties: []
123
+
124
+ PropertyUnits:
125
+ enabled: true
126
+ global: [
127
+ 'ch', 'em', 'ex', 'rem',
128
+ 'cm', 'in', 'mm', 'pc', 'pt', 'px', 'q',
129
+ 'vh', 'vw', 'vmin', 'vmax',
130
+ 'deg', 'grad', 'rad', 'turn',
131
+ 'ms', 's',
132
+ 'Hz', 'kHz',
133
+ 'dpi', 'dpcm', 'dppx',
134
+ '%']
135
+ properties:
136
+ line-height: []
137
+
138
+ PseudoElement:
139
+ enabled: true
140
+
141
+ QualifyingElement:
142
+ enabled: true
143
+ allow_element_with_attribute: false
144
+ allow_element_with_class: false
145
+ allow_element_with_id: false
146
+
147
+ SelectorDepth:
148
+ enabled: true
149
+ max_depth: 2
150
+
151
+ SelectorFormat:
152
+ enabled: true
153
+ convention: hyphenated_BEM
154
+
155
+ Shorthand:
156
+ enabled: true
157
+ allowed_shorthands: [1, 2, 3]
158
+
159
+ SingleLinePerProperty:
160
+ enabled: true
161
+ allow_single_line_rule_sets: true
162
+
163
+ SingleLinePerSelector:
164
+ enabled: true
165
+
166
+ SpaceAfterComma:
167
+ enabled: true
168
+ style: one_space
169
+
170
+ SpaceAfterPropertyColon:
171
+ enabled: true
172
+ style: one_space
173
+
174
+ SpaceAfterPropertyName:
175
+ enabled: true
176
+
177
+ SpaceAfterVariableName:
178
+ enabled: true
179
+
180
+ SpaceAroundOperator:
181
+ enabled: true
182
+ style: one_space
183
+
184
+ SpaceBeforeBrace:
185
+ enabled: true
186
+ style: space
187
+ allow_single_line_padding: true
188
+
189
+ SpaceBetweenParens:
190
+ enabled: true
191
+ spaces: 0
192
+
12
193
  StringQuotes:
13
194
  enabled: true
14
195
  style: double_quotes
196
+
197
+ TrailingSemicolon:
198
+ enabled: true
199
+
200
+ TrailingWhitespace:
201
+ enabled: true
202
+
203
+ TrailingZero:
204
+ enabled: true
205
+
206
+ TransitionAll:
207
+ enabled: true
208
+
209
+ UnnecessaryMantissa:
210
+ enabled: true
211
+
212
+ UnnecessaryParentReference:
213
+ enabled: true
214
+
215
+ UrlFormat:
216
+ enabled: true
217
+
218
+ UrlQuotes:
219
+ enabled: true
220
+
221
+ VariableForProperty:
222
+ enabled: false
223
+ properties: []
224
+
225
+ VendorPrefix:
226
+ enabled: true
227
+ identifier_list: base
228
+ additional_identifiers: []
229
+ excluded_identifiers: []
230
+
231
+ ZeroUnit:
232
+ enabled: true
233
+
234
+ Compass::*:
235
+ enabled: false
data/Gemfile CHANGED
@@ -1,3 +1,3 @@
1
- source "http://rubygems.org"
1
+ source "https://rubygems.org"
2
2
 
3
3
  gemspec
data/LICENSE.md CHANGED
@@ -1,6 +1,6 @@
1
1
  The MIT License (MIT)
2
2
 
3
- Copyright © 2011–2015 [thoughtbot, inc.](http://thoughtbot.com)
3
+ Copyright © 2011 [thoughtbot, inc.](http://thoughtbot.com)
4
4
 
5
5
  Permission is hereby granted, free of charge, to any person obtaining a copy
6
6
  of this software and associated documentation files (the “Software”), to deal
data/NEWS.md ADDED
@@ -0,0 +1,71 @@
1
+ # News
2
+
3
+ The noteworthy changes for each Bourbon version are included here. For a
4
+ complete changelog, see the Git history for each version via the version links.
5
+
6
+ ## `master`
7
+
8
+ ### Added
9
+
10
+ - Added a `contrast-switch` mixin that switches between two colors based on the
11
+ lightness of a another color. Great for building button styles.
12
+ - Added an `$all-text-inputs-invalid` variable to target the `:invalid`
13
+ pseudo-class on all text-based inputs.
14
+ - The `ellipsis` mixin now takes a `$display` argument.
15
+ - Added a font stack for system fonts: `$font-stack-system`.
16
+ - Added a `hide-visually` mixin that hides an element visually while still
17
+ allowing the content to be accessible to assistive technology,
18
+ e.g. screen readers.
19
+ - The `font-face` mixin now allows additional CSS properties to be included in
20
+ its block, which will output as part of the `@font-face` declaration.
21
+ See [2356719].
22
+
23
+ ### Changed
24
+
25
+ - The global default for the `modular-scale` ratio is now set to
26
+ `$major-third` (`1.25`), instead of `$perfect-fourth` (`1.333`).
27
+ - All font stack variables are now prefixed with `$font-stack-`,
28
+ e.g. `$font-stack-helvetica`.
29
+ - Global settings are now set via a `$bourbon` map, instead of variables.
30
+ See [4e43c2d].
31
+ - The `clearfix` mixin now uses `block` display, instead of `table`.
32
+
33
+ ### Deprecated
34
+
35
+ - The `$weight` and `$style` arguments in the `font-face` mixin have been
36
+ deprecated. Instead, you can now include these—along with other CSS
37
+ properties—within the mixin block and they’ll be output as part of the
38
+ `@font-face` declaration.
39
+
40
+ [2356719]: https://github.com/thoughtbot/bourbon/commit/235671948ef3a9c343c4391d250082a0373c8d83
41
+ [4e43c2d]: https://github.com/thoughtbot/bourbon/commit/4e43c2d7507999b539771bdc1b3733b18b3c1883
42
+
43
+ ## [5.0.0.alpha.0] - August 21, 2015
44
+
45
+ ### Added
46
+
47
+ - Added a `$global-font-file-formats` setting to globally set the file formats
48
+ for the `font-face` mixin. The default is `("ttf", "woff2", "woff")`.
49
+
50
+ ### Changed
51
+
52
+ - Removed the type selectors in `$all-text-inputs` and `$all-buttons` to
53
+ reduce specificity.
54
+ - Font stacks have been modernized.
55
+ - The `strip-units` function is now `strip-unit`.
56
+ - The `size` mixin now requires a comma-separated argument list,
57
+ e.g. `@include size(1em, 2em);`.
58
+
59
+ ### Deprecated
60
+
61
+ - All vendor prefixing mixins have been deprecated. We recommend using a more
62
+ robust and maintainable solution
63
+ like [Autoprefixer](https://github.com/postcss/autoprefixer).
64
+ - The `$global-prefixes` setting has been deprecated and the `prefixer` mixin
65
+ has been refactored and no longer uses it.
66
+ - The `em` and `rem` mixins have been deprecated.
67
+ - The `$monospace` font stack variable has been deprecated in favor of new
68
+ `$consolas`, `$courier-new` and `$monaco` variables.
69
+ - The `triangle` mixin has been deprecated.
70
+
71
+ [5.0.0.alpha.0]: https://github.com/thoughtbot/bourbon/compare/v4.2.6...v5.0.0.alpha.0
data/README.md CHANGED
@@ -1,9 +1,7 @@
1
1
  [![Bourbon](http://images.thoughtbot.com/bourbon/bourbon-logo.svg)](http://bourbon.io)
2
2
 
3
- [![Gem Version](http://img.shields.io/gem/v/bourbon.svg?style=flat)](https://rubygems.org/gems/bourbon)
4
- [![Code Climate](http://img.shields.io/codeclimate/github/thoughtbot/bourbon.svg?style=flat)](https://codeclimate.com/github/thoughtbot/bourbon)
5
- [![Gitter chat](https://img.shields.io/badge/gitter-thoughtbot/bourbon-ae3dd2.svg?style=flat)](https://gitter.im/thoughtbot/bourbon)
6
- [![Stack Overflow](http://img.shields.io/badge/stack%20overflow-bourbon-ae3dd2.svg?style=flat)](http://stackoverflow.com/questions/tagged/bourbon)
3
+ [![GitHub release](https://img.shields.io/github/release/thoughtbot/bourbon.svg)](https://github.com/thoughtbot/bourbon/releases)
4
+ [![CircleCI branch](https://img.shields.io/circleci/project/thoughtbot/bourbon/master.svg)](https://circleci.com/gh/thoughtbot/bourbon/tree/master)
7
5
 
8
6
  ## A simple and lightweight mixin library for Sass.
9
7
 
@@ -34,7 +32,7 @@ For command line help, visit our wiki page on Bourbon’s [command line interfac
34
32
 
35
33
  Alternatively, you can install Bourbon with [Bower](http://bower.io).
36
34
 
37
- 2. Install the Bourbon library into the current directory:
35
+ 1. Install the Bourbon library into the current directory:
38
36
 
39
37
  ```bash
40
38
  bourbon install
@@ -46,7 +44,7 @@ For command line help, visit our wiki page on Bourbon’s [command line interfac
46
44
  bourbon install --path my/custom/path/
47
45
  ```
48
46
 
49
- 3. Import Bourbon at the beginning of your stylesheet:
47
+ 1. Import Bourbon at the beginning of your stylesheet:
50
48
 
51
49
  ```scss
52
50
  @import "bourbon/bourbon";
@@ -62,21 +60,21 @@ For command line help, visit our wiki page on Bourbon’s [command line interfac
62
60
  gem 'bourbon'
63
61
  ```
64
62
 
65
- 2. Then run:
63
+ 1. Then run:
66
64
 
67
65
  ```bash
68
66
  bundle install
69
67
  ```
70
68
 
71
- 3. Restart your server and rename `application.css` to `application.scss`:
69
+ 1. Restart your server and rename `application.css` to `application.scss`:
72
70
 
73
71
  ```bash
74
72
  mv app/assets/stylesheets/application.css app/assets/stylesheets/application.scss
75
73
  ```
76
74
 
77
- 4. Delete _all_ Sprockets directives in `application.scss` (`require`, `require_tree` and `require_self`) and use Sass’s native `@import` instead. ([why?](http://pivotallabs.com/structure-your-sass-files-with-import))
75
+ 1. Delete _all_ Sprockets directives in `application.scss` (`require`, `require_tree` and `require_self`) and use Sass’s native `@import` instead. ([why?](http://pivotallabs.com/structure-your-sass-files-with-import))
78
76
 
79
- 5. Import Bourbon at the beginning of `application.scss`. All additional stylesheets should be imported below Bourbon:
77
+ 1. Import Bourbon at the beginning of `application.scss`. All additional stylesheets should be imported below Bourbon:
80
78
 
81
79
  ```scss
82
80
  @import "bourbon";
@@ -86,6 +84,22 @@ For command line help, visit our wiki page on Bourbon’s [command line interfac
86
84
 
87
85
  [Help! I’m getting an undefined mixin error.](https://github.com/thoughtbot/bourbon/wiki/Rails-Help-%5C-Undefined-mixin)
88
86
 
87
+ ## Installing with npm and using a Node-based asset pipeline
88
+
89
+ 1. Add Bourbon as a dependency:
90
+
91
+ ```bash
92
+ npm install --save bourbon
93
+ ```
94
+
95
+ 1. If you’re using [Eyeglass](http://eyeglass.rocks), skip to Step 3. Otherwise, you’ll need to add Bourbon to your node-sass `includePaths` option. `require("bourbon").includePaths` is an array of directories that you should pass to node-sass. How you do this depends on how node-sass is integrated into your project.
96
+
97
+ 1. Import Bourbon into your Sass files:
98
+
99
+ ```scss
100
+ @import "bourbon";
101
+ ```
102
+
89
103
  ## Installing older versions of Bourbon
90
104
 
91
105
  1. Uninstall any Bourbon gem versions you already have:
@@ -94,13 +108,13 @@ For command line help, visit our wiki page on Bourbon’s [command line interfac
94
108
  gem uninstall bourbon
95
109
  ```
96
110
 
97
- 2. Reinstall the Bourbon gem, using the `-v` flag to specify the version you need:
111
+ 1. Reinstall the Bourbon gem, using the `-v` flag to specify the version you need:
98
112
 
99
113
  ```bash
100
114
  gem install bourbon -v 3.2.4
101
115
  ```
102
116
 
103
- 3. Follow the [instructions above](#installation) to install Bourbon into your project.
117
+ 1. Follow the [instructions above](#installation) to install Bourbon into your project.
104
118
 
105
119
  ## Browser support
106
120
 
@@ -119,22 +133,27 @@ For command line help, visit our wiki page on Bourbon’s [command line interfac
119
133
 
120
134
  Also check out [Proteus](https://github.com/thoughtbot/proteus), a collection of useful starter kits to help you prototype faster. Each kit comes with Bourbon, Neat and Bitters out-of-the-box.
121
135
 
136
+ ## Contributing
137
+
138
+ See the [contributing] document. Thank you, [contributors]!
139
+
140
+ [contributing]: CONTRIBUTING.md
141
+ [contributors]: https://github.com/thoughtbot/bourbon/graphs/contributors
142
+
122
143
  ## License
123
144
 
124
- Copyright © 2011–2015 [thoughtbot, inc](http://thoughtbot.com).
125
- Bourbon is free software,
126
- and may be redistributed under the terms specified in the [license](LICENSE.md).
145
+ Bourbon is copyright © 2011 [thoughtbot, inc.][thoughtbot] It is free software, and may be redistributed under the terms specified in the [license].
146
+
147
+ [license]: LICENSE.md
127
148
 
128
- ## About thoughtbot
149
+ ## About
129
150
 
130
- [<img src="http://thoughtbot.github.io/images/signature.svg" width="250" alt="thoughtbot logo">][hire]
151
+ Bourbon is maintained by Tyson Gach and the thoughtbot design team. It is funded by [thoughtbot, inc.][thoughtbot] and the names and logos for thoughtbot are trademarks of thoughtbot, inc.
131
152
 
132
- Bourbon is maintained and funded by thoughtbot, inc.
133
- The names and logos for thoughtbot are trademarks of thoughtbot, inc.
153
+ [<img src="http://thoughtbot.github.io/images/signature.svg" width="250" alt="thoughtbot logo">][thoughtbot]
134
154
 
135
- We love open source software!
136
- See [our other projects][community] or
137
- [hire us][hire] to design, develop, and grow your product.
155
+ We love open-source software! See [our other projects][community] or [hire us][hire] to design, develop, and grow your product.
138
156
 
139
- [community]: https://thoughtbot.com/community?utm_source=github
140
- [hire]: https://thoughtbot.com/hire-us?utm_source=github
157
+ [thoughtbot]: https://thoughtbot.com?utm_source=github
158
+ [community]: https://thoughtbot.com/community?utm_source=github
159
+ [hire]: https://thoughtbot.com/hire-us?utm_source=github