Permalink
Browse files

Update for Bourbon 4.2

  • Loading branch information...
1 parent 084999b commit 86972d00c11fb710851ecc4e3971d94ec0e1a2e1 @tysongach tysongach committed Feb 17, 2015
Showing with 7 additions and 10 deletions.
  1. +0 −1 Gemfile
  2. +2 −2 README.md
  3. +1 −2 app/assets/stylesheets/_buttons.scss
  4. +2 −3 app/assets/stylesheets/_forms.scss
  5. +2 −2 bitters.gemspec
View
@@ -1,4 +1,3 @@
source 'https://rubygems.org'
-# Specify your gem's dependencies in bitters.gemspec
gemspec
View
@@ -17,8 +17,8 @@ for updates.
## Requirements
-- [Sass](https://github.com/sass/sass) 3.0+
-- [Bourbon](https://github.com/thoughtbot/bourbon) 2.0+
+- [Sass](https://github.com/sass/sass) 3.4+ or [LibSass](https://github.com/sass/libsass) 3.1+
+- [Bourbon](https://github.com/thoughtbot/bourbon) 4.2+
- Ruby 1.9.3+ (required to install Bitters from the command line)
## Installation
@@ -1,5 +1,4 @@
-#{$all-button-inputs},
-button {
+#{$all-buttons} {
@include appearance(none);
background-color: $action-color;
border: none;
@@ -26,8 +26,7 @@ label {
}
#{$all-text-inputs},
-select[multiple=multiple],
-textarea {
+select[multiple=multiple] {
background-color: $base-background-color;
border: $base-border;
border-radius: $base-border-radius;
@@ -36,7 +35,7 @@ textarea {
display: block;
font-family: $base-font-family;
font-size: $base-font-size;
- margin-bottom: $base-spacing / 2;
+ margin-bottom: $small-spacing;
padding: $base-spacing / 3;
transition: border-color;
width: 100%;
View
@@ -27,7 +27,7 @@ design and brand requirements.
s.add_development_dependency 'rake'
s.add_development_dependency 'rspec'
- s.add_dependency 'bourbon', '>= 3.2'
- s.add_dependency 'sass', '>= 3.2'
+ s.add_dependency 'bourbon', '>= 4.2'
+ s.add_dependency 'sass', '>= 3.4'
s.add_dependency 'thor'
end

0 comments on commit 86972d0

Please sign in to comment.