bitters 0.10.0 → 0.10.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- MDExM2E1YTc2ZWExMWVhOGIwNWFiNGQ5OGQ4OTdmYTg2MzM5MmE3OQ==
4
+ MmQ5YWRmNGQ3NDczNTlhMTEyOTIwZDQxNGRjYWRjZDRmZmE4MjM2OQ==
5
5
  data.tar.gz: !binary |-
6
- NjlmNTFjNmYyOTdjNWNkYjcxOWI3MTM0OGUyYmVkNWJlMTdjZjI3NA==
6
+ NWM3YzM2M2QyZTNjNWZiYTFkMWFiZTI4NjM0NGE0OGJhNmVjNmZlMQ==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- ZmY4OGFkNDA3ZmIwYTllMWZiNzBlOWE3MzNjMTFmMGJhZTUyMTczZTE2MzNm
10
- MDdiZjFkODFlNTMzZWFiYWI1YjViMGYxY2NlYmE3NGUxODZlY2ZjNDQyYjY3
11
- ZmY2MGRkOThjNGFkODgzN2MzODA2ZmRmZWQwNjgxOGNiNDQ2NDY=
9
+ NjA1MDk0YTQ5MTc3NTYxYTdjY2Q3MTNiMDRmODkxMDY3NWNhMDQ4OGRkMjIz
10
+ Y2NiOWUwNGE1Nzk2ZTFlNTYxMjdhMGYxZjBlY2ZjNDFhYjhiMmQ4ZTk4MjA5
11
+ NjljNTk3ODhkM2Y0ZThmNmUzMWQwZDRiOTQ5NmJmNzA2YjQzNmM=
12
12
  data.tar.gz: !binary |-
13
- NmQ0ZDlkZTIzZWI5NmYwY2RjOTQzNmFmYmQ0MTRjNWRiZWEzMTE5N2ViNzEz
14
- ZjE4ZTcwOTEyYzkzODM1MDI3NmYzNDBiMGJiMGU2NzcwM2VkZTg0OTlmN2Nj
15
- YjA5OWZhZDIxYTc2MTA4ODdkYTU4ZDVhNmEyODgxNzU5Mzc4ZWU=
13
+ Y2YyZmZiMDA3MTllZGEwNTc0ODNmOWJhNGQ0NTIxNmEyMjFlMzZhMTY4MjVk
14
+ MjQxMGYwMzRjNzBjZGJkY2Q3MDk0NTZjMWM4NmZjZTdmZDllMGRlNDMwNWNl
15
+ MzU0MjNlNGJjYjIxNmQ3YjJjNTA1MTNkZDQ4YzY3ODExM2VlY2Q=
data/.gitignore CHANGED
@@ -1,6 +1,6 @@
1
+ _site
1
2
  .DS_store
2
- .sass-cache/
3
- *.scssc
4
- /stylesheets/.sass-cache/
5
- pkg
3
+ .sass-cache
4
+ *gem
5
+ *swp
6
6
  Gemfile.lock
@@ -5,7 +5,7 @@ The MIT License
5
5
  Copyright (c) 2014 thoughtbot, inc.
6
6
 
7
7
  Permission is hereby granted, free of charge, to any person obtaining a copy
8
- of this software and associated documentation files (the "Software"), to deal
8
+ of this software and associated documentation files (the Software), to deal
9
9
  in the Software without restriction, including without limitation the rights
10
10
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11
11
  copies of the Software, and to permit persons to whom the Software is
@@ -14,7 +14,7 @@ furnished to do so, subject to the following conditions:
14
14
  The above copyright notice and this permission notice shall be included in
15
15
  all copies or substantial portions of the Software.
16
16
 
17
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17
+ THE SOFTWARE IS PROVIDED AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18
18
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19
19
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20
20
  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
data/README.md CHANGED
@@ -1,76 +1,95 @@
1
- Bitters
2
- ===
3
- Scaffold styles, variables and structure for [Bourbon](http://bourbon.io) projects.
1
+ # Bitters
4
2
 
5
- Bitters is meant to help designers start projects faster by defining a basic set of variables and project structure. After you have Bitters installed, jump in and start customizing the styles and variables to your design and brand requirements.
3
+ [![Gem Version](http://img.shields.io/gem/v/bitters.svg?style=flat)](https://rubygems.org/gems/bitters)
6
4
 
7
- Bitters should live in your project's sass root folder and be **modified** and extended while you design your project.
5
+ ***
8
6
 
9
- Install Instructions
10
- ===
11
- Install Bitters:
7
+ ## Scaffold styles, variables and structure for [Bourbon](http://bourbon.io) projects.
12
8
 
13
- ```bash
14
- gem install bitters
15
- ```
9
+ 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.
16
10
 
17
- Install [Bourbon](https://github.com/thoughtbot/bourbon#install-for-rails-31) (required) and [Neat](https://github.com/thoughtbot/neat#install-instructions) (optional).
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).
18
12
 
19
- Then `cd` to your Sass directory and run:
13
+ ## Requirements
20
14
 
21
- ```bash
22
- bitters install
23
- ```
15
+ - [Sass](https://github.com/sass/sass) 3.0+
16
+ - [Bourbon](https://github.com/thoughtbot/bourbon) 2.0+
17
+ - Ruby 1.9.3+ (required to install Bitters from the command line)
24
18
 
25
- A `base` directory will be generated which contains all of the Bitters files.
19
+ ## Installation
26
20
 
27
- Import Bitters after Bourbon in your `application.css.scss` or main manifest file. All additional stylesheets should be imported below Bitters.
21
+ Bitters uses the [RubyGems](https://rubygems.org) package manager to easily generate a `base` directory with all of the necessary files.
28
22
 
29
- When using Neat, have the following line in `_base.scss` uncommented:
23
+ For command line help, use `bitters help` or visit the [Command Line Interface Wiki](https://github.com/thoughtbot/bitters/wiki/Command-Line-Interface).
30
24
 
31
- ```scss
32
- @import 'grid-settings';
33
- ```
25
+ 1. Install the Bitters gem:
34
26
 
35
- If you are using Neat, import it after Bitters.
27
+ ```bash
28
+ gem install bitters
29
+ ```
36
30
 
37
- ```scss
38
- @import 'bourbon';
39
- @import 'base/base';
40
- @import 'neat';
31
+ *If you use [rbenv](https://github.com/sstephenson/rbenv), be sure to run `rbenv rehash` without any errors.*
41
32
 
42
- // All other imports
43
- ```
33
+ 2. Install [Bourbon](https://github.com/thoughtbot/bourbon#installation) (required) and [Neat](https://github.com/thoughtbot/neat#installation) (optional).
44
34
 
45
- 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:
35
+ 3. Install the Bitters library into the current directory:
46
36
 
47
- ```scss
48
- @import 'bourbon';
49
- @import 'base/grid-settings';
50
- @import 'neat';
51
- @import 'base/base';
37
+ ```bash
38
+ bitters install
39
+ ```
52
40
 
53
- // All other imports
54
- ```
55
- We suggest using [Normalize](http://necolas.github.io/normalize.css/) for a CSS reset with Bitters.
41
+ A `base` directory will be generated which contains all of the Bitters files.
56
42
 
57
- Getting Started
58
- ===
43
+ 4. Import Bitters after Bourbon in your `application.css.scss` or main manifest file. All additional stylesheets should be imported below Bitters.
44
+
45
+ ```bash
46
+ @import "bourbon";
47
+ @import "base/base";
48
+ ```
49
+
50
+ 5. When using Neat, uncomment the following line in `_base.scss`:
51
+
52
+ ```scss
53
+ @import "grid-settings";
54
+ ```
55
+
56
+ And import Neat after Bitters:
57
+
58
+ ```scss
59
+ @import "bourbon";
60
+ @import "base/base";
61
+ @import "neat";
62
+
63
+ // All other imports
64
+ ```
65
+
66
+ 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
+
68
+ ```scss
69
+ @import "bourbon";
70
+ @import "base/grid-settings";
71
+ @import "neat";
72
+ @import "base/base";
73
+
74
+ // All other imports
75
+ ```
76
+
77
+ ## Using Bitters
59
78
 
60
79
  ### Sass structure & default style
61
- The Bitters folder should contain styles for all the basic elements used throughout the project. It also contains folders for custom mixins and extends for your site as well. Add code to the existing files or add new files to the folders. Customize Bitters for your site as you see fit.
80
+ The Bitters directory should contain styles for all the basic elements used throughout the project. It also contains directories for custom mixins and extends for your site as well. Add code to the existing files or add new files to the directories. Customize Bitters for your site as you see fit.
62
81
 
63
82
  ### Variables
64
- 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.
83
+ 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.
65
84
 
66
85
  ### Grid settings
67
- Variables specifically created for Neat 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.
86
+ 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.
68
87
 
69
88
  ### Typography
70
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`.
71
90
 
72
91
  ### Lists
73
- 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..
92
+ 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.
74
93
 
75
94
  ### Forms
76
95
  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.
@@ -79,21 +98,21 @@ Adds basic styles all form elements. The variables at the top of the file all in
79
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).
80
99
 
81
100
  ### Flashes
82
- Used for any error, warning or success messages in applications or forms. Specifically made for rails application notices.
101
+ Used for any error, warning or success messages in applications or forms. Specifically made for [Ruby on Rails](http://rubyonrails.org) application notices.
102
+
103
+ ## The Bourbon family
83
104
 
84
- Requirements
85
- ===
86
- - Sass 3.0+
87
- - Bourbon 2.0+
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
88
109
 
89
- Credits
90
- ===
110
+ ## Credits
91
111
 
92
112
  ![thoughtbot](http://thoughtbot.com/images/tm/logo.png)
93
113
 
94
- Bitters is maintained and funded by [thoughtbot, inc](http://thoughtbot.com/community). Tweet your questions or suggestions at [@kylefiedler](https://twitter.com/kylefiedler).
114
+ 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.
95
115
 
96
- License
97
- ===
116
+ ## License
98
117
 
99
- Bitters is Copyright © 2014 thoughtbot. It is free software, and may be redistributed under the terms specified in the LICENSE file.
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).
@@ -1,24 +1,24 @@
1
- // Bitters v0.10.0
2
- // http://bitters.bourbon.io
1
+ /* Bitters 0.10.0
2
+ * http://bitters.bourbon.io
3
+ * Copyright 2013–2014 thoughtbot, inc.
4
+ * MIT License */
3
5
 
4
6
  // Variables
5
- @import 'variables';
7
+ @import "variables";
6
8
 
7
9
  // Neat Settings -- uncomment if using Neat -- must be imported before Neat
8
- // @import 'grid-settings';
9
-
10
- // Mixins
11
- @import 'mixins/flash';
10
+ // @import "grid-settings";
12
11
 
13
12
  // Extends
14
- @import 'extends/button';
15
- @import 'extends/clearfix';
16
- @import 'extends/hide-text';
13
+ @import "extends/button";
14
+ @import "extends/clearfix";
15
+ @import "extends/errors";
16
+ @import "extends/flashes";
17
+ @import "extends/hide-text";
17
18
 
18
19
  // Typography and Elements
19
- @import 'typography';
20
- @import 'forms';
21
- @import 'tables';
22
- @import 'lists';
23
- @import 'flashes';
24
- @import 'buttons';
20
+ @import "typography";
21
+ @import "forms";
22
+ @import "tables";
23
+ @import "lists";
24
+ @import "buttons";
@@ -1,8 +1,8 @@
1
1
  fieldset {
2
2
  background: lighten($base-border-color, 10);
3
- border: 1px solid $base-border-color;
4
- margin: 0 0 ($base-line-height / 2) 0;
5
- padding: $base-line-height;
3
+ border: $base-border;
4
+ margin: 0 0 ($base-spacing / 2) 0;
5
+ padding: $base-spacing;
6
6
  }
7
7
 
8
8
  input,
@@ -15,7 +15,7 @@ select {
15
15
 
16
16
  label {
17
17
  font-weight: bold;
18
- margin-bottom: $base-line-height / 4;
18
+ margin-bottom: $base-spacing / 4;
19
19
 
20
20
  &.required:after {
21
21
  content: "*";
@@ -37,8 +37,8 @@ select[multiple=multiple] {
37
37
  box-shadow: $form-box-shadow;
38
38
  font-family: $form-font-family;
39
39
  font-size: $form-font-size;
40
- margin-bottom: $base-line-height / 2;
41
- padding: ($base-line-height / 3) ($base-line-height / 3);
40
+ margin-bottom: $base-spacing / 2;
41
+ padding: ($base-spacing / 3) ($base-spacing / 3);
42
42
  width: 100%;
43
43
 
44
44
  &:hover {
@@ -60,19 +60,19 @@ input[type="search"] {
60
60
  @include appearance(none);
61
61
  }
62
62
 
63
- input[type="checkbox"], input[type="radio"] {
63
+ input[type="checkbox"],
64
+ input[type="radio"] {
64
65
  display: inline;
65
- margin-right: $base-line-height / 4;
66
+ margin-right: $base-spacing / 4;
66
67
  }
67
68
 
68
69
  input[type="file"] {
69
- margin-bottom: $base-line-height / 2;
70
- padding-bottom: ($base-line-height / 3);
70
+ padding-bottom: $base-spacing / 2;
71
71
  width: 100%;
72
72
  }
73
73
 
74
74
  select {
75
- width: auto;
75
+ margin-bottom: $base-spacing;
76
76
  max-width: 100%;
77
- margin-bottom: $base-line-height;
77
+ width: auto;
78
78
  }
@@ -1,4 +1,4 @@
1
- @import 'neat-helpers'; // or '../neat/neat-helpers' when not in Rails
1
+ @import "neat-helpers"; // or "../neat/neat-helpers" when not in Rails
2
2
 
3
3
  // Neat Overrides
4
4
  // $column: 90px;
@@ -1,27 +1,28 @@
1
- ul, ol {
1
+ ul,
2
+ ol {
2
3
  margin: 0;
3
4
  padding: 0;
4
5
  list-style-type: none;
5
6
 
6
7
  &%default-ul {
7
8
  list-style-type: disc;
8
- margin-bottom: $base-line-height / 2;
9
- padding-left: $base-line-height;
9
+ margin-bottom: $base-spacing / 2;
10
+ padding-left: $base-spacing;
10
11
  }
11
12
 
12
13
  &%default-ol {
13
14
  list-style-type: decimal;
14
- margin-bottom: $base-line-height / 2;
15
- padding-left: $base-line-height;
15
+ margin-bottom: $base-spacing / 2;
16
+ padding-left: $base-spacing;
16
17
  }
17
18
  }
18
19
 
19
20
  dl {
20
- margin-bottom: $base-line-height / 2;
21
+ margin-bottom: $base-spacing / 2;
21
22
 
22
23
  dt {
23
24
  font-weight: bold;
24
- margin-top: $base-line-height / 2;
25
+ margin-top: $base-spacing / 2;
25
26
  }
26
27
 
27
28
  dd {
@@ -1,22 +1,24 @@
1
1
  table {
2
2
  border-collapse: collapse;
3
- margin: ($base-line-height / 2) 0;
3
+ margin: ($base-spacing / 2) 0;
4
4
  table-layout: fixed;
5
5
  width: 100%;
6
6
  }
7
7
 
8
8
  th {
9
- border-bottom: 1px solid darken($base-border-color, 15%);
9
+ border-bottom: 1px solid darken($base-border-color, 15);
10
10
  font-weight: bold;
11
- padding: ($base-line-height / 2) 0;
11
+ padding: ($base-spacing / 2) 0;
12
12
  text-align: left;
13
13
  }
14
14
 
15
15
  td {
16
- border-bottom: 1px solid $base-border-color;
17
- padding: ($base-line-height / 2) 0;
16
+ border-bottom: $base-border;
17
+ padding: ($base-spacing / 2) 0;
18
18
  }
19
19
 
20
- tr, td, th {
20
+ tr,
21
+ td,
22
+ th {
21
23
  vertical-align: middle;
22
24
  }
@@ -4,10 +4,15 @@ body {
4
4
  color: $base-font-color;
5
5
  font-family: $base-font-family;
6
6
  font-size: $base-font-size;
7
- line-height: $unitless-line-height;
7
+ line-height: $base-line-height;
8
8
  }
9
9
 
10
- h1, h2, h3, h4, h5, h6 {
10
+ h1,
11
+ h2,
12
+ h3,
13
+ h4,
14
+ h5,
15
+ h6 {
11
16
  font-family: $header-font-family;
12
17
  line-height: $header-line-height;
13
18
  margin: 0;
@@ -15,31 +20,31 @@ h1, h2, h3, h4, h5, h6 {
15
20
  }
16
21
 
17
22
  h1 {
18
- font-size: $base-font-size * 2.25; // 16 * 2.25 = 36px
23
+ font-size: $h1-font-size;
19
24
  }
20
25
 
21
26
  h2 {
22
- font-size: $base-font-size * 2; // 16 * 2 = 32px
27
+ font-size: $h2-font-size;
23
28
  }
24
29
 
25
30
  h3 {
26
- font-size: $base-font-size * 1.75; // 16 * 1.75 = 28px
31
+ font-size: $h3-font-size;
27
32
  }
28
33
 
29
34
  h4 {
30
- font-size: $base-font-size * 1.5; // 16 * 1.5 = 24px
35
+ font-size: $h4-font-size;
31
36
  }
32
37
 
33
38
  h5 {
34
- font-size: $base-font-size * 1.25; // 16 * 1.25 = 20px
39
+ font-size: $h5-font-size;
35
40
  }
36
41
 
37
42
  h6 {
38
- font-size: $base-font-size;
43
+ font-size: $h6-font-size;
39
44
  }
40
45
 
41
46
  p {
42
- margin: 0 0 ($base-line-height * .5);
47
+ margin: 0 0 ($base-spacing / 2);
43
48
  }
44
49
 
45
50
  a {
@@ -58,14 +63,15 @@ a {
58
63
  }
59
64
 
60
65
  hr {
61
- border-bottom: 1px solid $base-border-color;
66
+ border-bottom: $base-border;
62
67
  border-left: none;
63
68
  border-right: none;
64
69
  border-top: none;
65
- margin: $base-line-height 0;
70
+ margin: $base-spacing 0;
66
71
  }
67
72
 
68
- img {
73
+ img,
74
+ picture {
69
75
  margin: 0;
70
76
  max-width: 100%;
71
77
  }
@@ -73,8 +79,8 @@ img {
73
79
  blockquote {
74
80
  border-left: 2px solid $base-border-color;
75
81
  color: lighten($base-font-color, 15);
76
- margin: $base-line-height 0;
77
- padding-left: $base-line-height / 2;
82
+ margin: $base-spacing 0;
83
+ padding-left: $base-spacing / 2;
78
84
  }
79
85
 
80
86
  cite {
@@ -82,6 +88,6 @@ cite {
82
88
  font-style: italic;
83
89
 
84
90
  &:before {
85
- content: '\2014 \00A0';
91
+ content: "\2014 \00A0";
86
92
  }
87
93
  }
@@ -4,12 +4,23 @@ $serif: $georgia;
4
4
  $base-font-family: $sans-serif;
5
5
  $header-font-family: $base-font-family;
6
6
 
7
- // Sizes
7
+ // Font Sizes
8
8
  $base-font-size: 1em;
9
- $base-line-height: $base-font-size * 1.5;
10
- $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
11
- $header-line-height: $base-font-size * 1.25;
12
- $base-border-radius: em(3);
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
+
16
+ // Line height
17
+ $base-line-height: 1.5;
18
+ $header-line-height: 1.25;
19
+
20
+ // Other Sizes
21
+ $base-border-radius: 3px;
22
+ $base-spacing: $base-line-height * 1em;
23
+ $base-z-index: 0;
13
24
 
14
25
  // Colors
15
26
  $blue: #477DCA;
@@ -33,21 +44,22 @@ $hover-link-color: darken($base-accent-color, 15);
33
44
  $base-button-color: $base-link-color;
34
45
  $hover-button-color: $hover-link-color;
35
46
 
36
- // Border color
37
- $base-border-color: $light-gray;
38
-
39
47
  // Flash Colors
40
48
  $alert-color: $light-yellow;
41
49
  $error-color: $light-red;
42
- $notice-color: $light-yellow;
50
+ $notice-color: lighten($base-accent-color, 40);
43
51
  $success-color: $light-green;
44
52
 
53
+ // Border color
54
+ $base-border-color: $light-gray;
55
+ $base-border: 1px solid $base-border-color;
56
+
45
57
  // Forms
46
58
  $form-border-color: $base-border-color;
47
59
  $form-border-color-hover: darken($base-border-color, 10);
48
60
  $form-border-color-focus: $base-accent-color;
49
61
  $form-border-radius: $base-border-radius;
50
- $form-box-shadow: inset 0 1px 3px rgba(0,0,0,0.06);
62
+ $form-box-shadow: inset 0 1px 3px rgba(black,0.06);
51
63
  $form-box-shadow-focus: $form-box-shadow, 0 0 5px rgba(darken($form-border-color-focus, 5), 0.7);
52
64
  $form-font-size: $base-font-size;
53
65
  $form-font-family: $base-font-family;
@@ -7,11 +7,16 @@
7
7
  font-size: $base-font-size;
8
8
  font-weight: bold;
9
9
  line-height: 1;
10
- padding: .75em 1em;
10
+ padding: 0.75em 1em;
11
11
  text-decoration: none;
12
12
 
13
13
  &:hover {
14
14
  background-color: $hover-button-color;
15
15
  color: white;
16
16
  }
17
+
18
+ &:disabled {
19
+ cursor: not-allowed;
20
+ opacity: 0.5;
21
+ }
17
22
  }
@@ -0,0 +1,11 @@
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
+ }
@@ -0,0 +1,38 @@
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 +1,3 @@
1
1
  module Bitters
2
- VERSION = "0.10.0"
2
+ VERSION = "0.10.1"
3
3
  end
data/sache.json ADDED
@@ -0,0 +1,5 @@
1
+ {
2
+ "name": "Bitters",
3
+ "description": "Scaffold styles, variables and structure for Bourbon projects",
4
+ "tags": ["structure", "variables", "forms", "buttons", "typography", "flashes"]
5
+ }
@@ -1,2 +1,2 @@
1
- @import 'bourbon';
2
- @import 'base/base';
1
+ @import "bourbon";
2
+ @import "base/base";
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bitters
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.10.0
4
+ version: 0.10.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kyle Fiedler
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-06-06 00:00:00.000000000 Z
12
+ date: 2014-09-17 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler
@@ -106,12 +106,11 @@ files:
106
106
  - .gitignore
107
107
  - CONTRIBUTING.md
108
108
  - Gemfile
109
- - LICENSE
109
+ - LICENSE.md
110
110
  - README.md
111
111
  - Rakefile
112
112
  - app/assets/stylesheets/_base.scss
113
113
  - app/assets/stylesheets/_buttons.scss
114
- - app/assets/stylesheets/_flashes.scss
115
114
  - app/assets/stylesheets/_forms.scss
116
115
  - app/assets/stylesheets/_grid-settings.scss
117
116
  - app/assets/stylesheets/_lists.scss
@@ -120,13 +119,15 @@ files:
120
119
  - app/assets/stylesheets/_variables.scss
121
120
  - app/assets/stylesheets/extends/_button.scss
122
121
  - app/assets/stylesheets/extends/_clearfix.scss
122
+ - app/assets/stylesheets/extends/_errors.scss
123
+ - app/assets/stylesheets/extends/_flashes.scss
123
124
  - app/assets/stylesheets/extends/_hide-text.scss
124
- - app/assets/stylesheets/mixins/_flash.scss
125
125
  - bin/bitters
126
126
  - bitters.gemspec
127
127
  - lib/bitters.rb
128
128
  - lib/bitters/generator.rb
129
129
  - lib/bitters/version.rb
130
+ - sache.json
130
131
  - spec/bitters_spec.rb
131
132
  - spec/fixtures/application.scss
132
133
  - spec/spec_helper.rb
@@ -1,15 +0,0 @@
1
- %flash-alert {
2
- @include flash($alert-color);
3
- }
4
-
5
- %flash-error {
6
- @include flash($error-color);
7
- }
8
-
9
- %flash-notice {
10
- @include flash($notice-color);
11
- }
12
-
13
- %flash-success {
14
- @include flash($success-color);
15
- }
@@ -1,15 +0,0 @@
1
- @mixin flash($color) {
2
- background: $color;
3
- color: darken($color, 60);
4
- font-weight: bold;
5
- margin-bottom: $base-line-height / 2;
6
- padding: $base-line-height / 2;
7
-
8
- a {
9
- color: darken($color, 70);
10
-
11
- &:hover {
12
- color: darken($color, 90);
13
- }
14
- }
15
- }