compass-pattern-primer 0.2.1 → 0.2.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (28) hide show
  1. checksums.yaml +5 -5
  2. data/CHANGELOG.md +4 -0
  3. data/README.md +191 -0
  4. data/lib/compass-pattern-primer.rb +3 -3
  5. data/stylesheets/compass-pattern-primer/base/_forms.scss +2 -2
  6. data/stylesheets/compass-pattern-primer/base/_links.scss +5 -5
  7. data/stylesheets/compass-pattern-primer/base/_page.scss +4 -5
  8. data/stylesheets/compass-pattern-primer/base/_search.scss +4 -4
  9. data/stylesheets/compass-pattern-primer/base/_typography.scss +31 -31
  10. data/stylesheets/compass-pattern-primer/partials/_extendables.scss +16 -16
  11. data/stylesheets/compass-pattern-primer/partials/_mixins.scss +38 -11
  12. data/stylesheets/compass-pattern-primer/partials/variables/base/_buttons.scss +1 -2
  13. data/stylesheets/compass-pattern-primer/partials/variables/base/_forms.scss +2 -3
  14. data/stylesheets/compass-pattern-primer/partials/variables/base/_links.scss +2 -7
  15. data/stylesheets/compass-pattern-primer/partials/variables/base/_page.scss +3 -9
  16. data/stylesheets/compass-pattern-primer/partials/variables/base/_search.scss +2 -4
  17. data/stylesheets/compass-pattern-primer/partials/variables/base/_typography.scss +14 -28
  18. data/stylesheets/compass-pattern-primer/partials/variables/modules/_control.scss +2 -3
  19. data/stylesheets/compass-pattern-primer/partials/variables/modules/_feedback.scss +2 -3
  20. data/stylesheets/compass-pattern-primer/partials/variables/modules/_options.scss +3 -6
  21. data/stylesheets/compass-pattern-primer/partials/variables/modules/_pagination.scss +1 -2
  22. data/templates/project/base/_page.scss +1 -1
  23. data/templates/project/manifest.rb +4 -6
  24. data/templates/project/partials/_colors.scss +1 -1
  25. data/templates/project/partials/variables/base/_page.scss +1 -1
  26. data/templates/project/partials/variables/theme/_overrides.scss +8 -12
  27. metadata +15 -4
  28. data/stylesheets/compass-pattern-primer/partials/variables/modules/compass-pattern-primer.scss +0 -12
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 2e953748f2b5b6478452dc5e45974d6994d0b162
4
- data.tar.gz: 5a49a5c7caaf1cb6fbaba27f705b81bfa47f6b4e
5
2
  SHA512:
6
- metadata.gz: 86077a730a776e1f877e1b7c8ad8c033d2cf820d030badc2b7c9955b38802ae68b4b526f40eeb0be6387003c2c943263a45e3365457facca3d8508e9cb719a97
7
- data.tar.gz: 3f673cfb7ef5d5407a403dc74c27a484addf9f1d84355eb99babcd8473561b9572bca149fcd8d725ded6731fb4af908b63c1b12781af0b0b911f4fef1a8741bd
3
+ data.tar.gz: 49160f61ac2f67ed64c980267c6bfbfec659964374736dd98213d14d2d6fe537f9e1f5acd29641ffdc55715d525c2e89acdc75e2131a58c60b7b5d5c0a1679e0
4
+ metadata.gz: 168d4403d2b2ad29f59d8a332d42ed970e3055c28885b6929aa5acfbef2306a247fea188d950510a06e3d5e459eeb0eb649ec8a391ed3482ed29b79394277549
5
+ SHA1:
6
+ data.tar.gz: 8d5c5972ce42afade04267785ec90f0bd9dfd2b2
7
+ metadata.gz: 688c0459ba51b45c9b8e9f817b9124d7c58666c6
@@ -0,0 +1,4 @@
1
+ * **0.1** First pass at creating compass extension and ruby gem.
2
+ * **0.2** Created templates for building scaffolding in a compass project.
3
+ * **0.2.1** Minor tweaks, Fixes color stack dependencies.
4
+ * **0.2.2** Refactored bounding-box mixin. It's now 2 mixins: border-outline and margin-padding.
@@ -0,0 +1,191 @@
1
+ # Compass Pattern Primer
2
+ ### Create Style Guides in HTML and CSS with Sass & Compass
3
+ _This is the development repo for the compass extension and rubygem: [Compass Pattern Primer](https://rubygems.org/gems/compass-pattern-primer)._
4
+
5
+ Compass Pattern Primer is a system to quickly generate style guides for your web site or web app. It is based on [Pattern Primer](https://github.com/adactio/Pattern-Primer) by Adactio/Jeremy Keith. It's a collection of starter UI patterns that can be styled for any website. The pattern primer used a PHP document to pull in HTML snippets that can be styled.
6
+
7
+ I originally faithfully ported [Pattern Primer](https://github.com/alienresident/Pattern-Primer) and Jeremy Keith's styles to Sass. Using Sass allows the styles to be quickly changing by overriding a few variables.
8
+
9
+ For my own development work I wanted to move on from Jeremy's work. I reworked the Pattern Primer to use Jonathan Snook's [SMACSS](http://smacss.com/) \(Scalable and Modular Architecture for CSS\) as an organizing principle. I separated the partials into base and modules. The styling from the original Pattern Primer is the default style. The intended way to override the original Adactio styling is to change the variables in `partials/variables/theme/_overrides` following the SMACSS paradigm. I have also changed the default Reset from Eric Meyer's to Formalize and Normalize.
10
+
11
+ *This is a work in progress and any feedback is very welcome.*
12
+
13
+ ## Installation
14
+ Compass Pattern Primer is a compass extension bundled as a Ruby gem.
15
+
16
+ ```bash
17
+ gem install compass-pattern-primer
18
+ ```
19
+ You'll need to install [Sass](http://sass-lang.com/), [Compass](http://compass-style.org/), and [Toolkit](https://github.com/Team-Sass/toolkit) Ruby Gems too. Documentation for installing and using these gems is pretty extensive.
20
+
21
+ ## How to Use it
22
+ There are a number of ways you can get started with Compass Pattern Primer
23
+
24
+ #### Create a new Compass project requiring Compass Pattern Primer
25
+
26
+ ```bash
27
+ compass create <MyProject> -r compass-pattern-primer
28
+ ```
29
+ This creates a new Compass project using the compass standard scaffolding and adds `require 'compass-pattern-primer'` to the `config.rb`.
30
+
31
+ #### Create a new Compass project using Compass Pattern Primer scaffolding \(SMACSS\)
32
+
33
+ ```bash
34
+ compass create <MyProject> -r compass-pattern-primer --using compass-pattern-primer
35
+ ```
36
+ This adds a SMACSS style scaffolding to your project and creates `pattern-primer.html` a static html page where you can preview the style guide. *See: **Features to be added** at the bottom of this document for planned alternative scaffolding.*
37
+
38
+ #### Add Compass Pattern Primer to an existing project by adding the following to config.rb
39
+
40
+ ```ruby
41
+ require 'compass-pattern-primer'
42
+ ```
43
+ Then import the Compass Pattern Primer partial by adding at the top of your working file
44
+
45
+ ```scss
46
+ @import "compass-pattern-primer";
47
+ ```
48
+ **Note:** *You'll need to restart* `compass watch` *if it's running*
49
+
50
+ ## Features in Compass Pattern Primer
51
+
52
+ Compass Pattern Primer comes with a reset, base styles, and modules \(controls, feedback, options, pagination\). You can either bring everything into your project by adding `@import "compass-pattern-primer";` to the top of your file. You can also add the individual pieces by adding some (or all) of the following:
53
+
54
+ ```scss
55
+ @import "compass-pattern-primer/reset";
56
+ @import "compass-pattern-primer/base";
57
+ @import "compass-pattern-primer/modules";
58
+ ```
59
+
60
+ ### Reset
61
+ The Compass Pattern Primer Reset incorporates Normalize and Formalize libraries by default. If you don not want to include these set them to false.
62
+
63
+ ```scss
64
+ $use_formalize_reset: false;
65
+ $use_normalize_reset: false;
66
+ ```
67
+
68
+ The Eric Meyer Reset is available as an option too but it's set to false by default. To change this add:
69
+
70
+ ```scss
71
+ $use_eric_meyer_reset: true;
72
+ ```
73
+
74
+ Unless you use the SMACSS style scaffolding* legacy support for older IE (6 & 7) browsers in the Normalize and Formalize libraries is set to true by default. To change this add:
75
+
76
+ ```scss
77
+ $legacy-support-for-ie6: false;
78
+ $legacy-support-for-ie7: false;
79
+ ```
80
+
81
+ *In the SMACSS style scaffolding you can change what browsers you support in `partials/browsers`.
82
+
83
+ If you don't want to use the Compass Pattern Primer Reset simply don't import it. You can import just the base and modules.
84
+
85
+ ```scss
86
+ @import "compass-pattern-primer/base";
87
+ @import "compass-pattern-primer/modules";
88
+ ```
89
+
90
+ ### Base
91
+ The Compass Pattern Primer Base contains partials for your base styles.
92
+ You can add them all:
93
+
94
+ ```scss
95
+ @import "compass-pattern-primer/base";
96
+ ```
97
+ Or selectively, here's the full list you can select which parts:
98
+
99
+ ```scss
100
+ @import "compass-pattern-primer/base/_page";
101
+ @import "compass-pattern-primer/base/_typography";
102
+ @import "compass-pattern-primer/base/_links";
103
+ @import "compass-pattern-primer/base/_forms";
104
+ @import "compass-pattern-primer/base/_search";
105
+ @import "compass-pattern-primer/base/_buttons";
106
+ ```
107
+
108
+
109
+ ### Modules
110
+ Similarly the modules allow can be imported whole or selectively.
111
+
112
+ ```scss
113
+ @import "compass-pattern-primer/modules";
114
+ ```
115
+ Or
116
+
117
+ ```scss
118
+ @import "compass-pattern-primer/modules/_control";
119
+ @import "compass-pattern-primer/modules/_feedback";
120
+ @import "compass-pattern-primer/modules/_options";
121
+ @import "compass-pattern-primer/modules/_pagination";
122
+ ```
123
+ Styles for the modules can be changed using **overrides** and extended to other elements using **extendables**.
124
+
125
+ ### Changing the default styles
126
+ The Compass Pattern Primer is designed to allow nearly everything about the CSS to be overridden. The Sass contains variables that can be changed easily overridden.
127
+
128
+ #### Overrides
129
+ In the SMACSS style scaffolding you can override any of the variables in `partials/variables/theme/_overrides`. It contains some example variables that are commented out.
130
+
131
+
132
+ #### Extendables
133
+ Styles for the buttons, controls, options, and pagination are silent extendables. The extendables are in `partials/extendables`. This allows you to easily add a the button styles to another element.
134
+
135
+ In this example I am extending an `input` with the `id="reset"` to `%button-active` style.
136
+
137
+ ```scss
138
+ input#reset {
139
+ @extend %button-active;
140
+ }
141
+ ```
142
+ #### Colors
143
+ Custom color guides can generated by altering the `$primary-color` variable in `partials/colors`. If you want to see this in action, the best option is to build a project using the SMACSS scaffolding. Color guides are created using [Color Schemer](https://github.com/Team-Sass/color-schemer) and can be viewed on the `pattern-primer.html` page.
144
+
145
+ Color Schemer is feature rich and allows you to generate color schemes using color theory schemes: mono, complement, triad, tetrad, analogic, accented-analogic. See [Color Schemer](https://github.com/Team-Sass/color-schemer) for more info.
146
+
147
+ The colors also take advantage of `tint-stack` and `shade-stack` to generate 6 (by default but can be extended) tints (mixed with white) or shades (mixed with black) of your colors. Documentation for these functions can be found in [Toolkit](https://github.com/Team-Sass/toolkit).
148
+
149
+ ```scss
150
+ $primary-color: #57068c;
151
+ $black-value: #333;
152
+ ```
153
+
154
+ ```scss
155
+ $black: tint-stack($black-value);
156
+ $primary: tint-stack(cs-primary());
157
+ $secondary: tint-stack(cs-secondary());
158
+ $tertiary: tint-stack(cs-tertiary());
159
+ $quadrary: tint-stack(cs-quadrary());
160
+ ```
161
+
162
+ The advantage of this is you can design your site using `tint-stack` variables. You can then easily adjust your colors by simply altering the `$primary-color` variable.
163
+
164
+ ```scss
165
+ $link-color: nth($primary, 1);
166
+ $link-visited-link-color: nth($primary, 2);
167
+ ```
168
+
169
+ ## Features to be added
170
+ #### More scaffolding options.
171
+ At the moment there's only one option to use my SMACSS scaffolding and a static html preview page. This works for some use cases but doesn't allow you to easily add patterns.
172
+
173
+ I intend to allow a scaffolding option that includes the original patterns and `index.php` file from Jeremy Keith's [Pattern Primer](https://github.com/adactio/Pattern-Primer) repo.
174
+
175
+ Another option could be to create a very basic scaffolding that doesn't use the SMACSS approach. So that you can use you own.
176
+
177
+ #### Use existing Compass Reset gems
178
+ I realized after the fact that all my reset's existed as compass gems. Doesn't seem like a good idea to duplicate code.
179
+ - [Meyer Reset](https://github.com/adamstac/meyer-reset)
180
+ - [Compass Normalize](https://github.com/ksmandersen/compass-normalize)
181
+ - [Compass Formalize](https://github.com/pengwynn/compass_formalize)
182
+
183
+
184
+
185
+ #### ~~Simplify `bounding-box` mixin~~ DONE
186
+ ~~At the moment `bounding-box` mixin handles `margin`, `padding`, and `border` styles. I am going to change this to just `margin` and `padding` and create a new mixing to handle `border` and expanded it to support `outline` as the have similar CSS output.~~
187
+ Refactored `bounding-box` mixin (v0.2.2). It's now 2 mixins: `border-outline` and `margin-padding`. They handle borders and outlines, and margins and paddings. With the refactoring I was able to remove all `$*-border-pos` variables. The position of borders is handled through `$*-border-width` which takes up to 4 arguments in the following clockwise order TRBL \(Top Right Bottom Left \). Similarly `$*-border-style` and `$*-border-color` can take up to 4 arguments. Outline ignores all but the 1st argument and can take an offset argument. There's an error check mixin `border-outline-check` that displays warnings if you add too many arguments of try to offset the border.
188
+
189
+
190
+ ##### Requests? Feedback?
191
+ Contact [me](mailto:mark@alienresident.net) or simply file an [issue](https://github.com/alienresident/compass-pattern-primer/issues/new)!
@@ -3,7 +3,7 @@
3
3
  # By default, you should always included Compass. Do not include your
4
4
  # extension.
5
5
  require 'compass'
6
- require 'toolkit'
6
+ require 'toolkit'
7
7
 
8
8
  # This tells Compass what your Compass extension is called, and where to find
9
9
  # its files
@@ -18,8 +18,8 @@ Compass::Frameworks.register('compass-pattern-primer', :path => extension_path)
18
18
  # a prerelease version
19
19
  # Date is in the form of YYYY-MM-DD
20
20
  module Compass_Pattern_Primer
21
- VERSION = "0.2.1"
22
- DATE = "2013-05-29"
21
+ VERSION = "0.2.2"
22
+ DATE = "2013-07-02"
23
23
  end
24
24
 
25
25
  # This is where any custom SassScript should be placed. The functions will be
@@ -8,8 +8,8 @@ select {
8
8
  width: 100%;
9
9
  font-family: inherit;
10
10
  font-size: inherit;
11
- @include bounding-box(padding, $forms-padding);
12
- @include bounding-box(border, false, $forms-border-pos, $forms-border-width, $forms-border-style, $forms-border-color);
11
+ @include margin-padding(padding, $forms-padding);
12
+ @include border-outline(border, $forms-border-width, $forms-border-style, $forms-border-color);
13
13
  @include border-radius($forms-border-radius);
14
14
  &:focus {
15
15
  border-color: $forms-focus-border-color;
@@ -1,24 +1,24 @@
1
1
  a {
2
2
  color: $link-color;
3
3
  text-decoration: $link-text-decoration;
4
- @include bounding-box(border, false, $link-border-pos, $link-border-width, $link-border-style, $link-border-color);
4
+ @include border-outline(border, $link-border-width, $link-border-style, $link-border-color);
5
5
  &:link,
6
6
  &:visited {
7
7
  color: $link-visited-link-color;
8
- @include bounding-box(border, false, $link-visited-border-pos, $link-visited-border-width, $link-visited-border-style, $link-visited-border-color);
8
+ @include border-outline(border, $link-visited-border-width, $link-visited-border-style, $link-visited-border-color);
9
9
  }
10
10
  &[href]:hover,
11
11
  &[href]:focus {
12
12
  color: $link-hover-link-color;
13
13
  text-decoration: $link-hover-text-decoration;
14
- @include bounding-box(border, false, $link-hover-border-pos, $link-hover-border-width, $link-hover-border-style, $link-hover-border-color);
14
+ @include border-outline(border, $link-hover-border-width, $link-hover-border-style, $link-hover-border-color);
15
15
  }
16
16
  &:active {
17
17
  color: $link-active-link-color;
18
- @include bounding-box(border, false, $link-active-border-pos, $link-active-border-width, $link-active-border-style, $link-active-border-color);
18
+ @include border-outline(border, $link-active-border-width, $link-active-border-style, $link-active-border-color);
19
19
  }
20
20
  .logo &, h1 &, h2 &, h3 & {
21
21
  color: $headers-link-color;
22
- @include bounding-box(border, false, $logo-headers-border-pos, $logo-headers-border-width, $logo-headers-border-style, $logo-headers-border-color);
22
+ @include border-outline(border, $logo-headers-border-width, $logo-headers-border-style, $logo-headers-border-color);
23
23
  }
24
24
  }
@@ -1,16 +1,15 @@
1
1
  html {
2
- @include bounding-box(border, false, $html-border-pos, $html-border-width, $html-border-style, $html-border-color);
2
+ @include border-outline(border, $html-border-width, $html-border-style, $html-border-color);
3
3
  background-color: $html-background-color;
4
4
  }
5
5
  body {
6
6
  background-color: $body-background-color;
7
7
  background: $body-background-rgba;
8
- @include bounding-box(margin, $body-margin);
9
- @include bounding-box(padding, $body-padding);
8
+ @include margin-padding(margin, $body-margin);
9
+ @include margin-padding(padding, $body-padding);
10
10
  @include type-size($body-font-size, $body-line-height);
11
11
  font-family: $body-font-family;
12
12
  color: $body-color;
13
- @include bounding-box(border, false, $body-border-pos, $body-border-width, $body-border-style, $body-border-color);
14
- @include bounding-box(border, false, $body-border-pos2, $body-border-width2, $body-border-style2, $body-border-color2);
13
+ @include border-outline(border, $body-border-width, $body-border-style, $body-border-color);
15
14
  border-color: $body-border-color-rgba;
16
15
  }
@@ -1,11 +1,11 @@
1
1
  [role="search"] {
2
2
  position: relative;
3
3
  background-color: $search-background-color;
4
- @include bounding-box(border, false, $search-border-pos, $search-border-width, $search-border-style, $search-border-color);
5
- @include bounding-box(padding, $search-padding);
4
+ @include border-outline(border, $search-border-width, $search-border-style, $search-border-color);
5
+ @include margin-padding(padding, $search-padding);
6
6
  @include border-radius($search-border-radius);
7
7
  input[type="search"], input {
8
- @include bounding-box(border, false, $search-input-border-pos, $search-input-border-width, $search-input-border-style, $search-input-border-color);
8
+ @include border-outline(border, $search-input-border-width, $search-input-border-style, $search-input-border-color);
9
9
  @include border-radius($search-input-border-radius);
10
10
  }
11
11
  input[type="image"] {
@@ -14,6 +14,6 @@
14
14
  width: $search-image-width;
15
15
  top: $search-image-top;
16
16
  right: $search-image-right;
17
- @include bounding-box(padding, $search-image-padding);
17
+ @include margin-padding(padding, $search-image-padding);
18
18
  }
19
19
  }
@@ -2,54 +2,55 @@ h1 {
2
2
  font-family: $header-font-family;
3
3
  @include bold-italic-uppercase-variant($h1-font-bold, $h1-font-italic, $h1-font-uppercase, $h1-font-variant);
4
4
  @include type-size($h1-font-size, $h1-line-height);
5
- @include bounding-box(padding, $h1-padding, $h1-padding-pos);
6
- @include bounding-box(margin, $h1-margin, $h1-margin-pos);
5
+ @include margin-padding(padding, $h1-padding, $h1-padding-pos);
6
+ @include margin-padding(margin, $h1-margin, $h1-margin-pos);
7
7
  color: $h1-color;
8
- @include bounding-box(border, false, $h1-border-pos, $h1-border-width, $h1-border-style, $h1-border-color);
8
+ @include border-outline(border, $h1-border-width, $h1-border-style, $h1-border-color);
9
9
  }
10
10
  h2 {
11
11
  font-family: $header-font-family;
12
12
  @include bold-italic-uppercase-variant($h2-font-bold, $h2-font-italic, $h2-font-uppercase, $h2-font-variant);
13
13
  @include type-size($h2-font-size, $h2-line-height);
14
- @include bounding-box(padding, $h2-padding, $h2-padding-pos);
15
- @include bounding-box(margin, $h2-margin, $h2-margin-pos);
14
+ @include margin-padding(padding, $h2-padding, $h2-padding-pos);
15
+ @include margin-padding(margin, $h2-margin, $h2-margin-pos);
16
16
  color: $h2-color;
17
- @include bounding-box(border, false, $h2-border-pos, $h2-border-width, $h2-border-style, $h2-border-color);
17
+ @include border-outline(border, $h2-border-width, $h2-border-style, $h2-border-color);
18
18
  }
19
19
  h3 {
20
20
  font-family: $header-font-family;
21
21
  @include bold-italic-uppercase-variant($h3-font-bold, $h3-font-italic, $h3-font-uppercase, $h3-font-variant);
22
22
  @include type-size($h3-font-size, $h3-line-height);
23
- @include bounding-box(padding, $h3-padding, $h3-padding-pos);
24
- @include bounding-box(margin, $h3-margin, $h3-margin-pos);
23
+ @include margin-padding(padding, $h3-padding, $h3-padding-pos);
24
+ @include margin-padding(margin, $h3-margin, $h3-margin-pos);
25
25
  color: $h3-color;
26
- @include bounding-box(border, false, $h3-border-pos, $h3-border-width, $h3-border-style, $h3-border-color);
26
+ @include border-outline(border, $h3-border-width, $h3-border-style, $h3-border-color);
27
27
  }
28
28
  h4 {
29
29
  font-family: $header-font-family;
30
30
  @include bold-italic-uppercase-variant($h4-font-bold, $h4-font-italic, $h4-font-uppercase, $h4-font-variant);
31
31
  @include type-size($h4-font-size, $h4-line-height);
32
- @include bounding-box(padding, $h4-padding, $h4-padding-pos);
33
- @include bounding-box(margin, $h4-margin, $h4-margin-pos);
32
+ @include margin-padding(padding, $h4-padding, $h4-padding-pos);
33
+ @include margin-padding(margin, $h4-margin, $h4-margin-pos);
34
34
  color: $h4-color;
35
- @include bounding-box(border, false, $h4-border-pos, $h4-border-width, $h4-border-style, $h4-border-color);
35
+ @include border-outline(border, $h4-border-width, $h4-border-style, $h4-border-color);
36
36
  }
37
37
  h5 {
38
38
  font-family: $header-font-family;
39
39
  @include bold-italic-uppercase-variant($h5-font-bold, $h5-font-italic, $h5-font-uppercase, $h5-font-variant);
40
40
  @include type-size($h5-font-size, $h5-line-height);
41
- @include bounding-box(padding, $h5-padding, $h5-padding-pos);
42
- @include bounding-box(margin, $h5-margin, $h5-margin-pos);
41
+ @include margin-padding(padding, $h5-padding, $h5-padding-pos);
42
+ @include margin-padding(margin, $h5-margin, $h5-margin-pos);
43
43
  color: $h5-color;
44
- @include bounding-box(border, false, $h5-border-pos, $h5-border-width, $h5-border-style, $h5-border-color);
44
+ @include border-outline(border, $h5-border-width, $h5-border-style, $h5-border-color);
45
45
  }
46
46
  h6 {
47
+ font-family: $header-font-family;
47
48
  @include bold-italic-uppercase-variant($h6-font-bold, $h6-font-italic, $h6-font-uppercase, $h6-font-variant);
48
49
  @include type-size($h6-font-size, $h6-line-height);
49
- @include bounding-box(padding, $h6-padding, $h6-padding-pos);
50
- @include bounding-box(margin, $h6-margin, $h6-margin-pos);
50
+ @include margin-padding(padding, $h6-padding, $h6-padding-pos);
51
+ @include margin-padding(margin, $h6-margin, $h6-margin-pos);
51
52
  color: $h6-color;
52
- @include bounding-box(border, false, $h6-border-pos, $h6-border-width, $h6-border-style, $h6-border-color);
53
+ @include border-outline(border, $h6-border-width, $h6-border-style, $h6-border-color);
53
54
  }
54
55
  b, strong {
55
56
  font-weight: bold;
@@ -58,24 +59,23 @@ i, em {
58
59
  font-style: italic;
59
60
  }
60
61
  hr {
61
- @include bounding-box(border, false, $hr-border-pos, $hr-border-width, $hr-border-style, $hr-border-color);
62
+ @include border-outline(border, $hr-border-width, $hr-border-style, $hr-border-color);
62
63
  height: $hr-height;
63
64
  background: $hr-background;
64
65
  background-color: $hr-background-rgba;
65
66
  }
66
67
  p, ul, ol, hr, table, form, fieldset {
67
- @include bounding-box(margin, $element-margin);
68
+ @include margin-padding(margin, $element-margin);
68
69
  }
69
70
  li {
70
71
  list-style-position: $li-list-style-position;
71
- @include bounding-box(margin, $li-margin, $li-margin-pos);
72
+ @include margin-padding(margin, $li-margin, $li-margin-pos);
72
73
  text-indent: $li-text-indent;
73
74
  }
74
75
  blockquote {
75
- @include bounding-box(margin, $blockquote-margin);
76
- @include bounding-box(border, false, $blockquote-border-pos, $blockquote-border-width, $blockquote-border-style, $blockquote-border-color);
77
- @include bounding-box(border, false, $blockquote-border-pos2, $blockquote-border-width2, $blockquote-border-style2, $blockquote-border-color2);
78
- @include bounding-box(padding, $blockquote-padding);
76
+ @include margin-padding(margin, $blockquote-margin);
77
+ @include border-outline(border, $blockquote-border-width, $blockquote-border-style, $blockquote-border-color);
78
+ @include margin-padding(padding, $blockquote-padding);
79
79
  font-family: $blockquote-font-family;
80
80
  @include bold-italic-uppercase-variant($blockquote-font-bold, $blockquote-font-italic, $blockquote-font-uppercase, $blockquote-font-variant);
81
81
  @include type-size($blockquote-font-size, $blockquote-line-height);
@@ -97,7 +97,7 @@ article > p,
97
97
  article section > p {
98
98
  @include type-size($article-font-size, $article-line-height);
99
99
  word-spacing: $article-word-spacing;
100
- @include bounding-box(margin, $article-margin);
100
+ @include margin-padding(margin, $article-margin);
101
101
  /* Does this improve the reading experience?
102
102
  -webkit-hyphens: auto;
103
103
  -moz-hyphens: auto;
@@ -115,9 +115,9 @@ h1+p:first-letter {
115
115
  @include bold-italic-uppercase-variant($article-fl-font-bold, $article-fl-font-italic, $article-fl-font-uppercase, $article-fl-font-variant);
116
116
  @include type-size($article-fl-font-size, $article-fl-line-height);
117
117
  letter-spacing: $article-fl-letter-spacing;
118
- @include bounding-box(margin, $article-fl-margin, $article-fl-margin-pos);
118
+ @include margin-padding(margin, $article-fl-margin, $article-fl-margin-pos);
119
119
  color: $article-fl-color;
120
- @include bounding-box(border, false, $article-fl-border-pos, $article-fl-border-width, $article-fl-border-style, $article-fl-border-color);
120
+ @include border-outline(border, $article-fl-border-width, $article-fl-border-style, $article-fl-border-color);
121
121
  }
122
122
  time {
123
123
  display: $time-display;
@@ -132,9 +132,9 @@ time {
132
132
 
133
133
  pre {
134
134
  @extend %force-wrap;
135
- @include bounding-box(margin, $pre-margin, $pre-margin-pos);
136
- @include bounding-box(padding, $pre-padding);
137
- @include bounding-box(border, false, $pre-border-pos, $pre-border-width, $pre-border-style, $pre-border-color);
135
+ @include margin-padding(margin, $pre-margin, $pre-margin-pos);
136
+ @include margin-padding(padding, $pre-padding);
137
+ @include border-outline(border, $pre-border-width, $pre-border-style, $pre-border-color);
138
138
  @include border-radius($pre-border-radius);
139
139
  font-family: $pre-font-family;
140
140
  @include type-size($pre-font-size, $pre-line-height);
@@ -17,9 +17,9 @@
17
17
  font-size: inherit;
18
18
  font-weight: normal;
19
19
  font-style: normal;
20
- @include bounding-box(border, false, $button-border-pos, $button-border-width, $button-border-style, $button-border-color);
20
+ @include border-outline(border, $button-border-width, $button-border-style, $button-border-color);
21
21
  cursor: pointer;
22
- @include bounding-box(padding, $button-padding);
22
+ @include margin-padding(padding, $button-padding);
23
23
  line-height: 1;
24
24
  @include border-radius($button-border-radius);
25
25
  }
@@ -85,9 +85,9 @@
85
85
  font-family: $controls-font-family;
86
86
  display: inline-block;
87
87
  font-size: $controls-font-size;
88
- @include bounding-box(padding, $controls-padding);
88
+ @include margin-padding(padding, $controls-padding);
89
89
  line-height: 1;
90
- @include bounding-box(border, false, $controls-border-pos, $controls-border-width, $controls-border-style, $controls-border-color);
90
+ @include border-outline(border, $controls-border-width, $controls-border-style, $controls-border-color);
91
91
  @include border-radius($controls-border-radius);
92
92
  background-clip: padding-box;
93
93
  &:link,
@@ -105,11 +105,11 @@
105
105
  }
106
106
 
107
107
  %feedback {
108
- @include bounding-box(padding, $feedback-padding);
109
- @include bounding-box(margin, $feedback-margin);
108
+ @include margin-padding(padding, $feedback-padding);
109
+ @include margin-padding(margin, $feedback-margin);
110
110
  color: $feedback-color;
111
111
  background-color: $feedback-background;
112
- @include bounding-box(border, false, $feedback-border-pos, $feedback-border-width, $feedback-border-style, $feedback-border-color);
112
+ @include border-outline(border, $feedback-border-width, $feedback-border-style, $feedback-border-color);
113
113
  @include border-radius($feedback-border-radius);
114
114
  background-clip: padding-box;
115
115
  a {
@@ -138,20 +138,20 @@
138
138
 
139
139
  %options {
140
140
  list-style: $options-list-style;
141
- @include bounding-box(border, false, $options-border-pos, $options-border-width, $options-border-style, $options-border-color);
141
+ @include border-outline(border, $options-border-width, $options-border-style, $options-border-color);
142
142
  li {
143
143
  text-indent: $options-li-text-indent;
144
144
  font-family: $options-li-font-family;
145
145
  text-transform: $options-li-text-transform;
146
146
  letter-spacing: $options-li-letter-spacing;
147
147
  font-weight: $options-li-font-weight;
148
- @include bounding-box(margin, $options-li-margin);
149
- @include bounding-box(padding, $options-li-padding);
150
- @include bounding-box(border, false, $options-li-border-pos, $options-li-border-width, $options-li-border-style, $options-li-border-color);
148
+ @include margin-padding(margin, $options-li-margin);
149
+ @include margin-padding(padding, $options-li-padding);
150
+ @include border-outline(border, $options-li-border-width, $options-li-border-style, $options-li-border-color);
151
151
  }
152
152
  a {
153
153
  display: block;
154
- @include bounding-box(border, false, $options-a-border-pos, $options-a-border-width, $options-a-border-style, $options-a-border-color);
154
+ @include border-outline(border, $options-a-border-width, $options-a-border-style, $options-a-border-color);
155
155
  }
156
156
  }
157
157
 
@@ -159,15 +159,15 @@
159
159
  font-family: $pagination-font-family;
160
160
  li {
161
161
  display: $pagination-li-display;
162
- @include bounding-box(margin, $pagination-li-margin, $pagination-li-margin-pos);
162
+ @include margin-padding(margin, $pagination-li-margin, $pagination-li-margin-pos);
163
163
  text-indent: $pagination-text-indent;
164
164
  }
165
165
  a {
166
166
  display: $pagination-a-display;
167
- @include bounding-box(padding, $pagination-a-padding);
167
+ @include margin-padding(padding, $pagination-a-padding);
168
168
  line-height: $pagination-a-line-height;
169
- @include bounding-box(margin, $pagination-a-margin);
170
- @include bounding-box(border, false, $pagination-a-border-pos, $pagination-a-border-width, $pagination-a-border-style, $pagination-a-border-color);
169
+ @include margin-padding(margin, $pagination-a-margin);
170
+ @include border-outline(border, $pagination-a-border-width, $pagination-a-border-style, $pagination-a-border-color);
171
171
  @include border-radius($pagination-a-border-radius);
172
172
  background-clip: padding-box;
173
173
  &:link,
@@ -1,18 +1,45 @@
1
- @mixin simple-background-gradient($button-color, $background-gradient-pos, $background-gradient-1, $background-gradient-2) {
2
- color: $button-color;
1
+ @mixin simple-background-gradient($color, $background-gradient-pos, $background-gradient-1, $background-gradient-2) {
2
+ color: $color;
3
3
  // provide background color for older IEs
4
4
  background-color: background-color-mix($background-gradient-1, $background-gradient-2);
5
5
  @include background-image(linear-gradient($background-gradient-pos, $background-gradient-1, $background-gradient-2));
6
6
  }
7
7
 
8
- @mixin bounding-box($type, $amount: false, $side: false, $color: false, $style: false, $width: false) {
9
- @if $type == 'border' and $side == none {
10
- #{$type}: $side;
11
- } @else if $type == 'border' and $side {
12
- #{$type}-#{$side}: $color $style $width;
13
- } @else if $type == 'border' {
14
- #{$type}: $color $style $width;
15
- } @else if $side {
8
+ @mixin border-outline($type: border, $width: 1px, $style: solid, $color: #333, $offset: false) {
9
+ @include border-outline-check($type, $width, $style, $color, $offset);
10
+
11
+ @if $width == 'none' {
12
+ #{$type}: $width;
13
+ } @else if $width == false {
14
+ } @else {
15
+ #{$type}: {
16
+ width: $width;
17
+ style: $style;
18
+ color: $color;
19
+ @if $type == 'outline' and $offset {
20
+ offset: $offset;
21
+ }
22
+ }
23
+ }
24
+ }
25
+
26
+ @mixin border-outline-check($type, $width, $style, $color, $offset) {
27
+ @if $type == 'border' and $offset {
28
+ @warn "#{$type} does not use offset";
29
+ }
30
+ @if $type == 'outline' { // wish this was cleaner! there's probably a better way to do this.
31
+ $widths: length($width);
32
+ $styles: length($style);
33
+ $colors: length($color);
34
+ $offsets: length($offset);
35
+ @if $widths > 1 or $styles > 1 or $colors > 1 or $offsets > 1 {
36
+ @warn "You cannot use mulitple values for #{$type} - only the first value will be used!";
37
+ }
38
+ }
39
+ }
40
+
41
+ @mixin margin-padding($type, $amount: false, $side: false) {
42
+ @if $side {
16
43
  #{$type}-#{$side}: $amount;
17
44
  } @else {
18
45
  #{$type}: $amount;
@@ -132,7 +159,7 @@
132
159
  @if $lightness < 50% {
133
160
  $color: white;
134
161
  }
135
-
162
+
136
163
  &:before, &:after {
137
164
  color: $color;
138
165
  }
@@ -1,8 +1,7 @@
1
1
  /// Buttons
2
2
  $button-font-family: $secondary-font !default;
3
3
  $button-padding: 0.5em 1em !default;
4
- $button-border-pos: false !default;
5
- $button-border-width: 1px !default;
4
+ $button-border-width: false !default;
6
5
  $button-border-style: solid !default;
7
6
  $button-border-color: #666 !default;
8
7
  $button-border-radius: 1em !default;
@@ -1,8 +1,7 @@
1
1
  // Forms _forms.scss
2
2
  $forms-background-color: #fff !default;
3
- $forms-padding: 0.125em !default;
4
- $forms-border-pos: false !default;
5
- $forms-border-width: 1px !default;
3
+ $forms-padding: 0.125em !default;
4
+ $forms-border-width: false !default;
6
5
  $forms-border-style: solid !default;
7
6
  $forms-border-color: #ccc !default;
8
7
  $forms-border-radius: 0.25em !default;
@@ -1,31 +1,26 @@
1
1
  $link-color: #369 !default;
2
2
  $link-text-decoration: none !default;
3
- $link-border-pos: bottom !default;
4
- $link-border-width: 1px !default;
3
+ $link-border-width: 0 0 1px 0 !default;
5
4
  $link-border-style: dotted !default;
6
5
  $link-border-color: $link-color !default;
7
6
  /// Visited
8
7
  $link-visited-link-color: $link-color !default;
9
- $link-visited-border-pos: $link-border-pos !default;
10
8
  $link-visited-border-width: $link-border-width !default;
11
9
  $link-visited-border-style: $link-border-style !default;
12
10
  $link-visited-border-color: $link-border-color !default;
13
11
  /// Hover
14
12
  $link-hover-text-decoration: underline !default;
15
13
  $link-hover-link-color: #c03 !default;
16
- $link-hover-border-pos: $link-border-pos !default;
17
14
  $link-hover-border-width: $link-border-width !default;
18
15
  $link-hover-border-style: $link-border-style !default;
19
16
  $link-hover-border-color: $link-hover-link-color !default;
20
17
  /// Active
21
18
  $link-active-link-color: #900 !default;
22
- $link-active-border-pos: $link-border-pos !default;
23
19
  $link-active-border-width: $link-border-width !default;
24
20
  $link-active-border-style: $link-border-style !default;
25
21
  $link-active-border-color: $link-active-link-color !default;
26
22
  /// Logo and Headers
27
23
  $headers-link-color: $link-color !default;
28
- $logo-headers-border-pos: none !default;
29
- $logo-headers-border-width: 0 !default;
24
+ $logo-headers-border-width: false !default;
30
25
  $logo-headers-border-style: $link-border-style !default;
31
26
  $logo-headers-border-color: $link-active-link-color !default;
@@ -1,12 +1,11 @@
1
- /// html
2
- $html-border-pos: top !default;
3
1
  // Typography _typography.scss
4
2
  $body-font-family: Palatino, Cambria, Georgia, serif !default;
5
3
  $secondary-font: Calibri, 'Helvetica Neue', Arial, sans-serif !default;
6
4
  $header-font-family: $body-font-family !default;
7
5
  $monospaced-font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", monospace !default;
8
6
 
9
- $html-border-width: 0.5em !default;
7
+ /// html
8
+ $html-border-width: 0.5em 0 0 0 !default;
10
9
  $html-border-style: solid !default;
11
10
  $html-border-color: #693 !default;
12
11
  $html-background-color: #eee !default;
@@ -19,12 +18,7 @@ $body-padding: 0 2.5% !default;
19
18
  $body-font-size: 100% !default;
20
19
  $body-line-height: 1.875em !default;
21
20
  $body-color: #333 !default;
22
- $body-border-pos: left !default;
23
- $body-border-width: 1px !default;
21
+ $body-border-width: 0 1px 0 1px !default;
24
22
  $body-border-style: solid !default;
25
23
  $body-border-color: #ddd !default;
26
- $body-border-pos2: right !default;
27
- $body-border-width2: $body-border-width !default;
28
- $body-border-style2: $body-border-style !default;
29
- $body-border-color2: $body-border-color !default;
30
24
  $body-border-color-rgba: rgba(0,0,0,0.13) !default;
@@ -2,13 +2,11 @@
2
2
  $search-border-radius: 1em !default;
3
3
  $search-background-color: #fff !default;
4
4
  $search-padding: 0 0.75em !default;
5
- $search-border-pos: false !default;
6
- $search-border-width: 1px !default;
5
+ $search-border-width: false !default;
7
6
  $search-border-style: solid !default;
8
7
  $search-border-color: #ccc !default;
9
8
  //// Search Input
10
- $search-input-border-pos: none !default;
11
- $search-input-border-width: 0 !default;
9
+ $search-input-border-width: false !default;
12
10
  $search-input-border-style: solid !default;
13
11
  $search-input-border-color: #ccc !default;
14
12
  $search-input-border-radius: 0 !default;
@@ -11,8 +11,7 @@ $h1-padding-pos: top !default;
11
11
  $h1-margin: 0.3em !default;
12
12
  $h1-margin-pos: bottom !default;
13
13
  $h1-color: #444 !default;
14
- $h1-border-pos: bottom !default;
15
- $h1-border-width: 0.2em !default;
14
+ $h1-border-width: 0 0 0.2em 0 !default;
16
15
  $h1-border-style: solid !default;
17
16
  $h1-border-color: #693 !default;
18
17
  //// h2
@@ -26,9 +25,8 @@ $h2-padding: 0.8333em !default;
26
25
  $h2-padding-pos: top !default;
27
26
  $h2-margin: 0.7em !default;
28
27
  $h2-margin-pos: bottom !default;
29
- $h2-color: #555 !default;
30
- $h2-border-pos: bottom !default;
31
- $h2-border-width: 0.13333em !default;
28
+ $h2-color: #555 !default;
29
+ $h2-border-width: 0 0 0.13333em 0 !default;
32
30
  $h2-border-style: solid !default;
33
31
  $h2-border-color: #693 !default;
34
32
  //// h3
@@ -43,8 +41,7 @@ $h3-padding-pos: top !default;
43
41
  $h3-margin: 0.7em !default;
44
42
  $h3-margin-pos: bottom !default;
45
43
  $h3-color: #666 !default;
46
- $h3-border-pos: bottom !default;
47
- $h3-border-width: 0.1em !default;
44
+ $h3-border-width: 0 0 0.1em 0 !default;
48
45
  $h3-border-style: solid !default;
49
46
  $h3-border-color: #693 !default;
50
47
  //// h4
@@ -58,9 +55,8 @@ $h4-padding: 1em !default;
58
55
  $h4-padding-pos: top !default;
59
56
  $h4-margin: 1em !default;
60
57
  $h4-margin-pos: bottom !default;
61
- $h4-color: #777 !default;
62
- $h4-border-pos: none !default;
63
- $h4-border-width: 0 !default;
58
+ $h4-color: #777 !default;
59
+ $h4-border-width: false !default;
64
60
  $h4-border-style: solid !default;
65
61
  $h4-border-color: #693 !default;
66
62
  //// h5
@@ -75,8 +71,7 @@ $h5-padding-pos: top !default;
75
71
  $h5-margin: 0 !default;
76
72
  $h5-margin-pos: false !default;
77
73
  $h5-color: #888 !default;
78
- $h5-border-pos: none !default;
79
- $h5-border-width: 0em !default;
74
+ $h5-border-width: false !default;
80
75
  $h5-border-style: solid !default;
81
76
  $h5-border-color: #693 !default;
82
77
  //// h6
@@ -90,14 +85,12 @@ $h6-padding: 1em !default;
90
85
  $h6-padding-pos: top !default;
91
86
  $h6-margin: 0 !default;
92
87
  $h6-margin-pos: false !default;
93
- $h6-color: #999 !default;
94
- $h6-border-pos: none !default;
95
- $h6-border-width: 0em !default;
88
+ $h6-color: #999 !default;
89
+ $h6-border-width: false !default;
96
90
  $h6-border-style: solid !default;
97
91
  $h6-border-color: #693 !default;
98
- /// hr
99
- $hr-border-pos: none !default;
100
- $hr-border-width: 0em !default;
92
+ /// hr
93
+ $hr-border-width: false !default;
101
94
  $hr-border-style: solid !default;
102
95
  $hr-border-color: #333 !default;
103
96
  $hr-height: 0.1em !default;
@@ -122,14 +115,9 @@ $blockquote-font-size: 1.25em !default;
122
115
  $blockquote-line-height: 1.5em !default;
123
116
  $blockquote-letter-spacing: 0.05em !default;
124
117
  $blockquote-color: #888 !default;
125
- $blockquote-border-pos: top !default;
126
- $blockquote-border-width: 0.1em !default;
118
+ $blockquote-border-width: 0.1em 0 0.1em 0 !default;
127
119
  $blockquote-border-style: solid !default;
128
120
  $blockquote-border-color: #ccc !default;
129
- $blockquote-border-pos2: bottom !default;
130
- $blockquote-border-width2: $blockquote-border-width !default;
131
- $blockquote-border-style2: $blockquote-border-style !default;
132
- $blockquote-border-color2: $blockquote-border-color !default;
133
121
  $blockquote-border-rgba: rgba(0,0,0,0.2) !default;
134
122
  $blockquote-border-radius: 0.25em !default;
135
123
  /// blockquote em
@@ -166,8 +154,7 @@ $article-fl-margin: 0.075em !default;
166
154
  $article-fl-margin-pos: right !default;
167
155
  $article-fl-background-color: #fff !default;
168
156
  $article-fl-color: #333 !default;
169
- $article-fl-border-pos: none !default;
170
- $article-fl-border-width: 1px !default;
157
+ $article-fl-border-width: false !default;
171
158
  $article-fl-border-style: solid !default;
172
159
  $article-fl-border-color: #333 !default;
173
160
  /// time
@@ -189,8 +176,7 @@ $pre-margin: 1em !default;
189
176
  $pre-margin-pos: false !default;
190
177
  $pre-padding: 2em !default;
191
178
  $pre-padding-pos: false !default;
192
- $pre-border-pos: false !default;
193
- $pre-border-width: 1px !default;
179
+ $pre-border-width: false !default;
194
180
  $pre-border-style: solid !default;
195
181
  $pre-border-color: #ddd !default;
196
182
  $pre-color: #333 !default;
@@ -1,9 +1,8 @@
1
1
  // Controls
2
2
  $controls-font-family: $secondary-font !default;
3
3
  $controls-font-size: 1.5em !default;
4
- $controls-padding: 0.5em 0.75em !default;
5
- $controls-border-pos: false !default;
6
- $controls-border-width: 1px !default;
4
+ $controls-padding: 0.5em 0.75em !default;
5
+ $controls-border-width: false !default;
7
6
  $controls-border-style: solid !default;
8
7
  $controls-border-color: #666 !default;
9
8
  $controls-border-radius: 0.25em !default;
@@ -2,9 +2,8 @@
2
2
  $feedback-background: #d9edf7 !default;
3
3
  $feedback-padding: 0.125em 1em !default;
4
4
  $feedback-margin: 1em !default;
5
- $feedback-color: #3A87AD !default;
6
- $feedback-border-pos: false !default;
7
- $feedback-border-width: 1px !default;
5
+ $feedback-color: #3A87AD !default;
6
+ $feedback-border-width: false !default;
8
7
  $feedback-border-style: solid !default;
9
8
  $feedback-border-color: #bce8f1 !default;
10
9
  $feedback-border-radius: 0.5em !default;
@@ -1,6 +1,5 @@
1
1
  // Options
2
- $options-border-pos: top !default;
3
- $options-border-width: 1px !default;
2
+ $options-border-width: 1px 0 0 0!default;
4
3
  $options-border-style: solid !default;
5
4
  $options-border-color: #ccc !default;
6
5
  $options-list-style: none !default;
@@ -12,12 +11,10 @@ $options-li-letter-spacing: 0.15em !default;
12
11
  $options-li-font-weight: bold !default;
13
12
  $options-li-margin: 0 !default;
14
13
  $options-li-padding: 0.3125em 0.625em !default;
15
- $options-li-border-pos: bottom !default;
16
- $options-li-border-width: 1px !default;
14
+ $options-li-border-width: 0 0 1px 0 !default;
17
15
  $options-li-border-style: solid !default;
18
16
  $options-li-border-color: #ccc !default;
19
17
  /// Options a
20
- $options-a-border-pos: none !default;
21
- $options-a-border-width: 0 !default;
18
+ $options-a-border-width: false !default;
22
19
  $options-a-border-style: solid !default;
23
20
  $options-a-border-color: #ccc !default;
@@ -11,8 +11,7 @@ $pagination-a-padding: 0.5em 1em !default;
11
11
  $pagination-a-margin: 0.1em !default;
12
12
  $pagination-a-border-radius: 0.25em !default;
13
13
  $pagination-a-line-height: 1em !default;
14
- $pagination-a-border-pos: false !default;
15
- $pagination-a-border-width: 1px !default;
14
+ $pagination-a-border-width: false !default;
16
15
  $pagination-a-border-style: solid !default;
17
16
  $pagination-a-border-color: #666 !default;
18
17
  /// Pagination links
@@ -1,5 +1,5 @@
1
1
  //////////////////////////////
2
- // BASE: Page specific styles that aren't in Pattern-Primer
2
+ // BASE: Page specific styles that aren't in Compass-Pattern-Primer
3
3
  //////////////////////////////
4
4
 
5
5
  html {
@@ -34,20 +34,18 @@ file 'state/_header.scss', :like => :stylesheet, :to => 'state/_header.scss'
34
34
  file 'state/_footer.scss', :like => :stylesheet, :to => 'state/_footer.scss'
35
35
  file 'theme/_page.scss', :like => :stylesheet, :to => 'theme/_page.scss'
36
36
 
37
-
38
- # file 'ie.scss', :like => :stylesheet, :media => 'screen, projection', :condition => "lt IE 9"
39
-
40
-
41
37
  # Javascript Import
42
38
  # file 'scripts.js', :like => :javascript, :to => 'scripts.js'
43
39
 
44
- file 'pattern-primer.html',:like => :html, :to => "pattern-primer.html"
40
+ # HTML Import
41
+ file 'pattern-primer.html', :like => :html, :to => "pattern-primer.html"
42
+
45
43
  # General File Import
46
44
  # file 'README.md', :to => "README.md"
47
45
 
48
46
  # Compass Extension Help
49
47
  help %Q{
50
- Help for your Compass extension
48
+ The best place for help is to read the documentation in Github: https://github.com/alienresident/compass-pattern-primer
51
49
  }
52
50
 
53
51
  # Compass Extension Welcome Message
@@ -24,4 +24,4 @@
24
24
  // $primary: tint-stack(cs-primary());
25
25
  // $secondary: tint-stack(cs-secondary());
26
26
  // $tertiary: tint-stack(cs-tertiary());
27
- // $quadrary: tint-stack(cs-quadrary());
27
+ // $quadrary: tint-stack(cs-quadrary());
@@ -1,3 +1,3 @@
1
1
  //////////////////////////////
2
- // VARIABLES: For Base styles that aren't in Pattern-Primer
2
+ // VARIABLES: For Base styles that aren't in Compass-Pattern-Primer
3
3
  //////////////////////////////
@@ -12,37 +12,33 @@
12
12
  ///// body
13
13
  // $body-background-color: nth($black , 6);
14
14
  // $body-background-rgba: rgba($body-background-color, 1);
15
- // $body-border-width: 0;
16
- // $body-border-pos: none;
17
- // $body-border-pos2: none;
15
+ // $body-border-width: false;
18
16
  //
19
17
  // $body-margin: 0;
20
18
  // $body-padding: 0;
21
19
  //
22
- // $html-border-pos: none;
20
+ // $html-border-width: false;
23
21
  // $html-background-color: lighten($body-background-color, 10%);
24
22
  //
25
23
  // $link-color: nth($primary, 1);
26
24
  // $link-text-decoration: none;
27
- // $link-border-pos: none;
25
+ // $link-border-width: false;
28
26
  //
29
27
  ///// Visited
30
28
  // $link-visited-link-color: nth($primary, 2);
31
- // $link-visited-border-pos: $link-border-pos;
29
+ // $link-visited-border-width: $link-border-width;
32
30
  ///// Hover
33
31
  // $link-hover-link-color: lighten($link-color, 10%);
34
32
  // $link-text-decoration: none;
35
- // $link-hover-border-pos: $link-border-pos;
33
+ // $link-hover-border-width: $link-border-width;
36
34
  ///// Active
37
35
  // $link-active-link-color: $link-color;
38
36
  //
39
37
  //
40
38
  // $h1-margin-pos: none;
41
- // $h1-border-width: 0;
42
- // $h2-border-pos: none;
43
- // $h2-border-width: 0;
44
- // $h3-border-pos: none;
45
- // $h3-border-width: 0;
39
+ // $h1-border-width: false;
40
+ // $h2-border-width: false;
41
+ // $h3-border-width: false;
46
42
  //
47
43
  // $button-padding: 0.33em .66em;
48
44
  // $button-border-color: nth($black, 3);
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: compass-pattern-primer
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.1
4
+ version: 0.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Mark Reilly
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2013-05-29 00:00:00 Z
12
+ date: 2013-07-02 00:00:00 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: sass
@@ -31,6 +31,16 @@ dependencies:
31
31
  version: 0.12.1
32
32
  type: :runtime
33
33
  version_requirements: *id002
34
+ - !ruby/object:Gem::Dependency
35
+ name: toolkit
36
+ prerelease: false
37
+ requirement: &id003 !ruby/object:Gem::Requirement
38
+ requirements:
39
+ - - ">="
40
+ - !ruby/object:Gem::Version
41
+ version: 1.0.0
42
+ type: :runtime
43
+ version_requirements: *id003
34
44
  description: A Compass extension to help create style guides
35
45
  email:
36
46
  - mark@alienresident.net
@@ -41,6 +51,8 @@ extensions: []
41
51
  extra_rdoc_files: []
42
52
 
43
53
  files:
54
+ - README.md
55
+ - CHANGELOG.md
44
56
  - lib/compass-pattern-primer.rb
45
57
  - stylesheets/compass-pattern-primer/_base.scss
46
58
  - stylesheets/compass-pattern-primer/_modules.scss
@@ -72,7 +84,6 @@ files:
72
84
  - stylesheets/compass-pattern-primer/partials/variables/modules/_feedback.scss
73
85
  - stylesheets/compass-pattern-primer/partials/variables/modules/_options.scss
74
86
  - stylesheets/compass-pattern-primer/partials/variables/modules/_pagination.scss
75
- - stylesheets/compass-pattern-primer/partials/variables/modules/compass-pattern-primer.scss
76
87
  - stylesheets/compass-pattern-primer/reset/_reset.scss
77
88
  - stylesheets/compass-pattern-primer/reset/libraries/_eric_meyer_reset.scss
78
89
  - stylesheets/compass-pattern-primer/reset/libraries/_formalize.scss
@@ -131,6 +142,6 @@ rubyforge_project: compass-pattern-primer
131
142
  rubygems_version: 2.0.3
132
143
  signing_key:
133
144
  specification_version: 4
134
- summary: An easy to use system to build style guide based off of Jeremy Keith's Pattern Primer.
145
+ summary: An easy to use system to build a website's styleguide. It's based off of Jeremy Keith's Pattern Primer.
135
146
  test_files: []
136
147
 
@@ -1,12 +0,0 @@
1
- @import "compass-pattern-primer/reset";
2
-
3
- @import "compass-pattern-primer/partials/_mixins";
4
- @import "compass-pattern-primer/partials/_functions";
5
- @import "compass-pattern-primer/partials/variables/_variables";
6
- @import "compass-pattern-primer/partials/_extendables";
7
- @import "compass-pattern-primer/partials/_colors";
8
-
9
- @import "compass-pattern-primer/base";
10
-
11
- @import "compass-pattern-primer/modules";
12
-