bitters 0.9.1 → 0.9.2

data/.gitignore

@@ -3,3 +3,4 @@
 *.scssc
 /stylesheets/.sass-cache/
 pkg
+Gemfile.lock

data/README.md

@@ -2,17 +2,17 @@ Bitters
 ===
 Add a dash of predefined style to get your [Bourbon](http://bourbon.io) stylesheets started off in the right direction.
 
-Bitters is meant to help designers get projects started on new projects faster. It adds enough predefined structure and style to get started quickly but bland enough so that it doesn't dictate any style moving forward.
+Bitters is meant to help designers get projects started on new projects faster. It adds enough predefined structure and style to get started quickly but bland enough so that it doesn't dictate any style moving forward. Bitters should live in your projects sass root folder and be **modified** and extended while you design your project.
 
 Install Instructions
 ===
 Install Bitters:
 
 ```bash
-gem install Bitters
+gem install bitters
 ```
 
-Install [Bourbon](https://github.com/thoughtbot/bourbon#install-for-rails-31) and [Neat](https://github.com/thoughtbot/neat#install-instructions) (optional).
+Install [Bourbon](https://github.com/thoughtbot/bourbon#install-for-rails-31) (required) and [Neat](https://github.com/thoughtbot/neat#install-instructions) (optional).
 
 Then `cd` to your Sass directory and run:
 
@@ -22,29 +22,19 @@ bitters install
 
 The generated folder will contain all Bitters files.
 
-Import Bitters after Bourbon and Neat in your `application.css.scss`. All additional stylesheets should be imported below Bitters:
+Import Bitters after Bourbon in your `application.css.scss`. If you are using the Neat overrides found in `_grid-settings.scss`, be sure to `@import "bitters/bitters"` between Bourbon and Neat. Be sure to not include any of Neat's mixins or functions in the Bitters files when modifying Bitters. All additional stylesheets should be imported below Bitters:
 
 ```scss
 @import "bourbon";
-@import "neat";
 @import "bitters/bitters";
+@import "neat";
 
 // All other imports
 ```
 
-We suggest using [Normalize](http://necolas.github.io/normalize.css/) for a CSS reset with Bitters.
-
-If you are using the Neat overrides found in `_grid-settings.scss`, `@import "bitters/grid-settings"` between Bourbon and Neat as directed by [Neats Documentation](https://github.com/thoughtbot/neat#getting-started).
 
-```scss
-@import "normalize";
-@import "bourbon";
-@import "bitters/grid-settings";
-@import "neat";
-@import "bitters/bitters";
+We suggest using [Normalize](http://necolas.github.io/normalize.css/) for a CSS reset with Bitters.
 
-// All other imports
-```
 
 Getting Started
 ===
@@ -82,7 +72,7 @@ Credits
 
 ![thoughtbot](http://thoughtbot.com/images/tm/logo.png)
 
-Bourbon is maintained and funded by [thoughtbot, inc](http://thoughtbot.com/community). Tweet your questions or suggestions at [@kylefiedler](https://twitter.com/kylefiedler).
+Bitters is maintained and funded by [thoughtbot, inc](http://thoughtbot.com/community). Tweet your questions or suggestions at [@kylefiedler](https://twitter.com/kylefiedler).
 
 License
 ===

data/app/assets/stylesheets/_bitters.scss

@@ -1,5 +1,14 @@
+// Neat Settings -- uncomment if using Neat
+///////////////////////////////////////////////////////////////////////////////
+// @import "neat-helpers"; // or "neat/neat-helpers" when not in Rails
+// @import "grid-settings";
+
+
+// Bitters
+///////////////////////////////////////////////////////////////////////////////
 @import "variables";
 @import "extends/base";
+@import "mixins/base";
 @import "typography";
 @import "forms";
 @import "tables";

data/app/assets/stylesheets/_flashes.scss

@@ -1,50 +1,11 @@
-/* Success, error & notice boxes for messages and errors. */
-%flash {
-  margin-bottom: $base-line-height / 2;
-  padding: $base-line-height / 2;
-  font-weight: bold;
-}
-
 .error, #flash_failure {
-  @extend %flash;
-  background: $error-color;
-  color: darken($error-color, 60);
-
-  a {
-    color: darken($error-color, 70);
-
-    &:hover {
-      color: darken($error-color, 90);
-    }
-  }
+  @include flash($error-color);
 }
 
 .notice, #flash_notice {
-  @extend %flash;
-  background: $notice-color;
-  color: darken($notice-color, 60);
-
-  a {
-    color: darken($notice-color, 70);
-
-    &:hover {
-      color: darken($notice-color, 90);
-    }
-  }
+  @include flash($notice-color);
 }
 
-
 .success, #flash_success {
-  @extend %flash;
-  background: $success-color;
-  color: darken($success-color, 60);
-
-  a {
-    color: darken($success-color, 70);
-
-    &:hover {
-      color: darken($success-color, 90);
-    }
-  }
+  @include flash($success-color);
 }
-

data/app/assets/stylesheets/_forms.scss

@@ -47,6 +47,7 @@ textarea,
   font-size: $form-font-size;
   margin-bottom: $base-line-height / 2;
   padding: ($base-line-height / 3) ($base-line-height / 3);
+  resize: vertical;
   width: 100%;
 
   &:hover {
@@ -69,6 +70,10 @@ input[type="checkbox"], input[type="radio"] {
   margin-right: $base-line-height / 4;
 }
 
+input[type="file"] {
+  width: 100%;
+}
+
 select {
   width: auto;
   margin-bottom: $base-line-height;

data/app/assets/stylesheets/_grid-settings.scss

@@ -1,5 +1,3 @@
-@import "neat-helpers"; // or "neat/neat-helpers" when not in Rails
-
 // Neat Overrides
 ///////////////////////////////////////////////////////////////////////////////
 // $column: 90px;

data/app/assets/stylesheets/_tables.scss

@@ -1,5 +1,7 @@
 table {
+  border-collapse: collapse;
   margin: ($base-line-height / 2) 0;
+  table-layout: fixed;
   width: 100%;
 }
 

data/app/assets/stylesheets/_typography.scss

@@ -7,9 +7,10 @@ body {
 }
 
 h1, h2, h3, h4, h5, h6 {
-  text-rendering: optimizeLegibility; // Fix the character spacing for headings
-  margin: 0;
+  font-family: $header-font-family;
   line-height: 1.25em;
+  margin: 0;
+  text-rendering: optimizeLegibility; // Fix the character spacing for headings
 }
 
 h1 {

data/app/assets/stylesheets/_variables.scss

@@ -23,6 +23,9 @@ $light-red: #FBE3E4;
 $light-yellow: #FFF6BF;
 $light-green: #E6EFC2;
 
+// Body Color
+$base-body-color: white;
+
 //  Font Colors
 $base-font-color: $dark-gray;
 $base-accent-color: $blue;

data/app/assets/stylesheets/mixins/_base.scss

@@ -0,0 +1 @@
+@import "flash";

data/app/assets/stylesheets/mixins/_flash.scss

@@ -0,0 +1,15 @@
+@mixin flash($color) {
+  background: $color;
+  color: darken($color, 60);
+  font-weight: bold;
+  margin-bottom: $base-line-height / 2;
+  padding: $base-line-height / 2;
+
+  a {
+    color: darken($color, 70);
+
+    &:hover {
+      color: darken($color, 90);
+    }
+  }
+}

data/lib/bitters/version.rb

@@ -1,3 +1,3 @@
 module Bitters
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitters
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2013-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,6 +115,8 @@ files:
 - app/assets/stylesheets/_variables.scss
 - app/assets/stylesheets/extends/_base.scss
 - app/assets/stylesheets/extends/_button.scss
+- app/assets/stylesheets/mixins/_base.scss
+- app/assets/stylesheets/mixins/_flash.scss
 - bin/bitters
 - bitters.gemspec
 - lib/bitters.rb
@@ -135,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3169771993459285020
+      hash: -4024612642079917483
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -144,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3169771993459285020
+      hash: -4024612642079917483
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25