bitters 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55da48d092aba563e925debd5754187cb9755eff
-  data.tar.gz: cbeb715ff4032828585e874be97a9927757928ff
+  metadata.gz: f2729f7f4fd51072ef769e5127bf576c95a43b55
+  data.tar.gz: 9c7bc5b58c2ea219757e3baa314c8321c4bb1c96
 SHA512:
-  metadata.gz: a432ad479ee7b9ca027f229301e27ec4192b6614e691cc564a6d9c3d8dd972077b421b405f86ac1db2f79ffdf6c78ff37d6c2be1ffc73d4d90df83150c618286
-  data.tar.gz: 5769a169d94e32f27c52f8f1bff3a0163002a171ccc8cb816ae1bb501770467d452713ac56fbecacc8f9afc3f010606dee8bf1d6e98f70483c6012ffa69b9ebc
+  metadata.gz: 7b3e68e07b15c9a4f7c231f4edf130e87ea63dc427405ccd83628e38960e4b93bdd0022ed10257c882198a1d857267d87b98b3bf0115b6cd5d72dcaf79f049fe
+  data.tar.gz: 63f719e9c48e8c4bc0e77417822a005c7890822eaf269f1e48f481539abdcc53753186493e65b94f4544dd5b2e24fbf8c22ff6b7fc96e2a011dba916f9a6d391

data/.scss-lint.yml

@@ -1,6 +1,8 @@
-# Up-to-date with SCSS-Lint v0.43.2
+scss_files: "**/*.scss"
 
-scss_files: "app/assets/stylesheets/**/*.scss"
+exclude: "node_modules/**"
+
+severity: warning
 
 linters:
   BangFormat:
@@ -107,6 +109,10 @@ linters:
   PlaceholderInExtend:
     enabled: true
 
+  PrivateNamingConvention:
+    enabled: false
+    prefix: _
+
   PropertyCount:
     enabled: false
 
@@ -174,6 +180,10 @@ linters:
   SpaceAfterPropertyName:
     enabled: true
 
+  SpaceAfterVariableColon:
+    enabled: true
+    style: one_space
+
   SpaceAfterVariableName:
     enabled: true
 

data/CONTRIBUTING.md

@@ -34,7 +34,7 @@ preview your changes! Running `gulp` to pull in the stylesheets and serve a smal
     $ gulp
     ```
 
-  This will have gulp compile the stylesheets from `app/assets/stylesheets` and link them to a test page so
+  This will have gulp compile the stylesheets from `core/` and link them to a test page so
   you can preview your changes!!
 
 5. Squash your commits into a single one (more on that [here](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html)).

data/Gulpfile.js

@@ -1,12 +1,12 @@
-var gulp = require("gulp"),
-  autoprefix = require("gulp-autoprefixer"),
-  sass = require("gulp-sass"),
-  connect = require("gulp-connect"),
-  bourbon = require("node-bourbon").includePaths;
+var bourbon    = require("bourbon").includePaths,
+    autoprefix = require("gulp-autoprefixer"),
+    connect    = require("gulp-connect"),
+    gulp       = require("gulp"),
+    sass       = require("gulp-sass");
 
 var paths = {
   scss: [
-    "./app/assets/stylesheets/**/*.scss",
+    "./core/**/*.scss",
     "./contrib/*.scss"
   ]
 };

data/README.md

@@ -18,7 +18,7 @@ for updates.
 ## Requirements
 
 - [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+
+- [Bourbon](https://github.com/thoughtbot/bourbon) 5.0+
 - Ruby 1.9.3+ (required to install Bitters from the command line)
 
 ## Installation
@@ -33,7 +33,7 @@ For command line help, visit our wiki page on Bitters’ [command line interface
 
   *If you use [rbenv](https://github.com/sstephenson/rbenv), be sure to run `rbenv rehash` without any errors.*
 
-2. Install [Bourbon](https://github.com/thoughtbot/bourbon#installation) (required) and [Neat](https://github.com/thoughtbot/neat#installation) (optional).
+2. Install [Bourbon](https://github.com/thoughtbot/bourbon#installation)
 
 3. Install the Bitters library into the current directory by running the following command at the command-line. If you’re using Ruby on Rails, run the command in `app/assets/stylesheets`:
 
@@ -50,33 +50,13 @@ For command line help, visit our wiki page on Bitters’ [command line interface
   @import "base/base";
   ```
 
-5. When using Neat, uncomment the following line in `_base.scss`:
-
-  ```scss
-  @import "grid-settings";
-  ```
-
-  And import Neat after Bitters in your `application.css.scss` or main manifest file:
-
-  ```scss
-  @import "bourbon";
-  @import "base/base";
-  @import "neat";
-
-  // All other imports
-  ```
-
-  **Note:** If you are using Bitters and Neat without Ruby on Rails, you need to change the import for `neat-helpers` inside `_grid-settings.scss` to `"../neat/neat-helpers"`.
-
-  If you want to use Neat functions in Bitters, you can `@import "grid-settings";` before Neat, remove `@import "grid-settings";` from `_base.scss` and import the rest of bitters after. For example:
+5. Once Bourbon and Bitters are set up, you can begin to import your styles below them.
 
   ```scss
   @import "bourbon";
-  @import "base/grid-settings";
-  @import "neat";
   @import "base/base";
-
-  // All other imports
+  @import "my-project-styles";
+  …
   ```
 
 ## Using Bitters
@@ -87,9 +67,6 @@ The Bitters directory should contain styles for all the basic elements used thro
 ### Variables
 This houses all variables that are used, or will be used, in more than one file in your site. Variable names in Bitters that are used outside of the variables file start with `$base` to indicate that they are the most basic variables.
 
-### Grid settings
-Variables specifically created for [Neat](http://neat.bourbon.io) resets and breakpoints. To be used, these need to be imported separately from the rest of your base file above Neat in your main stylesheet. Otherwise just remove the file.
-
 ### Typography
 All type is based on `$base-font-size` which is set to 1em (16px) by default. The spacing around type is based on `$base-line-height` so as to keep a semi-baseline grid. All sizes are scaled up or down by a factor of `0.25`.
 

data/bitters.gemspec

@@ -1,34 +1,38 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'bitters/version'
+require "bitters/version"
 
 Gem::Specification.new do |s|
-  s.name          = 'bitters'
-  s.version       = Bitters::VERSION
-  s.authors       = ['Kyle Fiedler', 'Reda Lemeden', 'Tyson Gach', 'Will McMahan']
-  s.email         = 'design+bourbon@thoughtbot.com'
-  s.homepage      = 'http://bitters.bourbon.io'
-  s.license       = 'MIT'
-  s.summary       = 'Scaffold styles, variables and structure for Bourbon projects.'
+  s.add_development_dependency "bundler", "~> 1.3"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "scss_lint", "~> 0.47"
+  s.add_runtime_dependency "bourbon", ">= 5.0.0.beta.1"
+  s.add_runtime_dependency "sass", "~> 3.4"
+  s.add_runtime_dependency "thor", "~> 0.19"
+  s.authors = [
+    "Kyle Fiedler",
+    "Reda Lemeden",
+    "Tyson Gach",
+    "Will McMahan",
+  ]
   s.description = <<-DESC
-Bitters helps designers start projects faster by defining a basic set of Sass
-variables, default element style and project structure. It’s been specifically
-designed for use within web applications. Bitters should live in your project’s
-root Sass directory and we encourage you to modify and extend it to meet your
-design and brand requirements.
+    Bitters helps designers start projects faster by defining a basic set of
+    Sass variables, default element style and project structure. It's been
+    specifically designed for use within web applications. Bitters should live
+    in your project's root Sass directory and we encourage you to modify and
+    extend it to meet your design and brand requirements.
   DESC
-  s.files         = `git ls-files`.split($/)
-  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = ['lib']
-
-  s.add_development_dependency 'bundler', '~> 1.3'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'scss_lint', '~> 0.43'
-
-  s.add_dependency 'bourbon', '>= 4.2'
-  s.add_dependency 'sass', '>= 3.4'
-  s.add_dependency 'thor'
+  s.email = "design+bitters@thoughtbot.com"
+  s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.files = `git ls-files`.split($/)
+  s.homepage = "http://bitters.bourbon.io"
+  s.license = "MIT"
+  s.name = "bitters"
+  s.require_paths = ["lib"]
+  s.summary = <<-SUMMARY
+    Scaffold styles, variables and structure for Bourbon projects.
+  SUMMARY
+  s.test_files = s.files.grep(%r{^(test|spec|features)/})
+  s.version = Bitters::VERSION
 end

data/contrib/styles.scss

@@ -1,5 +1,5 @@
 @import "bourbon";
-@import "../app/assets/stylesheets/base";
+@import "../core/base";
 
 body {
   margin: 0 0 ($base-spacing * 2);

data/{app/assets/stylesheets → core}/_base.scss

@@ -1,15 +1,14 @@
-// Bitters 1.2.0
+// Bitters 1.3.0
 // http://bitters.bourbon.io
 // Copyright 2013-2015 thoughtbot, inc.
 // MIT License
 
 @import "variables";
 
-// Neat Settings -- uncomment if using Neat -- must be imported before Neat
-// @import "grid-settings";
-
 @import "buttons";
 @import "forms";
+@import "layout";
 @import "lists";
+@import "media";
 @import "tables";
 @import "typography";

data/{app/assets/stylesheets → core}/_forms.scss

@@ -18,7 +18,8 @@ label {
 }
 
 input,
-select {
+select,
+textarea {
   display: block;
   font-family: $base-font-family;
   font-size: $base-font-size;
@@ -31,8 +32,6 @@ select[multiple] {
   border-radius: $base-border-radius;
   box-shadow: $form-box-shadow;
   box-sizing: border-box;
-  font-family: $base-font-family;
-  font-size: $base-font-size;
   margin-bottom: $small-spacing;
   padding: $base-spacing / 3;
   transition: border-color $base-duration $base-timing;
@@ -78,7 +77,7 @@ textarea {
 }
 
 select {
-  margin-bottom: $base-spacing;
+  margin-bottom: $small-spacing;
   max-width: 100%;
   width: auto;
 }

data/core/_layout.scss

@@ -0,0 +1,9 @@
+html {
+  box-sizing: border-box;
+}
+
+*,
+*::before,
+*::after {
+  box-sizing: inherit;
+}

data/core/_lists.scss

@@ -0,0 +1,19 @@
+ul,
+ol {
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
+}
+
+dl {
+  margin: 0;
+}
+
+dt {
+  font-weight: 600;
+  margin: 0;
+}
+
+dd {
+  margin: 0;
+}

data/core/_media.scss

@@ -0,0 +1,9 @@
+figure {
+  margin: 0;
+}
+
+img,
+picture {
+  margin: 0;
+  max-width: 100%;
+}

data/{app/assets/stylesheets → core}/_typography.scss

@@ -12,7 +12,7 @@ h4,
 h5,
 h6 {
   font-family: $heading-font-family;
-  font-size: $base-font-size;
+  font-size: modular-scale(1);
   line-height: $heading-line-height;
   margin: 0 0 $small-spacing;
 }
@@ -40,9 +40,3 @@ hr {
   border-top: 0;
   margin: $base-spacing 0;
 }
-
-img,
-picture {
-  margin: 0;
-  max-width: 100%;
-}

data/{app/assets/stylesheets → core}/_variables.scss

@@ -1,5 +1,9 @@
+// Breakpoints
+$medium-screen: 600px;
+$large-screen: 900px;
+
 // Typography
-$base-font-family: $helvetica;
+$base-font-family: $font-stack-system;
 $heading-font-family: $base-font-family;
 
 // Font Sizes

data/lib/bitters/generator.rb

@@ -70,7 +70,7 @@ module Bitters
     end
 
     def stylesheets_directory
-      File.join(top_level_directory, "app", "assets", "stylesheets")
+      File.join(top_level_directory, "core")
     end
 
     def top_level_directory

data/lib/bitters/version.rb

@@ -1,3 +1,3 @@
 module Bitters
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "Bitters",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Scaffold styles, variables and structure for Bourbon projects.",
   "main": "Gulpfile.js",
   "repository": {
@@ -23,11 +23,11 @@
     "url": "https://github.com/thoughtbot/bitters/issues"
   },
   "homepage": "http://bitters.bourbon.io",
-  "dependencies": {
-    "gulp": "^3.8.11",
-    "gulp-autoprefixer": "^2.3.1",
-    "gulp-connect": "^2.2.0",
-    "gulp-sass": "^2.0.2",
-    "node-bourbon": "^4.2.3"
+  "devDependencies": {
+    "bourbon": "^5.0.0-beta.1",
+    "gulp": "^3.9",
+    "gulp-autoprefixer": "^3.1",
+    "gulp-connect": "^2.3",
+    "gulp-sass": "^2.2"
   }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitters
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Kyle Fiedler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,65 +61,64 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.43'
+        version: '0.47'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.43'
+        version: '0.47'
 - !ruby/object:Gem::Dependency
   name: bourbon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.0.0.beta.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.0.0.beta.1
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: |
-  Bitters helps designers start projects faster by defining a basic set of Sass
-  variables, default element style and project structure. It’s been specifically
-  designed for use within web applications. Bitters should live in your project’s
-  root Sass directory and we encourage you to modify and extend it to meet your
-  design and brand requirements.
-email: design+bourbon@thoughtbot.com
-executables:
-- bitters
+        version: '0.19'
+description: |2
+      Bitters helps designers start projects faster by defining a basic set of
+      Sass variables, default element style and project structure. It's been
+      specifically designed for use within web applications. Bitters should live
+      in your project's root Sass directory and we encourage you to modify and
+      extend it to meet your design and brand requirements.
+email: design+bitters@thoughtbot.com
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -132,18 +131,19 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
-- app/assets/stylesheets/_base.scss
-- app/assets/stylesheets/_buttons.scss
-- app/assets/stylesheets/_forms.scss
-- app/assets/stylesheets/_grid-settings.scss
-- app/assets/stylesheets/_lists.scss
-- app/assets/stylesheets/_tables.scss
-- app/assets/stylesheets/_typography.scss
-- app/assets/stylesheets/_variables.scss
 - bin/bitters
 - bitters.gemspec
 - contrib/index.html
 - contrib/styles.scss
+- core/_base.scss
+- core/_buttons.scss
+- core/_forms.scss
+- core/_layout.scss
+- core/_lists.scss
+- core/_media.scss
+- core/_tables.scss
+- core/_typography.scss
+- core/_variables.scss
 - lib/bitters.rb
 - lib/bitters/generator.rb
 - lib/bitters/version.rb
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Scaffold styles, variables and structure for Bourbon projects.
@@ -180,4 +180,3 @@ test_files:
 - spec/bitters_spec.rb
 - spec/fixtures/application.scss
 - spec/spec_helper.rb
-has_rdoc: 

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

@@ -1,14 +0,0 @@
-@import "neat-helpers"; // or "../neat/neat-helpers" when not in Rails
-
-// Neat Overrides
-// $column: 90px;
-// $gutter: 30px;
-// $grid-columns: 12;
-// $max-width: 1200px;
-
-// Neat Breakpoints
-$medium-screen: 600px;
-$large-screen: 900px;
-
-$medium-screen-up: new-breakpoint(min-width $medium-screen 4);
-$large-screen-up: new-breakpoint(min-width $large-screen 8);

data/app/assets/stylesheets/_lists.scss

@@ -1,19 +0,0 @@
-ul,
-ol {
-  list-style-type: none;
-  margin: 0;
-  padding: 0;
-}
-
-dl {
-  margin-bottom: $small-spacing;
-
-  dt {
-    font-weight: 600;
-    margin-top: $small-spacing;
-  }
-
-  dd {
-    margin: 0;
-  }
-}