bitters 0.9.5 → 0.10.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjQ3N2RiNzdmNzA5YjMzOGI2NjhkMDgyMjljYzJkZDNiMmVhZWY1Ng==
+    MDExM2E1YTc2ZWExMWVhOGIwNWFiNGQ5OGQ4OTdmYTg2MzM5MmE3OQ==
   data.tar.gz: !binary |-
-    NGEwY2MzYTczMDQ0Mzk1MmJhOTM2YWZhODE1M2E3YWMyMWVkMTJjMg==
+    NjlmNTFjNmYyOTdjNWNkYjcxOWI3MTM0OGUyYmVkNWJlMTdjZjI3NA==
 SHA512:
   metadata.gz: !binary |-
-    NmJkZDViYTI4MDVkMDM1YWExNTk2MmJjMjdiZDgwODFkMDAzOTZkMWI2ZTdj
-    ZGY0YThlYThkMjRhYmM2NWIyNWI4YWY2NTIwMzJhNDdhZjgxZmIyMmNiOWYy
-    YzM5MTcxYWE0ZDA0OWMzM2E3N2IwNjdhYjE0MzUzN2ViY2QwYWY=
+    ZmY4OGFkNDA3ZmIwYTllMWZiNzBlOWE3MzNjMTFmMGJhZTUyMTczZTE2MzNm
+    MDdiZjFkODFlNTMzZWFiYWI1YjViMGYxY2NlYmE3NGUxODZlY2ZjNDQyYjY3
+    ZmY2MGRkOThjNGFkODgzN2MzODA2ZmRmZWQwNjgxOGNiNDQ2NDY=
   data.tar.gz: !binary |-
-    NjU2YjlkMzU1NWFjMjJmZmIzODcyYTM4MDVhOTk0M2M4NTdkNzFlNWRiNzQz
-    MWQyYzQ1Yzg4MGY0NWE2MGZlNGExMjBiN2U4MGZkMjliNmQxMTRkZDhhMTY4
-    NmIyMzY4NTZlNGEwYzNhNjYwYzkzOGZlMmE0OTNhZGE5M2NkMjQ=
+    NmQ0ZDlkZTIzZWI5NmYwY2RjOTQzNmFmYmQ0MTRjNWRiZWEzMTE5N2ViNzEz
+    ZjE4ZTcwOTEyYzkzODM1MDI3NmYzNDBiMGJiMGU2NzcwM2VkZTg0OTlmN2Nj
+    YjA5OWZhZDIxYTc2MTA4ODdkYTU4ZDVhNmEyODgxNzU5Mzc4ZWU=

data/CONTRIBUTING.md

@@ -0,0 +1,35 @@
+We love pull requests. Here's a quick guide:
+
+1. Fork the repository.
+2. Make your changes in a topic branch.
+4. Squash your commits into a single one (more on that [here](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html)).
+5. Rebase against `origin/master`, push to your fork and submit a pull request.
+6. If you are writing a new feature please add documentation for it by making another pull request to the `gh_pages` branch.
+
+At this point you're waiting on us. We like to at least comment on, if not
+accept, pull requests within three business days (and, typically, one business
+day). We may suggest some changes or improvements or alternatives.
+
+Some things that will increase the chance that your pull request is accepted:
+
+* Fix a bug, refactor code or expand an existing feature.
+* Use the right syntax and naming conventions.
+* Update parts of the documentation that are affected by your contribution.
+
+**Git Commit Messages**
+
+* Capitalize your commit messages.
+* Start your message with a verb.
+* Use present tense.
+* Refer to the issue/PR number in your squashed commit message.
+
+**SCSS Style Guide**
+
+* Two spaces, no tabs.
+* Dashes instead of underscores or camel case: `linear-gradient` **not** `linear_gradient` or `linearGradient`
+* Names should be descriptive and written in full-words: `$all-text-inputs-hover` **not** `$hover` or `$alltxthvr`
+* Space between property and value: `width: 20px` **not** `width:20px`
+* Declarations within a block should be ordered alphabetically.
+* Blank lines between rules.
+* No trailing whitespace. Blank lines should not have any space.
+

data/README.md

@@ -22,27 +22,36 @@ Then `cd` to your Sass directory and run:
 bitters install
 ```
 
-The generated folder will contain all Bitters files.
+A `base` directory will be generated which contains all of the Bitters files.
 
-Import Bitters after Bourbon in your `application.css.scss`. All additional stylesheets should be imported below Bitters.
+Import Bitters after Bourbon in your `application.css.scss` or main manifest file. 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.
+When using Neat, have the following line in `_base.scss` uncommented:
 
 ```scss
-@import "bourbon";
-@import "bitters/bitters";
-@import "neat";
+@import 'grid-settings';
+```
+
+If you are using Neat, import it after Bitters.
+
+```scss
+@import 'bourbon';
+@import 'base/base';
+@import 'neat';
 
 // All other imports
 ```
 
-Also, when using Neat, have the following lines in "_bitters.scss" uncommented:
+If you want to use Neat functions in Bitters files you can `@import 'grid-settings';` before Neat, remove `@import 'grid-settings';` from `_base.scss` and import the rest of bitters after. eg:
 
 ```scss
-@import "neat-helpers"; // or "../neat/neat-helpers" when not in Rails
-@import "grid-settings";
-```
+@import 'bourbon';
+@import 'base/grid-settings';
+@import 'neat';
+@import 'base/base';
 
+// All other imports
+```
 We suggest using [Normalize](http://necolas.github.io/normalize.css/) for a CSS reset with Bitters.
 
 Getting Started

data/Rakefile

@@ -1 +1,8 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec
+task :install => :spec
+task :release => :spec

data/app/assets/stylesheets/_base.scss

@@ -0,0 +1,24 @@
+// Bitters v0.10.0
+// http://bitters.bourbon.io
+
+// Variables
+@import 'variables';
+
+// Neat Settings -- uncomment if using Neat -- must be imported before Neat
+// @import 'grid-settings';
+
+// Mixins
+@import 'mixins/flash';
+
+// Extends
+@import 'extends/button';
+@import 'extends/clearfix';
+@import 'extends/hide-text';
+
+// Typography and Elements
+@import 'typography';
+@import 'forms';
+@import 'tables';
+@import 'lists';
+@import 'flashes';
+@import 'buttons';

data/app/assets/stylesheets/_buttons.scss

@@ -2,6 +2,7 @@ button,
 input[type="submit"] {
   @extend %button;
   @include appearance(none);
+  border: none;
   cursor: pointer;
   user-select: none;
   vertical-align: middle;

data/app/assets/stylesheets/_flashes.scss

@@ -1,3 +1,7 @@
+%flash-alert {
+  @include flash($alert-color);
+}
+
 %flash-error {
   @include flash($error-color);
 }

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

@@ -1,12 +1,12 @@
+@import 'neat-helpers'; // or '../neat/neat-helpers' when not in Rails
+
 // Neat Overrides
-///////////////////////////////////////////////////////////////////////////////
 // $column: 90px;
 // $gutter: 30px;
 // $grid-columns: 12;
 // $max-width: em(1088);
 
 // Neat Breakpoints
-///////////////////////////////////////////////////////////////////////////////
 $medium-screen: em(640);
 $large-screen: em(860);
 

data/app/assets/stylesheets/_lists.scss

@@ -17,7 +17,6 @@ ul, ol {
 }
 
 dl {
-  line-height: $base-line-height;
   margin-bottom: $base-line-height / 2;
 
   dt {

data/app/assets/stylesheets/_typography.scss

@@ -1,14 +1,15 @@
 body {
+  -webkit-font-smoothing: antialiased;
+  background-color: $base-background-color;
   color: $base-font-color;
   font-family: $base-font-family;
   font-size: $base-font-size;
-  -webkit-font-smoothing: antialiased;
-  line-height: $base-line-height;
+  line-height: $unitless-line-height;
 }
 
 h1, h2, h3, h4, h5, h6 {
   font-family: $header-font-family;
-  line-height: 1.25em;
+  line-height: $header-line-height;
   margin: 0;
   text-rendering: optimizeLegibility; // Fix the character spacing for headings
 }
@@ -42,9 +43,9 @@ p {
 }
 
 a {
+  @include transition(color 0.1s linear);
   color: $base-link-color;
   text-decoration: none;
-  @include transition(color 0.1s linear);
 
   &:hover {
     color: $hover-link-color;
@@ -69,24 +70,6 @@ img {
   max-width: 100%;
 }
 
-abbr, acronym {
-  border-bottom: 1px dotted $base-border-color;
-  cursor: help;
-}
-
-address {
-  display: block;
-  margin: 0 0 ($base-line-height / 2);
-}
-
-hgroup {
-  margin-bottom: $base-line-height / 2;
-}
-
-del {
-  color: lighten($base-font-color, 15);
-}
-
 blockquote {
   border-left: 2px solid $base-border-color;
   color: lighten($base-font-color, 15);

data/app/assets/stylesheets/_variables.scss

@@ -1,20 +1,17 @@
 // Typography
-///////////////////////////////////////////////////////////////////////////////
 $sans-serif: $helvetica;
 $serif: $georgia;
-
 $base-font-family: $sans-serif;
 $header-font-family: $base-font-family;
 
 // Sizes
-///////////////////////////////////////////////////////////////////////////////
 $base-font-size: 1em;
 $base-line-height: $base-font-size * 1.5;
+$unitless-line-height: $base-line-height / ($base-line-height * 0 + 1); // Strip units from line-height: https://developer.mozilla.org/en-US/docs/Web/CSS/line-height#Prefer_unitless_numbers_for_line-height_values
+$header-line-height: $base-font-size * 1.25;
 $base-border-radius: em(3);
 
 // Colors
-///////////////////////////////////////////////////////////////////////////////
-
 $blue: #477DCA;
 $dark-gray: #333;
 $medium-gray: #999;
@@ -23,21 +20,24 @@ $light-red: #FBE3E4;
 $light-yellow: #FFF6BF;
 $light-green: #E6EFC2;
 
-// Body Color
-$base-body-color: white;
+// Background Color
+$base-background-color: white;
 
-//  Font Colors
+// Font Colors
 $base-font-color: $dark-gray;
 $base-accent-color: $blue;
 
-//  Text Link Colors
+// Link Colors
 $base-link-color: $base-accent-color;
 $hover-link-color: darken($base-accent-color, 15);
+$base-button-color: $base-link-color;
+$hover-button-color: $hover-link-color;
 
 // Border color
 $base-border-color: $light-gray;
 
 // Flash Colors
+$alert-color: $light-yellow;
 $error-color: $light-red;
 $notice-color: $light-yellow;
 $success-color: $light-green;
@@ -51,6 +51,3 @@ $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,7 +1,17 @@
 %button {
-  @include button($button-style, $base-accent-color);
   -webkit-font-smoothing: antialiased;
+  background-color: $base-button-color;
+  border-radius: $base-border-radius;
+  color: white;
+  display: inline-block;
   font-size: $base-font-size;
   font-weight: bold;
-  line-height: 1em;
+  line-height: 1;
+  padding: .75em 1em;
+  text-decoration: none;
+
+  &:hover {
+    background-color: $hover-button-color;
+    color: white;
+  }
 }

data/bitters.gemspec

@@ -20,8 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
 
-  spec.add_dependency 'bourbon', '>= 3.1'
+  spec.add_dependency 'bourbon', '>= 3.2'
   spec.add_dependency 'sass', '>= 3.2'
   spec.add_dependency 'thor'
 end

data/lib/bitters/generator.rb

@@ -16,7 +16,7 @@ module Bitters
         puts "Bitters files already installed, doing nothing."
       else
         install_files
-        puts "Bitters files installed to #{install_path}/bitters"
+        puts "Bitters files installed to #{install_path}/base"
       end
     end
 
@@ -53,7 +53,7 @@ module Bitters
     end
 
     def install_path
-      Pathname.new(options[:path].to_s).join('bitters')
+      Pathname.new(options[:path].to_s).join('base')
     end
 
     def install_files
@@ -62,7 +62,7 @@ module Bitters
     end
 
     def remove_bitters_directory
-      FileUtils.rm_rf("bitters")
+      FileUtils.rm_rf("base")
     end
 
     def all_stylesheets

data/lib/bitters/version.rb

@@ -1,3 +1,3 @@
 module Bitters
-  VERSION = "0.9.5"
+  VERSION = "0.10.0"
 end

data/spec/bitters_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+require 'sass'
+require 'bourbon'
+
+describe Bitters do
+  after do
+    `rm -rf spec/fixtures/base`
+  end
+
+  it 'compiles to valid css' do
+    `bitters install --path spec/fixtures`
+
+    Sass.compile_file('spec/fixtures/application.scss', '/tmp/output.css')
+
+    expect(Pathname('/tmp/output.css')).to exist
+  end
+end

data/spec/fixtures/application.scss

@@ -0,0 +1,2 @@
+@import 'bourbon';
+@import 'base/base';

data/spec/spec_helper.rb

@@ -0,0 +1,3 @@
+$LOAD_PATH << File.join('../lib')
+
+require 'bitters'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitters
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.10.0
 platform: ruby
 authors:
 - Kyle Fiedler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,20 +39,34 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bourbon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -90,11 +104,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- app/assets/stylesheets/_bitters.scss
+- app/assets/stylesheets/_base.scss
 - app/assets/stylesheets/_buttons.scss
 - app/assets/stylesheets/_flashes.scss
 - app/assets/stylesheets/_forms.scss
@@ -105,16 +120,16 @@ files:
 - app/assets/stylesheets/_variables.scss
 - app/assets/stylesheets/extends/_button.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
+- spec/bitters_spec.rb
+- spec/fixtures/application.scss
+- spec/spec_helper.rb
 homepage: http://github.com/thoughtbot/bitters
 licenses:
 - MIT
@@ -139,4 +154,7 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Base styles for Web design
-test_files: []
+test_files:
+- spec/bitters_spec.rb
+- spec/fixtures/application.scss
+- spec/spec_helper.rb

data/app/assets/stylesheets/_bitters.scss

@@ -1,16 +0,0 @@
-// 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/extends';
-@import 'mixins/mixins';
-@import 'typography';
-@import 'forms';
-@import 'tables';
-@import 'lists';
-@import 'flashes';

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

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

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

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

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

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