bitters 0.10.1 → 1.0.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- MmQ5YWRmNGQ3NDczNTlhMTEyOTIwZDQxNGRjYWRjZDRmZmE4MjM2OQ==
5
- data.tar.gz: !binary |-
6
- NWM3YzM2M2QyZTNjNWZiYTFkMWFiZTI4NjM0NGE0OGJhNmVjNmZlMQ==
2
+ SHA1:
3
+ metadata.gz: d8d2db37daf03e0be0d9aa416aedbdf14ad5f3f9
4
+ data.tar.gz: 2fb5ffe4e4919fd72036a862da70d62de7768fbc
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- NjA1MDk0YTQ5MTc3NTYxYTdjY2Q3MTNiMDRmODkxMDY3NWNhMDQ4OGRkMjIz
10
- Y2NiOWUwNGE1Nzk2ZTFlNTYxMjdhMGYxZjBlY2ZjNDFhYjhiMmQ4ZTk4MjA5
11
- NjljNTk3ODhkM2Y0ZThmNmUzMWQwZDRiOTQ5NmJmNzA2YjQzNmM=
12
- data.tar.gz: !binary |-
13
- Y2YyZmZiMDA3MTllZGEwNTc0ODNmOWJhNGQ0NTIxNmEyMjFlMzZhMTY4MjVk
14
- MjQxMGYwMzRjNzBjZGJkY2Q3MDk0NTZjMWM4NmZjZTdmZDllMGRlNDMwNWNl
15
- MzU0MjNlNGJjYjIxNmQ3YjJjNTA1MTNkZDQ4YzY3ODExM2VlY2Q=
6
+ metadata.gz: 398669d7b49a72b13391edecf12146754afa240a348fd6182560ac92084a18265b63e3a494f016855c60d81c3620f853b8f22194565b00ec63bd6e54577541af
7
+ data.tar.gz: 88a5f13f3b2d9061d0b1eddbb54f08988aced8c1147df7d50a716e822f838eed352267d6ada17f5fe55da7470a590f40fd77bd6bbe63f8d30d2af5291858c1be
@@ -32,4 +32,3 @@ Some things that will increase the chance that your pull request is accepted:
32
32
  * Declarations within a block should be ordered alphabetically.
33
33
  * Blank lines between rules.
34
34
  * No trailing whitespace. Blank lines should not have any space.
35
-
data/LICENSE.md CHANGED
@@ -1,8 +1,6 @@
1
- LICENSE
1
+ The MIT License (MIT)
2
2
 
3
- The MIT License
4
-
5
- Copyright (c) 2014 thoughtbot, inc.
3
+ Copyright © 2013–2015 [thoughtbot, inc.](http://thoughtbot.com)
6
4
 
7
5
  Permission is hereby granted, free of charge, to any person obtaining a copy
8
6
  of this software and associated documentation files (the “Software”), to deal
@@ -11,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11
9
  copies of the Software, and to permit persons to whom the Software is
12
10
  furnished to do so, subject to the following conditions:
13
11
 
14
- The above copyright notice and this permission notice shall be included in
15
- all copies or substantial portions of the Software.
12
+ The above copyright notice and this permission notice shall be included in all
13
+ copies or substantial portions of the Software.
16
14
 
17
15
  THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18
16
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19
17
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20
18
  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21
19
  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23
- THE SOFTWARE.
20
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21
+ SOFTWARE.
data/README.md CHANGED
@@ -1,14 +1,16 @@
1
- # Bitters
1
+ [![Bitters](http://images.thoughtbot.com/bourbon/bitters-logo.svg)](http://bitters.bourbon.io)
2
2
 
3
3
  [![Gem Version](http://img.shields.io/gem/v/bitters.svg?style=flat)](https://rubygems.org/gems/bitters)
4
4
 
5
- ***
6
-
7
- ## Scaffold styles, variables and structure for [Bourbon](http://bourbon.io) projects.
5
+ ## Scaffold styles, variables and structure for Bourbon projects.
8
6
 
9
7
  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.
10
8
 
11
- Bitters is made to work alongside a CSS reset and not replace it. Our suggested reset is [Normalize](http://necolas.github.io/normalize.css).
9
+ Bitters is made to work alongside a CSS reset; not replace one. Our suggested reset is [Normalize](http://necolas.github.io/normalize.css).
10
+
11
+ - **[Demo](http://bitters.bourbon.io)**
12
+ - **[Changelog](https://github.com/thoughtbot/bitters/releases)**
13
+ - **[Issues & Bugs](https://github.com/thoughtbot/bitters/issues)**
12
14
 
13
15
  ## Requirements
14
16
 
@@ -18,11 +20,9 @@ Bitters is made to work alongside a CSS reset and not replace it. Our suggested
18
20
 
19
21
  ## Installation
20
22
 
21
- Bitters uses the [RubyGems](https://rubygems.org) package manager to easily generate a `base` directory with all of the necessary files.
22
-
23
- For command line help, use `bitters help` or visit the [Command Line Interface Wiki](https://github.com/thoughtbot/bitters/wiki/Command-Line-Interface).
23
+ For command line help, visit our wiki page on Bitters’ [command line interface](https://github.com/thoughtbot/bitters/wiki/Command-Line-Interface).
24
24
 
25
- 1. Install the Bitters gem:
25
+ 1. Install the Bitters gem using the [RubyGems](https://rubygems.org) package manager:
26
26
 
27
27
  ```bash
28
28
  gem install bitters
@@ -32,7 +32,7 @@ For command line help, use `bitters help` or visit the [Command Line Interface W
32
32
 
33
33
  2. Install [Bourbon](https://github.com/thoughtbot/bourbon#installation) (required) and [Neat](https://github.com/thoughtbot/neat#installation) (optional).
34
34
 
35
- 3. Install the Bitters library into the current directory:
35
+ 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`:
36
36
 
37
37
  ```bash
38
38
  bitters install
@@ -53,7 +53,7 @@ For command line help, use `bitters help` or visit the [Command Line Interface W
53
53
  @import "grid-settings";
54
54
  ```
55
55
 
56
- And import Neat after Bitters:
56
+ And import Neat after Bitters in your `application.css.scss` or main manifest file:
57
57
 
58
58
  ```scss
59
59
  @import "bourbon";
@@ -63,6 +63,8 @@ For command line help, use `bitters help` or visit the [Command Line Interface W
63
63
  // All other imports
64
64
  ```
65
65
 
66
+ **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"`.
67
+
66
68
  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:
67
69
 
68
70
  ```scss
@@ -86,7 +88,7 @@ This houses all variables that are used, or will be used, in more than one file
86
88
  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.
87
89
 
88
90
  ### Typography
89
- 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 `.25`.
91
+ 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`.
90
92
 
91
93
  ### Lists
92
94
  All lists have stripped out styles. No bullets, no left padding. To add back the expected browser default styles add `@extend %default-ul;` or `@extend %default-ol;` to the `<ul>` or `<ol>` respectively.
@@ -95,24 +97,21 @@ All lists have stripped out styles. No bullets, no left padding. To add back the
95
97
  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.
96
98
 
97
99
  ### Buttons
98
- 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).
99
-
100
- ### Flashes
101
- Used for any error, warning or success messages in applications or forms. Specifically made for [Ruby on Rails](http://rubyonrails.org) application notices.
100
+ Basic style for `button` and `input[type="submit"]`. Base button styles can be changed by modifying the `%button` extend in `base/extends/_button.scss`.
102
101
 
103
102
  ## The Bourbon family
104
103
 
105
- - [Bourbon](http://bourbon.io): A simple and lightweight mixin library for Sass
106
- - [Neat](http://neat.bourbon.io): A lightweight semantic grid framework for Sass and Bourbon
107
- - [Bitters](http://bitters.bourbon.io): Scaffold styles, variables and structure for Bourbon projects
108
- - [Refills](http://refills.bourbon.io): Prepackaged patterns and components, built on top of Bourbon, Bitters & Neat
104
+ - [Bourbon](https://github.com/thoughtbot/bourbon): A simple and lightweight mixin library for Sass
105
+ - [Neat](https://github.com/thoughtbot/neat): A lightweight semantic grid framework for Sass and Bourbon
106
+ - [Bitters](https://github.com/thoughtbot/bitters): Scaffold styles, variables and structure for Bourbon projects
107
+ - [Refills](https://github.com/thoughtbot/refills): Prepackaged patterns and components built with Bourbon, Neat and Bitters
109
108
 
110
109
  ## Credits
111
110
 
112
- ![thoughtbot](http://thoughtbot.com/images/tm/logo.png)
111
+ [![thoughtbot](http://images.thoughtbot.com/bourbon/thoughtbot-logo.svg)](http://thoughtbot.com)
113
112
 
114
113
  Bitters is maintained and funded by [thoughtbot, inc](http://thoughtbot.com). Tweet your questions or suggestions to [@bourbonsass](https://twitter.com/bourbonsass) and while you’re at it follow us too.
115
114
 
116
115
  ## License
117
116
 
118
- Copyright © 2013–2014 [thoughtbot, inc](http://thoughtbot.com). Bitters is free software, and may be redistributed under the terms specified in the [license](LICENSE.md).
117
+ Copyright © 2013–2015 [thoughtbot, inc](http://thoughtbot.com). Bitters is free software, and may be redistributed under the terms specified in the [license](LICENSE.md).
@@ -1,24 +1,15 @@
1
- /* Bitters 0.10.0
2
- * http://bitters.bourbon.io
3
- * Copyright 2013–2014 thoughtbot, inc.
4
- * MIT License */
1
+ // Bitters 1.0.0
2
+ // http://bitters.bourbon.io
3
+ // Copyright 2013-2015 thoughtbot, inc.
4
+ // MIT License
5
5
 
6
- // Variables
7
6
  @import "variables";
8
7
 
9
8
  // Neat Settings -- uncomment if using Neat -- must be imported before Neat
10
9
  // @import "grid-settings";
11
10
 
12
- // Extends
13
- @import "extends/button";
14
- @import "extends/clearfix";
15
- @import "extends/errors";
16
- @import "extends/flashes";
17
- @import "extends/hide-text";
18
-
19
- // Typography and Elements
20
- @import "typography";
11
+ @import "buttons";
21
12
  @import "forms";
22
- @import "tables";
23
13
  @import "lists";
24
- @import "buttons";
14
+ @import "tables";
15
+ @import "typography";
@@ -1,10 +1,31 @@
1
- button,
2
- input[type="submit"] {
3
- @extend %button;
1
+ #{$all-button-inputs},
2
+ button {
4
3
  @include appearance(none);
4
+ -webkit-font-smoothing: antialiased;
5
+ background-color: $action-color;
6
+ border-radius: $base-border-radius;
5
7
  border: none;
8
+ color: #fff;
6
9
  cursor: pointer;
10
+ display: inline-block;
11
+ font-family: $base-font-family;
12
+ font-size: $base-font-size;
13
+ font-weight: 600;
14
+ line-height: 1;
15
+ padding: 0.75em 1em;
16
+ text-decoration: none;
7
17
  user-select: none;
8
18
  vertical-align: middle;
9
19
  white-space: nowrap;
20
+
21
+ &:hover,
22
+ &:focus {
23
+ background-color: darken($action-color, 15%);
24
+ color: #fff;
25
+ }
26
+
27
+ &:disabled {
28
+ cursor: not-allowed;
29
+ opacity: 0.5;
30
+ }
10
31
  }
@@ -1,7 +1,7 @@
1
1
  fieldset {
2
- background: lighten($base-border-color, 10);
2
+ background-color: lighten($base-border-color, 10%);
3
3
  border: $base-border;
4
- margin: 0 0 ($base-spacing / 2) 0;
4
+ margin: 0 0 $small-spacing;
5
5
  padding: $base-spacing;
6
6
  }
7
7
 
@@ -9,15 +9,15 @@ input,
9
9
  label,
10
10
  select {
11
11
  display: block;
12
- font-family: $form-font-family;
13
- font-size: $form-font-size;
12
+ font-family: $base-font-family;
13
+ font-size: $base-font-size;
14
14
  }
15
15
 
16
16
  label {
17
- font-weight: bold;
18
- margin-bottom: $base-spacing / 4;
17
+ font-weight: 600;
18
+ margin-bottom: $small-spacing / 2;
19
19
 
20
- &.required:after {
20
+ &.required::after {
21
21
  content: "*";
22
22
  }
23
23
 
@@ -26,27 +26,27 @@ label {
26
26
  }
27
27
  }
28
28
 
29
- textarea,
30
29
  #{$all-text-inputs},
31
- select[multiple=multiple] {
32
- @include box-sizing(border-box);
33
- @include transition(border-color);
34
- background-color: white;
35
- border-radius: $form-border-radius;
36
- border: 1px solid $form-border-color;
30
+ select[multiple=multiple],
31
+ textarea {
32
+ background-color: $base-background-color;
33
+ border: $base-border;
34
+ border-radius: $base-border-radius;
37
35
  box-shadow: $form-box-shadow;
38
- font-family: $form-font-family;
39
- font-size: $form-font-size;
36
+ box-sizing: border-box;
37
+ font-family: $base-font-family;
38
+ font-size: $base-font-size;
40
39
  margin-bottom: $base-spacing / 2;
41
- padding: ($base-spacing / 3) ($base-spacing / 3);
40
+ padding: $base-spacing / 3;
41
+ transition: border-color;
42
42
  width: 100%;
43
43
 
44
44
  &:hover {
45
- border-color: $form-border-color-hover;
45
+ border-color: darken($base-border-color, 10%);
46
46
  }
47
47
 
48
48
  &:focus {
49
- border-color: $form-border-color-focus;
49
+ border-color: $action-color;
50
50
  box-shadow: $form-box-shadow-focus;
51
51
  outline: none;
52
52
  }
@@ -63,11 +63,11 @@ input[type="search"] {
63
63
  input[type="checkbox"],
64
64
  input[type="radio"] {
65
65
  display: inline;
66
- margin-right: $base-spacing / 4;
66
+ margin-right: $small-spacing / 2;
67
67
  }
68
68
 
69
69
  input[type="file"] {
70
- padding-bottom: $base-spacing / 2;
70
+ padding-bottom: $small-spacing;
71
71
  width: 100%;
72
72
  }
73
73
 
@@ -1,28 +1,28 @@
1
1
  ul,
2
2
  ol {
3
+ list-style-type: none;
3
4
  margin: 0;
4
5
  padding: 0;
5
- list-style-type: none;
6
6
 
7
7
  &%default-ul {
8
8
  list-style-type: disc;
9
- margin-bottom: $base-spacing / 2;
9
+ margin-bottom: $small-spacing;
10
10
  padding-left: $base-spacing;
11
11
  }
12
12
 
13
13
  &%default-ol {
14
14
  list-style-type: decimal;
15
- margin-bottom: $base-spacing / 2;
15
+ margin-bottom: $small-spacing;
16
16
  padding-left: $base-spacing;
17
17
  }
18
18
  }
19
19
 
20
20
  dl {
21
- margin-bottom: $base-spacing / 2;
21
+ margin-bottom: $small-spacing;
22
22
 
23
23
  dt {
24
24
  font-weight: bold;
25
- margin-top: $base-spacing / 2;
25
+ margin-top: $small-spacing;
26
26
  }
27
27
 
28
28
  dd {
@@ -1,20 +1,21 @@
1
1
  table {
2
+ @include font-feature-settings("kern", "liga", "tnum");
2
3
  border-collapse: collapse;
3
- margin: ($base-spacing / 2) 0;
4
+ margin: $small-spacing 0;
4
5
  table-layout: fixed;
5
6
  width: 100%;
6
7
  }
7
8
 
8
9
  th {
9
- border-bottom: 1px solid darken($base-border-color, 15);
10
- font-weight: bold;
11
- padding: ($base-spacing / 2) 0;
10
+ border-bottom: 1px solid darken($base-border-color, 15%);
11
+ font-weight: 600;
12
+ padding: $small-spacing 0;
12
13
  text-align: left;
13
14
  }
14
15
 
15
16
  td {
16
17
  border-bottom: $base-border;
17
- padding: ($base-spacing / 2) 0;
18
+ padding: $small-spacing 0;
18
19
  }
19
20
 
20
21
  tr,
@@ -1,6 +1,6 @@
1
1
  body {
2
+ @include font-feature-settings("kern", "liga", "pnum");
2
3
  -webkit-font-smoothing: antialiased;
3
- background-color: $base-background-color;
4
4
  color: $base-font-color;
5
5
  font-family: $base-font-family;
6
6
  font-size: $base-font-size;
@@ -13,51 +13,29 @@ h3,
13
13
  h4,
14
14
  h5,
15
15
  h6 {
16
- font-family: $header-font-family;
17
- line-height: $header-line-height;
18
- margin: 0;
19
- text-rendering: optimizeLegibility; // Fix the character spacing for headings
20
- }
21
-
22
- h1 {
23
- font-size: $h1-font-size;
24
- }
25
-
26
- h2 {
27
- font-size: $h2-font-size;
28
- }
29
-
30
- h3 {
31
- font-size: $h3-font-size;
32
- }
33
-
34
- h4 {
35
- font-size: $h4-font-size;
36
- }
37
-
38
- h5 {
39
- font-size: $h5-font-size;
40
- }
41
-
42
- h6 {
43
- font-size: $h6-font-size;
16
+ font-family: $heading-font-family;
17
+ font-size: $base-font-size;
18
+ line-height: $heading-line-height;
19
+ margin: 0 0 $small-spacing;
44
20
  }
45
21
 
46
22
  p {
47
- margin: 0 0 ($base-spacing / 2);
23
+ margin: 0 0 $small-spacing;
48
24
  }
49
25
 
50
26
  a {
51
- @include transition(color 0.1s linear);
52
- color: $base-link-color;
27
+ color: $action-color;
53
28
  text-decoration: none;
29
+ transition: color 0.1s linear;
54
30
 
31
+ &:active,
32
+ &:focus,
55
33
  &:hover {
56
- color: $hover-link-color;
34
+ color: darken($action-color, 15%);
57
35
  }
58
36
 
59
- &:active, &:focus {
60
- color: $hover-link-color;
37
+ &:active,
38
+ &:focus {
61
39
  outline: none;
62
40
  }
63
41
  }
@@ -75,19 +53,3 @@ picture {
75
53
  margin: 0;
76
54
  max-width: 100%;
77
55
  }
78
-
79
- blockquote {
80
- border-left: 2px solid $base-border-color;
81
- color: lighten($base-font-color, 15);
82
- margin: $base-spacing 0;
83
- padding-left: $base-spacing / 2;
84
- }
85
-
86
- cite {
87
- color: lighten($base-font-color, 25);
88
- font-style: italic;
89
-
90
- &:before {
91
- content: "\2014 \00A0";
92
- }
93
- }
@@ -1,65 +1,35 @@
1
1
  // Typography
2
- $sans-serif: $helvetica;
3
- $serif: $georgia;
4
- $base-font-family: $sans-serif;
5
- $header-font-family: $base-font-family;
2
+ $base-font-family: $helvetica;
3
+ $heading-font-family: $base-font-family;
6
4
 
7
5
  // Font Sizes
8
6
  $base-font-size: 1em;
9
- $h1-font-size: $base-font-size * 2.25;
10
- $h2-font-size: $base-font-size * 2;
11
- $h3-font-size: $base-font-size * 1.75;
12
- $h4-font-size: $base-font-size * 1.5;
13
- $h5-font-size: $base-font-size * 1.25;
14
- $h6-font-size: $base-font-size;
15
7
 
16
8
  // Line height
17
9
  $base-line-height: 1.5;
18
- $header-line-height: 1.25;
10
+ $heading-line-height: 1.2;
19
11
 
20
12
  // Other Sizes
21
13
  $base-border-radius: 3px;
22
14
  $base-spacing: $base-line-height * 1em;
15
+ $small-spacing: $base-spacing / 2;
23
16
  $base-z-index: 0;
24
17
 
25
18
  // Colors
26
- $blue: #477DCA;
19
+ $blue: #477dca;
27
20
  $dark-gray: #333;
28
21
  $medium-gray: #999;
29
- $light-gray: #DDD;
30
- $light-red: #FBE3E4;
31
- $light-yellow: #FFF6BF;
32
- $light-green: #E6EFC2;
33
-
34
- // Background Color
35
- $base-background-color: white;
22
+ $light-gray: #ddd;
36
23
 
37
24
  // Font Colors
25
+ $base-background-color: #fff;
38
26
  $base-font-color: $dark-gray;
39
- $base-accent-color: $blue;
40
-
41
- // Link Colors
42
- $base-link-color: $base-accent-color;
43
- $hover-link-color: darken($base-accent-color, 15);
44
- $base-button-color: $base-link-color;
45
- $hover-button-color: $hover-link-color;
46
-
47
- // Flash Colors
48
- $alert-color: $light-yellow;
49
- $error-color: $light-red;
50
- $notice-color: lighten($base-accent-color, 40);
51
- $success-color: $light-green;
27
+ $action-color: $blue;
52
28
 
53
- // Border color
29
+ // Border
54
30
  $base-border-color: $light-gray;
55
31
  $base-border: 1px solid $base-border-color;
56
32
 
57
33
  // Forms
58
- $form-border-color: $base-border-color;
59
- $form-border-color-hover: darken($base-border-color, 10);
60
- $form-border-color-focus: $base-accent-color;
61
- $form-border-radius: $base-border-radius;
62
- $form-box-shadow: inset 0 1px 3px rgba(black,0.06);
63
- $form-box-shadow-focus: $form-box-shadow, 0 0 5px rgba(darken($form-border-color-focus, 5), 0.7);
64
- $form-font-size: $base-font-size;
65
- $form-font-family: $base-font-family;
34
+ $form-box-shadow: inset 0 1px 3px rgba(#000, 0.06);
35
+ $form-box-shadow-focus: $form-box-shadow, 0 0 5px adjust-color($action-color, $lightness: -5%, $alpha: -0.3);
@@ -3,26 +3,31 @@ lib = File.expand_path('../lib', __FILE__)
3
3
  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
4
  require 'bitters/version'
5
5
 
6
- Gem::Specification.new do |spec|
7
- spec.name = "bitters"
8
- spec.version = Bitters::VERSION
9
- spec.authors = ["Kyle Fiedler", "Reda Lemeden"]
10
- spec.email = ["support@thoughtbot.com"]
11
- spec.description = "Base styles for Web design"
12
- spec.summary = "Base styles for Web design"
13
- spec.homepage = "http://github.com/thoughtbot/bitters"
14
- spec.license = "MIT"
6
+ Gem::Specification.new do |s|
7
+ s.name = 'bitters'
8
+ s.version = Bitters::VERSION
9
+ s.authors = ['Kyle Fiedler', 'Reda Lemeden', 'Tyson Gach', 'Will McMahan']
10
+ s.email = 'design+bourbon@thoughtbot.com'
11
+ s.homepage = 'http://bitters.bourbon.io'
12
+ s.license = 'MIT'
13
+ s.summary = 'Scaffold styles, variables and structure for Bourbon projects.'
14
+ s.description = <<-DESC
15
+ Bitters helps designers start projects faster by defining a basic set of Sass
16
+ variables, default element style and project structure. It’s been specifically
17
+ designed for use within web applications. Bitters should live in your project’s
18
+ root Sass directory and we encourage you to modify and extend it to meet your
19
+ design and brand requirements.
20
+ DESC
21
+ s.files = `git ls-files`.split($/)
22
+ s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
23
+ s.test_files = s.files.grep(%r{^(test|spec|features)/})
24
+ s.require_paths = ['lib']
15
25
 
16
- spec.files = `git ls-files`.split($/)
17
- spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
18
- spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
19
- spec.require_paths = ["lib"]
26
+ s.add_development_dependency 'bundler', '~> 1.3'
27
+ s.add_development_dependency 'rake'
28
+ s.add_development_dependency 'rspec'
20
29
 
21
- spec.add_development_dependency 'bundler', '~> 1.3'
22
- spec.add_development_dependency 'rake'
23
- spec.add_development_dependency 'rspec'
24
-
25
- spec.add_dependency 'bourbon', '>= 3.2'
26
- spec.add_dependency 'sass', '>= 3.2'
27
- spec.add_dependency 'thor'
30
+ s.add_dependency 'bourbon', '>= 3.2'
31
+ s.add_dependency 'sass', '>= 3.2'
32
+ s.add_dependency 'thor'
28
33
  end
@@ -21,7 +21,7 @@ module Bitters
21
21
  end
22
22
 
23
23
  desc 'reset', 'Reset Bitters'
24
- def update
24
+ def reset
25
25
  if bitters_files_already_exist?
26
26
  remove_bitters_directory
27
27
  install_files
@@ -1,3 +1,3 @@
1
1
  module Bitters
2
- VERSION = "0.10.1"
2
+ VERSION = "1.0.0"
3
3
  end
data/sache.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "Bitters",
3
3
  "description": "Scaffold styles, variables and structure for Bourbon projects",
4
- "tags": ["structure", "variables", "forms", "buttons", "typography", "flashes"]
4
+ "tags": ["buttons", "forms", "structure", "typography", "variables"]
5
5
  }
metadata CHANGED
@@ -1,109 +1,115 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bitters
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.10.1
4
+ version: 1.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kyle Fiedler
8
8
  - Reda Lemeden
9
+ - Tyson Gach
10
+ - Will McMahan
9
11
  autorequire:
10
12
  bindir: bin
11
13
  cert_chain: []
12
- date: 2014-09-17 00:00:00.000000000 Z
14
+ date: 2015-01-29 00:00:00.000000000 Z
13
15
  dependencies:
14
16
  - !ruby/object:Gem::Dependency
15
17
  name: bundler
16
18
  requirement: !ruby/object:Gem::Requirement
17
19
  requirements:
18
- - - ~>
20
+ - - "~>"
19
21
  - !ruby/object:Gem::Version
20
22
  version: '1.3'
21
23
  type: :development
22
24
  prerelease: false
23
25
  version_requirements: !ruby/object:Gem::Requirement
24
26
  requirements:
25
- - - ~>
27
+ - - "~>"
26
28
  - !ruby/object:Gem::Version
27
29
  version: '1.3'
28
30
  - !ruby/object:Gem::Dependency
29
31
  name: rake
30
32
  requirement: !ruby/object:Gem::Requirement
31
33
  requirements:
32
- - - ! '>='
34
+ - - ">="
33
35
  - !ruby/object:Gem::Version
34
36
  version: '0'
35
37
  type: :development
36
38
  prerelease: false
37
39
  version_requirements: !ruby/object:Gem::Requirement
38
40
  requirements:
39
- - - ! '>='
41
+ - - ">="
40
42
  - !ruby/object:Gem::Version
41
43
  version: '0'
42
44
  - !ruby/object:Gem::Dependency
43
45
  name: rspec
44
46
  requirement: !ruby/object:Gem::Requirement
45
47
  requirements:
46
- - - ! '>='
48
+ - - ">="
47
49
  - !ruby/object:Gem::Version
48
50
  version: '0'
49
51
  type: :development
50
52
  prerelease: false
51
53
  version_requirements: !ruby/object:Gem::Requirement
52
54
  requirements:
53
- - - ! '>='
55
+ - - ">="
54
56
  - !ruby/object:Gem::Version
55
57
  version: '0'
56
58
  - !ruby/object:Gem::Dependency
57
59
  name: bourbon
58
60
  requirement: !ruby/object:Gem::Requirement
59
61
  requirements:
60
- - - ! '>='
62
+ - - ">="
61
63
  - !ruby/object:Gem::Version
62
64
  version: '3.2'
63
65
  type: :runtime
64
66
  prerelease: false
65
67
  version_requirements: !ruby/object:Gem::Requirement
66
68
  requirements:
67
- - - ! '>='
69
+ - - ">="
68
70
  - !ruby/object:Gem::Version
69
71
  version: '3.2'
70
72
  - !ruby/object:Gem::Dependency
71
73
  name: sass
72
74
  requirement: !ruby/object:Gem::Requirement
73
75
  requirements:
74
- - - ! '>='
76
+ - - ">="
75
77
  - !ruby/object:Gem::Version
76
78
  version: '3.2'
77
79
  type: :runtime
78
80
  prerelease: false
79
81
  version_requirements: !ruby/object:Gem::Requirement
80
82
  requirements:
81
- - - ! '>='
83
+ - - ">="
82
84
  - !ruby/object:Gem::Version
83
85
  version: '3.2'
84
86
  - !ruby/object:Gem::Dependency
85
87
  name: thor
86
88
  requirement: !ruby/object:Gem::Requirement
87
89
  requirements:
88
- - - ! '>='
90
+ - - ">="
89
91
  - !ruby/object:Gem::Version
90
92
  version: '0'
91
93
  type: :runtime
92
94
  prerelease: false
93
95
  version_requirements: !ruby/object:Gem::Requirement
94
96
  requirements:
95
- - - ! '>='
97
+ - - ">="
96
98
  - !ruby/object:Gem::Version
97
99
  version: '0'
98
- description: Base styles for Web design
99
- email:
100
- - support@thoughtbot.com
100
+ description: |
101
+ Bitters helps designers start projects faster by defining a basic set of Sass
102
+ variables, default element style and project structure. It’s been specifically
103
+ designed for use within web applications. Bitters should live in your project’s
104
+ root Sass directory and we encourage you to modify and extend it to meet your
105
+ design and brand requirements.
106
+ email: design+bourbon@thoughtbot.com
101
107
  executables:
102
108
  - bitters
103
109
  extensions: []
104
110
  extra_rdoc_files: []
105
111
  files:
106
- - .gitignore
112
+ - ".gitignore"
107
113
  - CONTRIBUTING.md
108
114
  - Gemfile
109
115
  - LICENSE.md
@@ -117,11 +123,6 @@ files:
117
123
  - app/assets/stylesheets/_tables.scss
118
124
  - app/assets/stylesheets/_typography.scss
119
125
  - app/assets/stylesheets/_variables.scss
120
- - app/assets/stylesheets/extends/_button.scss
121
- - app/assets/stylesheets/extends/_clearfix.scss
122
- - app/assets/stylesheets/extends/_errors.scss
123
- - app/assets/stylesheets/extends/_flashes.scss
124
- - app/assets/stylesheets/extends/_hide-text.scss
125
126
  - bin/bitters
126
127
  - bitters.gemspec
127
128
  - lib/bitters.rb
@@ -131,7 +132,7 @@ files:
131
132
  - spec/bitters_spec.rb
132
133
  - spec/fixtures/application.scss
133
134
  - spec/spec_helper.rb
134
- homepage: http://github.com/thoughtbot/bitters
135
+ homepage: http://bitters.bourbon.io
135
136
  licenses:
136
137
  - MIT
137
138
  metadata: {}
@@ -141,12 +142,12 @@ require_paths:
141
142
  - lib
142
143
  required_ruby_version: !ruby/object:Gem::Requirement
143
144
  requirements:
144
- - - ! '>='
145
+ - - ">="
145
146
  - !ruby/object:Gem::Version
146
147
  version: '0'
147
148
  required_rubygems_version: !ruby/object:Gem::Requirement
148
149
  requirements:
149
- - - ! '>='
150
+ - - ">="
150
151
  - !ruby/object:Gem::Version
151
152
  version: '0'
152
153
  requirements: []
@@ -154,7 +155,7 @@ rubyforge_project:
154
155
  rubygems_version: 2.2.2
155
156
  signing_key:
156
157
  specification_version: 4
157
- summary: Base styles for Web design
158
+ summary: Scaffold styles, variables and structure for Bourbon projects.
158
159
  test_files:
159
160
  - spec/bitters_spec.rb
160
161
  - spec/fixtures/application.scss
@@ -1,22 +0,0 @@
1
- %button {
2
- -webkit-font-smoothing: antialiased;
3
- background-color: $base-button-color;
4
- border-radius: $base-border-radius;
5
- color: white;
6
- display: inline-block;
7
- font-size: $base-font-size;
8
- font-weight: bold;
9
- line-height: 1;
10
- padding: 0.75em 1em;
11
- text-decoration: none;
12
-
13
- &:hover {
14
- background-color: $hover-button-color;
15
- color: white;
16
- }
17
-
18
- &:disabled {
19
- cursor: not-allowed;
20
- opacity: 0.5;
21
- }
22
- }
@@ -1,3 +0,0 @@
1
- %clearfix {
2
- @include clearfix;
3
- }
@@ -1,11 +0,0 @@
1
- %error {
2
- color: darken($error-color, 60);
3
- }
4
-
5
- %warning {
6
- color: darken($alert-color, 60);
7
- }
8
-
9
- %notice {
10
- color: darken($notice-color, 60);
11
- }
@@ -1,38 +0,0 @@
1
- @mixin flash($color) {
2
- background: $color;
3
- color: darken($color, 60);
4
-
5
- a {
6
- color: darken($color, 70);
7
-
8
- &:hover {
9
- color: darken($color, 90);
10
- }
11
- }
12
- }
13
-
14
- %flash-base {
15
- font-weight: bold;
16
- margin-bottom: $base-spacing / 2;
17
- padding: $base-spacing / 2;
18
- }
19
-
20
- %flash-alert {
21
- @extend %flash-base;
22
- @include flash($alert-color);
23
- }
24
-
25
- %flash-error {
26
- @extend %flash-base;
27
- @include flash($error-color);
28
- }
29
-
30
- %flash-notice {
31
- @extend %flash-base;
32
- @include flash($notice-color);
33
- }
34
-
35
- %flash-success {
36
- @extend %flash-base;
37
- @include flash($success-color);
38
- }
@@ -1,3 +0,0 @@
1
- %hide-text {
2
- @include hide-text;
3
- }