bitters 0.9.3 → 0.9.4

data/README.md

@@ -24,7 +24,9 @@ bitters install
 
 The generated folder will contain all Bitters files.
 
-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:
+Import Bitters after Bourbon in your `application.css.scss`. All additional stylesheets should be imported below Bitters.
+
+If you are using Neat, import it after Bitters. Be sure to not include any of Neat's mixins or functions in the Bitters files when modifying Bitters.
 
 ```scss
 @import "bourbon";
@@ -34,9 +36,14 @@ Import Bitters after Bourbon in your `application.css.scss`. If you are using th
 // All other imports
 ```
 
+Also, when using Neat, have the following lines in "_bitters.scss" uncommented:
 
-We suggest using [Normalize](http://necolas.github.io/normalize.css/) for a CSS reset with Bitters.
+```scss
+@import "neat-helpers"; // or "../neat/neat-helpers" when not in Rails
+@import "grid-settings";
+```
 
+We suggest using [Normalize](http://necolas.github.io/normalize.css/) for a CSS reset with Bitters.
 
 Getting Started
 ===
@@ -59,6 +66,9 @@ All lists have stripped out styles. No bullets, no left padding. To add back the
 ### Forms
 Adds basic styles all form elements. The variables at the top of the file all inherit from the variables file but make it really easy to be overridden.
 
+### Buttons
+Basic style for `button` and `input[type="submit"]`. Button style can be changed by setting the `$button-style` variable to one of the [Bourbon](http://bourbon.io) button style [options](http://bourbon.io/docs/#buttons).
+
 ### Flashes
 Used for any error, warning or success messages in applications or forms. Specifically made for rails application notices.
 

data/app/assets/stylesheets/_bitters.scss

@@ -1,16 +1,16 @@
 // Neat Settings -- uncomment if using Neat
 ///////////////////////////////////////////////////////////////////////////////
-// @import "neat-helpers"; // or "neat/neat-helpers" when not in Rails
-// @import "grid-settings";
+// @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";
-@import "lists";
-@import "flashes";
+@import 'variables';
+@import 'extends/base';
+@import 'mixins/base';
+@import 'typography';
+@import 'forms';
+@import 'tables';
+@import 'lists';
+@import 'flashes';

data/app/assets/stylesheets/_buttons.scss

@@ -0,0 +1,9 @@
+button,
+input[type="submit"] {
+  @extend %button;
+  @include appearance(none);
+  cursor: pointer;
+  user-select: none;
+  vertical-align: middle;
+  white-space: nowrap;
+}

data/app/assets/stylesheets/_forms.scss

@@ -1,12 +1,3 @@
-$form-border-color: $base-border-color;
-$form-border-color-hover: darken($base-border-color, 10);
-$form-border-color-focus: $base-accent-color;
-$form-border-radius: $base-border-radius;
-$form-box-shadow: inset 0 1px 3px hsla(0, 0%, 0%, 0.06);
-$form-box-shadow-focus: $form-box-shadow, 0 0 5px rgba(darken($form-border-color-focus, 5), 0.7);
-$form-font-size: $base-font-size;
-$form-font-family: $base-font-family;
-
 fieldset {
   background: lighten($base-border-color, 10);
   border: 1px solid $base-border-color;
@@ -75,6 +66,8 @@ input[type="checkbox"], input[type="radio"] {
 }
 
 input[type="file"] {
+  margin-bottom: $base-line-height / 2;
+  padding-bottom: ($base-line-height / 3);
   width: 100%;
 }
 
@@ -83,13 +76,3 @@ select {
   max-width: 100%;
   margin-bottom: $base-line-height;
 }
-
-button,
-input[type="submit"] {
-  @extend %button;
-  @include appearance(none);
-  cursor: pointer;
-  user-select: none;
-  vertical-align: middle;
-  white-space: nowrap;
-}

data/app/assets/stylesheets/_variables.scss

@@ -41,3 +41,16 @@ $base-border-color: $light-gray;
 $error-color: $light-red;
 $notice-color: $light-yellow;
 $success-color: $light-green;
+
+// Forms
+$form-border-color: $base-border-color;
+$form-border-color-hover: darken($base-border-color, 10);
+$form-border-color-focus: $base-accent-color;
+$form-border-radius: $base-border-radius;
+$form-box-shadow: inset 0 1px 3px rgba(0,0,0,0.06);
+$form-box-shadow-focus: $form-box-shadow, 0 0 5px rgba(darken($form-border-color-focus, 5), 0.7);
+$form-font-size: $base-font-size;
+$form-font-family: $base-font-family;
+
+// Buttons
+$button-style: simple;

data/app/assets/stylesheets/extends/_button.scss

@@ -1,5 +1,5 @@
 %button {
-  @include button(simple, $base-accent-color);
+  @include button($button-style, $base-accent-color);
   -webkit-font-smoothing: antialiased;
   font-size: $base-font-size;
   font-weight: bold;

data/app/assets/stylesheets/extends/_clearfix.scss

@@ -0,0 +1,3 @@
+%clearfix {
+  @include clearfix;
+}

data/app/assets/stylesheets/extends/_ellipsis.scss

@@ -0,0 +1,3 @@
+%ellipsis {
+  @include ellipsis;
+}

data/app/assets/stylesheets/extends/_extends.scss

@@ -0,0 +1,4 @@
+@import 'button';
+@import 'clearfix';
+@import 'ellipsis';
+@import 'hide-text';

data/app/assets/stylesheets/extends/_hide-text.scss

@@ -0,0 +1,3 @@
+%hide-text {
+  @include hide-text;
+}

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

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

data/bitters.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["support@thoughtbot.com"]
   spec.description   = "Base styles for Web design"
   spec.summary       = "Base styles for Web design"
-  spec.homepage      = "http://github.com/thoughtbot/biters"
+  spec.homepage      = "http://github.com/thoughtbot/bitters"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

data/lib/bitters/generator.rb

@@ -1,5 +1,6 @@
 require 'bitters/version'
 require 'fileutils'
+require 'pathname'
 require 'thor'
 
 module Bitters
@@ -9,12 +10,13 @@ module Bitters
     map ['delete'] => :remove
 
     desc 'install', 'Install Bitters into your project'
+    method_options path: :string
     def install
       if bitters_files_already_exist?
         puts "Bitters files already installed, doing nothing."
       else
         install_files
-        puts "Bitters files installed to /bitters"
+        puts "Bitters files installed to #{install_path}/bitters"
       end
     end
 
@@ -47,12 +49,16 @@ module Bitters
     private
 
     def bitters_files_already_exist?
-      File.directory?("bitters")
+      File.directory?(install_path)
+    end
+
+    def install_path
+      Pathname.new(options[:path].to_s).join('bitters')
     end
 
     def install_files
-      FileUtils.mkdir_p("bitters")
-      FileUtils.cp_r(all_stylesheets, "bitters/")
+      FileUtils.mkdir_p(install_path)
+      FileUtils.cp_r(all_stylesheets, install_path)
     end
 
     def remove_bitters_directory

data/lib/bitters/version.rb

@@ -1,3 +1,3 @@
 module Bitters
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitters
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,6 +106,7 @@ files:
 - README.md
 - Rakefile
 - app/assets/stylesheets/_bitters.scss
+- app/assets/stylesheets/_buttons.scss
 - app/assets/stylesheets/_flashes.scss
 - app/assets/stylesheets/_forms.scss
 - app/assets/stylesheets/_grid-settings.scss
@@ -113,16 +114,19 @@ files:
 - app/assets/stylesheets/_tables.scss
 - app/assets/stylesheets/_typography.scss
 - 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/extends/_clearfix.scss
+- app/assets/stylesheets/extends/_ellipsis.scss
+- app/assets/stylesheets/extends/_extends.scss
+- app/assets/stylesheets/extends/_hide-text.scss
 - app/assets/stylesheets/mixins/_flash.scss
+- app/assets/stylesheets/mixins/_mixins.scss
 - bin/bitters
 - bitters.gemspec
 - lib/bitters.rb
 - lib/bitters/generator.rb
 - lib/bitters/version.rb
-homepage: http://github.com/thoughtbot/biters
+homepage: http://github.com/thoughtbot/bitters
 licenses:
 - MIT
 post_install_message: 
@@ -137,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2718350553411047732
+      hash: -4462426852338942601
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -146,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2718350553411047732
+      hash: -4462426852338942601
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

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

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

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

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