bitters 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e22cad3ebff50fe64932c8c6f4408ebcb17e759
-  data.tar.gz: 99e265432c657f9e6a817e34b911755f01e2cdbd
+  metadata.gz: 55da48d092aba563e925debd5754187cb9755eff
+  data.tar.gz: cbeb715ff4032828585e874be97a9927757928ff
 SHA512:
-  metadata.gz: b84ceea5d1509e266b468203c85e2d3f50fac2fe63a69e360a57980c92596fccdb9bdc303531bf3fc4a188b140cebc7c5722aea75530df2d88578d42e3823697
-  data.tar.gz: ae066809a3152dca0c72abc10633120608eb5f14cb43d6185dcce2860dcd3ecafe7174c9fe38c57e3d1824f43ce0cbd987363a4833346cfb43e6037c5fd66e94
+  metadata.gz: a432ad479ee7b9ca027f229301e27ec4192b6614e691cc564a6d9c3d8dd972077b421b405f86ac1db2f79ffdf6c78ff37d6c2be1ffc73d4d90df83150c618286
+  data.tar.gz: 5769a169d94e32f27c52f8f1bff3a0163002a171ccc8cb816ae1bb501770467d452713ac56fbecacc8f9afc3f010606dee8bf1d6e98f70483c6012ffa69b9ebc

data/.scss-lint.yml

@@ -1,14 +1,235 @@
+# Up-to-date with SCSS-Lint v0.43.2
+
 scss_files: "app/assets/stylesheets/**/*.scss"
+
 linters:
+  BangFormat:
+    enabled: true
+    space_before_bang: true
+    space_after_bang: false
+
+  BemDepth:
+    enabled: false
+
+  BorderZero:
+    enabled: true
+    convention: zero
+
+  ChainedClasses:
+    enabled: false
+
+  ColorKeyword:
+    enabled: true
+
   ColorVariable:
+    enabled: true
+
+  Comment:
+    enabled: true
+    style: silent
+
+  DebugStatement:
+    enabled: true
+
+  DeclarationOrder:
+    enabled: true
+
+  DisableLinterReason:
+    enabled: false
+
+  DuplicateProperty:
+    enabled: true
+
+  ElsePlacement:
+    enabled: true
+    style: same_line
+
+  EmptyLineBetweenBlocks:
+    enabled: true
+    ignore_single_line_blocks: true
+
+  EmptyRule:
+    enabled: true
+
+  ExtendDirective:
     enabled: false
+
+  FinalNewline:
+    enabled: true
+    present: true
+
+  HexLength:
+    enabled: true
+    style: short
+
+  HexNotation:
+    enabled: true
+    style: lowercase
+
+  HexValidation:
+    enabled: true
+
+  IdSelector:
+    enabled: true
+
+  ImportantRule:
+    enabled: true
+
+  ImportPath:
+    enabled: true
+    leading_underscore: false
+    filename_extension: false
+
+  Indentation:
+    enabled: true
+    allow_non_nested_indentation: false
+    character: space
+    width: 2
+
   LeadingZero:
     enabled: true
     style: include_zero
+
+  MergeableSelector:
+    enabled: true
+    force_nesting: true
+
+  NameFormat:
+    enabled: true
+    allow_leading_underscore: true
+    convention: hyphenated_lowercase
+
+  NestingDepth:
+    enabled: true
+    max_depth: 3
+    ignore_parent_selectors: false
+
+  PlaceholderInExtend:
+    enabled: true
+
   PropertyCount:
     enabled: false
+
+  PropertySortOrder:
+    enabled: true
+    ignore_unspecified: false
+    min_properties: 2
+    separate_groups: false
+
+  PropertySpelling:
+    enabled: true
+    extra_properties: []
+    disabled_properties: []
+
+  PropertyUnits:
+    enabled: true
+    global: [
+      'ch', 'em', 'ex', 'rem',
+      'cm', 'in', 'mm', 'pc', 'pt', 'px', 'q',
+      'vh', 'vw', 'vmin', 'vmax',
+      'deg', 'grad', 'rad', 'turn',
+      'ms', 's',
+      'Hz', 'kHz',
+      'dpi', 'dpcm', 'dppx',
+      '%']
+    properties:
+      line-height: []
+
+  PseudoElement:
+    enabled: true
+
   QualifyingElement:
-    enabled: false
+    enabled: true
+    allow_element_with_attribute: false
+    allow_element_with_class: false
+    allow_element_with_id: false
+
+  SelectorDepth:
+    enabled: true
+    max_depth: 3
+
+  SelectorFormat:
+    enabled: true
+    convention: hyphenated_lowercase
+
+  Shorthand:
+    enabled: true
+    allowed_shorthands: [1, 2, 3]
+
+  SingleLinePerProperty:
+    enabled: true
+    allow_single_line_rule_sets: true
+
+  SingleLinePerSelector:
+    enabled: true
+
+  SpaceAfterComma:
+    enabled: true
+    style: one_space
+
+  SpaceAfterPropertyColon:
+    enabled: true
+    style: one_space
+
+  SpaceAfterPropertyName:
+    enabled: true
+
+  SpaceAfterVariableName:
+    enabled: true
+
+  SpaceAroundOperator:
+    enabled: true
+    style: one_space
+
+  SpaceBeforeBrace:
+    enabled: true
+    style: space
+    allow_single_line_padding: false
+
+  SpaceBetweenParens:
+    enabled: true
+    spaces: 0
+
   StringQuotes:
     enabled: true
     style: double_quotes
+
+  TrailingSemicolon:
+    enabled: true
+
+  TrailingWhitespace:
+    enabled: true
+
+  TrailingZero:
+    enabled: false
+
+  TransitionAll:
+    enabled: false
+
+  UnnecessaryMantissa:
+    enabled: true
+
+  UnnecessaryParentReference:
+    enabled: true
+
+  UrlFormat:
+    enabled: true
+
+  UrlQuotes:
+    enabled: true
+
+  VariableForProperty:
+    enabled: false
+    properties: []
+
+  VendorPrefix:
+    enabled: true
+    identifier_list: base
+    additional_identifiers: []
+    excluded_identifiers: []
+
+  ZeroUnit:
+    enabled: true
+
+  Compass::*:
+    enabled: false

data/Gulpfile.js

@@ -5,7 +5,10 @@ var gulp = require("gulp"),
   bourbon = require("node-bourbon").includePaths;
 
 var paths = {
-  scss: "./contrib/*.scss"
+  scss: [
+    "./app/assets/stylesheets/**/*.scss",
+    "./contrib/*.scss"
+  ]
 };
 
 gulp.task("sass", function () {

data/app/assets/stylesheets/_base.scss

@@ -1,4 +1,4 @@
-// Bitters 1.1.0
+// Bitters 1.2.0
 // http://bitters.bourbon.io
 // Copyright 2013-2015 thoughtbot, inc.
 // MIT License

data/app/assets/stylesheets/_forms.scss

@@ -1,33 +1,31 @@
 fieldset {
-  background-color: $secondary-background-color;
-  border: $base-border;
-  margin: 0 0 $small-spacing;
-  padding: $base-spacing;
+  background-color: transparent;
+  border: 0;
+  margin: 0;
+  padding: 0;
 }
 
-input,
-label,
-select {
-  display: block;
-  font-family: $base-font-family;
-  font-size: $base-font-size;
+legend {
+  font-weight: 600;
+  margin-bottom: $small-spacing / 2;
+  padding: 0;
 }
 
 label {
+  display: block;
   font-weight: 600;
   margin-bottom: $small-spacing / 2;
+}
 
-  &.required::after {
-    content: "*";
-  }
-
-  abbr {
-    display: none;
-  }
+input,
+select {
+  display: block;
+  font-family: $base-font-family;
+  font-size: $base-font-size;
 }
 
 #{$all-text-inputs},
-select[multiple=multiple] {
+select[multiple] {
   background-color: $base-background-color;
   border: $base-border;
   border-radius: $base-border-radius;
@@ -64,21 +62,17 @@ textarea {
   resize: vertical;
 }
 
-input[type="search"] {
+[type="search"] {
   appearance: none;
 }
 
-input[type="checkbox"],
-input[type="radio"] {
+[type="checkbox"],
+[type="radio"] {
   display: inline;
   margin-right: $small-spacing / 2;
-
-  + label {
-    display: inline-block;
-  }
 }
 
-input[type="file"] {
+[type="file"] {
   margin-bottom: $small-spacing;
   width: 100%;
 }

data/app/assets/stylesheets/_lists.scss

@@ -3,25 +3,13 @@ ol {
   list-style-type: none;
   margin: 0;
   padding: 0;
-
-  &%default-ul {
-    list-style-type: disc;
-    margin-bottom: $small-spacing;
-    padding-left: $base-spacing;
-  }
-
-  &%default-ol {
-    list-style-type: decimal;
-    margin-bottom: $small-spacing;
-    padding-left: $base-spacing;
-  }
 }
 
 dl {
   margin-bottom: $small-spacing;
 
   dt {
-    font-weight: bold;
+    font-weight: 600;
     margin-top: $small-spacing;
   }
 

data/app/assets/stylesheets/_tables.scss

@@ -1,6 +1,5 @@
 table {
   border-collapse: collapse;
-  font-feature-settings: "kern", "liga", "tnum";
   margin: $small-spacing 0;
   table-layout: fixed;
   width: 100%;

data/app/assets/stylesheets/_typography.scss

@@ -1,7 +1,6 @@
 body {
   color: $base-font-color;
   font-family: $base-font-family;
-  font-feature-settings: "kern", "liga", "pnum";
   font-size: $base-font-size;
   line-height: $base-line-height;
 }

data/app/assets/stylesheets/_variables.scss

@@ -16,7 +16,7 @@ $small-spacing: $base-spacing / 2;
 $base-z-index: 0;
 
 // Colors
-$blue: #477dca;
+$blue: #1565c0;
 $dark-gray: #333;
 $medium-gray: #999;
 $light-gray: #ddd;

data/bitters.gemspec

@@ -26,7 +26,7 @@ design and brand requirements.
   s.add_development_dependency 'bundler', '~> 1.3'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'scss_lint', '~> 0.40'
+  s.add_development_dependency 'scss_lint', '~> 0.43'
 
   s.add_dependency 'bourbon', '>= 4.2'
   s.add_dependency 'sass', '>= 3.4'

data/contrib/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta http-equiv="x-ua-compatible" content="ie=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>Have fun ♥️</title>
     <link rel="stylesheet" href="styles.css">
@@ -69,26 +69,14 @@
         <dt>Definition Term Title 3</dt>
         <dd>Definition term description</dd>
       </dl>
-      <h2><code>%default-ol</code> Ordered List</h2>
-      <ol class="default-ol">
-        <li>List Item 1</li>
-        <li>List Item 2</li>
-        <li>List Item 3</li>
-      </ol>
-      <h2><code>%default-ul</code> Unordered List</h2>
-      <ul class="default-ul">
-        <li>List Item 1</li>
-        <li>List Item 2</li>
-        <li>List Item 3</li>
-      </ul>
       <hr>
       <form>
-        <label for="text_field">Text Field</label>
-        <input id="text_field" type="text">
-        <label for="text_field">Disabled Text Field</label>
-        <input id="text_field" type="text" disabled>
-        <label for="text_area">Text Area</label>
-        <textarea id="text_area"></textarea>
+        <label for="text-field">Text Field</label>
+        <input id="text-field" type="text">
+        <label for="disabled-text-field">Disabled Text Field</label>
+        <input id="disabled-text-field" type="text" disabled>
+        <label for="text-area">Text Area</label>
+        <textarea id="text-area"></textarea>
         <label for="password">Password</label>
         <input id="password" type="password">
         <label for="search">Search</label>
@@ -108,56 +96,48 @@
             <option value="3">Option 3</option>
           </optgroup>
         </select>
-        <label for="select_multiple">Select Multiple</label>
-        <select id="select_multiple" multiple>
+        <label for="select-multiple">Select Multiple</label>
+        <select id="select-multiple" multiple>
           <option value="1">Option 1</option>
           <option value="2">Option 2</option>
           <option value="3">Option 3</option>
         </select>
         <fieldset>
           <legend>Fieldset</legend>
-          <label for="first_name">First Name</label>
-          <input type="text" id="first_name" placeholder="Bill">
-          <label for="last_name">Last Name</label>
-          <input type="text" id="last_name" placeholder="Murray">
+          <label for="first-name">First Name</label>
+          <input type="text" id="first-name" placeholder="Bill">
+          <label for="last-name">Last Name</label>
+          <input type="text" id="last-name" placeholder="Murray">
         </fieldset>
         <fieldset>
-          <legend>Fieldset</legend>
-          <label for="radio_buttons">Radio Buttons</label>
+          <legend>Radio Fieldset</legend>
           <label>
-            <input type="radio" value="radio_1">
-            Radio 1
+            <input type="radio" name="radio-buttons" value="radio-1"> Radio 1
           </label>
           <label>
-            <input type="radio" value="radio_2">
-            Radio 2
+            <input type="radio" name="radio-buttons" value="radio-2"> Radio 2
           </label>
           <label>
-            <input type="radio" value="radio_3">
-            Radio 3
+            <input type="radio" name="radio-buttons" value="radio-3"> Radio 3
           </label>
         </fieldset>
         <fieldset>
-          <legend>Fieldset</legend>
-          <label for="checkboxes">Checkboxes</label>
+          <legend>Checkbox Fieldset</legend>
           <label>
-            <input type="checkbox" value="check_1" checked>
-            Checkbox 1
+            <input type="checkbox" name="checkboxes" value="check-1" checked> Checkbox 1
           </label>
           <label>
-            <input type="checkbox" value="check_2">
-            Checkbox 2
+            <input type="checkbox" name="checkboxes" value="check-2"> Checkbox 2
           </label>
           <label>
-            <input type="checkbox" value="check_3">
-            Checkbox 3
+            <input type="checkbox" name="checkboxes" value="check-3"> Checkbox 3
           </label>
         </fieldset>
         <input type="submit" value="Submit">
         <input type="submit" value="Disabled" disabled>
       </form>
       <hr>
-      <table cellspacing="0" cellpadding="0">
+      <table>
         <tr>
           <th>Table Header 1</th>
           <th>Table Header 2</th>

data/contrib/styles.scss

@@ -11,14 +11,6 @@ body {
   max-width: 500px;
 }
 
-.default-ol {
-  @extend %default-ol;
-}
-
-.default-ul {
-  @extend %default-ul;
-}
-
 .welcome-message {
   @include padding($base-spacing null);
   background-color: #f2f2f2;

data/lib/bitters/version.rb

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "Bitters",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Scaffold styles, variables and structure for Bourbon projects.",
   "main": "Gulpfile.js",
   "repository": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitters
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Kyle Fiedler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-28 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,14 +61,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
+        version: '0.43'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
+        version: '0.43'
 - !ruby/object:Gem::Dependency
   name: bourbon
   requirement: !ruby/object:Gem::Requirement
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Scaffold styles, variables and structure for Bourbon projects.
@@ -180,3 +180,4 @@ test_files:
 - spec/bitters_spec.rb
 - spec/fixtures/application.scss
 - spec/spec_helper.rb
+has_rdoc: