neat 1.7.2 → 1.7.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c6b50c07d8c966cedba1f86748bbb548de235b73
4
- data.tar.gz: 369a8d7abf93b2225c286e14b952cfe7b5eab1e9
3
+ metadata.gz: 6d8b70193c0b73127b13475fa5eb738ac2fb7923
4
+ data.tar.gz: 2641b56bdc7a8a6e5a5408f0ed8dbc4d93dbc201
5
5
  SHA512:
6
- metadata.gz: 9399ce5a9ea9621a8133b3ca962f4e89646e61551e59ea8b1c64480e60661581b3445e43a8e9f043f22061060433e44eb098020065eb54fc60a451900de0376e
7
- data.tar.gz: 8d11fb480e5d1f7948c88eeac66312941e5150dfec9e62b32dfb019ccc69d38886c53a23d540f41d67217e45ec9399471d33e912f9f42ece3deb630096ff682c
6
+ metadata.gz: 49f3ff183d4038fd0a28dd27c73569a953e6eb523fbf8214cc274f21e076f3e6531b5907f0700e69b4834cfea9f8fa5de0038e82517646cd328b26d56387af2f
7
+ data.tar.gz: 7b8fb96a07d9e245cae2980a18bddd66cc09df1c5693a40b570ad64cf07fc997d510fe9aa02360ac8e75a7742b4b9ad0aad0152198810c0ec61d447217e6e383
data/.gitignore CHANGED
@@ -5,3 +5,5 @@
5
5
  Gemfile.lock
6
6
  public
7
7
  tmp
8
+ contrib/*.css
9
+ node_modules
data/.npmignore ADDED
@@ -0,0 +1,19 @@
1
+ .gitignore
2
+ .rspec
3
+ .sass-cache
4
+ .scss-lint.yml
5
+ .travis.yml
6
+ _site
7
+ bin/
8
+ bower.json
9
+ CONTRIBUTING.md
10
+ Gemfile
11
+ Gemfile.lock
12
+ lib/
13
+ neat.gemspec
14
+ NEWS.md
15
+ pkg/
16
+ Rakefile
17
+ sache.json
18
+ spec/
19
+ test/
data/.scss-lint.yml CHANGED
@@ -1,4 +1,4 @@
1
- scss_files: "app/assets/stylesheets/**/*.scss"
1
+ scss_files: "**/*.scss"
2
2
 
3
3
  linters:
4
4
  BangFormat:
@@ -6,15 +6,25 @@ linters:
6
6
  space_before_bang: true
7
7
  space_after_bang: false
8
8
 
9
+ BemDepth:
10
+ enabled: false
11
+
9
12
  BorderZero:
13
+ enabled: true
14
+ convention: zero
15
+
16
+ ChainedClasses:
10
17
  enabled: false
11
18
 
12
19
  ColorKeyword:
13
20
  enabled: true
14
- severity: warning
21
+
22
+ ColorVariable:
23
+ enabled: false
15
24
 
16
25
  Comment:
17
26
  enabled: true
27
+ style: silent
18
28
 
19
29
  DebugStatement:
20
30
  enabled: true
@@ -22,6 +32,9 @@ linters:
22
32
  DeclarationOrder:
23
33
  enabled: true
24
34
 
35
+ DisableLinterReason:
36
+ enabled: false
37
+
25
38
  DuplicateProperty:
26
39
  enabled: true
27
40
 
@@ -36,12 +49,15 @@ linters:
36
49
  EmptyRule:
37
50
  enabled: true
38
51
 
52
+ ExtendDirective:
53
+ enabled: false
54
+
39
55
  FinalNewline:
40
56
  enabled: true
41
57
  present: true
42
58
 
43
59
  HexLength:
44
- enabled: false
60
+ enabled: true
45
61
  style: short
46
62
 
47
63
  HexNotation:
@@ -51,7 +67,10 @@ linters:
51
67
  HexValidation:
52
68
  enabled: true
53
69
 
54
- IdWithExtraneousSelector:
70
+ IdSelector:
71
+ enabled: true
72
+
73
+ ImportantRule:
55
74
  enabled: true
56
75
 
57
76
  ImportPath:
@@ -61,6 +80,7 @@ linters:
61
80
 
62
81
  Indentation:
63
82
  enabled: true
83
+ allow_non_nested_indentation: false
64
84
  character: space
65
85
  width: 2
66
86
 
@@ -74,44 +94,65 @@ linters:
74
94
 
75
95
  NameFormat:
76
96
  enabled: true
97
+ allow_leading_underscore: true
77
98
  convention: hyphenated_lowercase
78
99
 
79
100
  NestingDepth:
80
101
  enabled: true
81
- max_depth: 4
82
- severity: warning
102
+ max_depth: 3
103
+ ignore_parent_selectors: false
83
104
 
84
105
  PlaceholderInExtend:
106
+ enabled: true
107
+
108
+ PropertyCount:
85
109
  enabled: false
86
110
 
87
111
  PropertySortOrder:
88
112
  enabled: true
89
113
  ignore_unspecified: false
90
- severity: warning
114
+ min_properties: 2
115
+ separate_groups: false
91
116
 
92
117
  PropertySpelling:
93
118
  enabled: true
94
119
  extra_properties: []
120
+ disabled_properties: []
121
+
122
+ PropertyUnits:
123
+ enabled: true
124
+ global: [
125
+ 'ch', 'em', 'ex', 'rem',
126
+ 'cm', 'in', 'mm', 'pc', 'pt', 'px', 'q',
127
+ 'vh', 'vw', 'vmin', 'vmax',
128
+ 'deg', 'grad', 'rad', 'turn',
129
+ 'ms', 's',
130
+ 'Hz', 'kHz',
131
+ 'dpi', 'dpcm', 'dppx',
132
+ '%']
133
+ properties:
134
+ line-height: []
135
+
136
+ PseudoElement:
137
+ enabled: true
95
138
 
96
139
  QualifyingElement:
97
140
  enabled: true
98
- allow_with_attribute: false
99
- allow_with_class: false
100
- allow_with_id: false
101
- severity: warning
141
+ allow_element_with_attribute: false
142
+ allow_element_with_class: false
143
+ allow_element_with_id: false
102
144
 
103
145
  SelectorDepth:
104
146
  enabled: true
105
147
  max_depth: 2
106
- severity: warning
107
148
 
108
149
  SelectorFormat:
109
- enabled: true
110
- convention: hyphenated_lowercase
150
+ enabled: false
151
+ convention: hyphenated_BEM
111
152
 
112
153
  Shorthand:
113
154
  enabled: true
114
- severity: warning
155
+ allowed_shorthands: [1, 2, 3]
115
156
 
116
157
  SingleLinePerProperty:
117
158
  enabled: true
@@ -122,6 +163,7 @@ linters:
122
163
 
123
164
  SpaceAfterComma:
124
165
  enabled: true
166
+ style: one_space
125
167
 
126
168
  SpaceAfterPropertyColon:
127
169
  enabled: true
@@ -130,10 +172,17 @@ linters:
130
172
  SpaceAfterPropertyName:
131
173
  enabled: true
132
174
 
175
+ SpaceAfterVariableName:
176
+ enabled: true
177
+
178
+ SpaceAroundOperator:
179
+ enabled: true
180
+ style: one_space
181
+
133
182
  SpaceBeforeBrace:
134
183
  enabled: true
135
184
  style: space
136
- allow_single_line_padding: false
185
+ allow_single_line_padding: true
137
186
 
138
187
  SpaceBetweenParens:
139
188
  enabled: true
@@ -146,8 +195,14 @@ linters:
146
195
  TrailingSemicolon:
147
196
  enabled: true
148
197
 
198
+ TrailingWhitespace:
199
+ enabled: true
200
+
149
201
  TrailingZero:
150
- enabled: false
202
+ enabled: true
203
+
204
+ TransitionAll:
205
+ enabled: true
151
206
 
152
207
  UnnecessaryMantissa:
153
208
  enabled: true
@@ -161,15 +216,18 @@ linters:
161
216
  UrlQuotes:
162
217
  enabled: true
163
218
 
164
- VendorPrefixes:
219
+ VariableForProperty:
220
+ enabled: false
221
+ properties: []
222
+
223
+ VendorPrefix:
165
224
  enabled: true
166
- identifier_list: bourbon
167
- include: []
168
- exclude: []
225
+ identifier_list: base
226
+ additional_identifiers: []
227
+ excluded_identifiers: []
169
228
 
170
229
  ZeroUnit:
171
230
  enabled: true
172
- severity: warning
173
231
 
174
232
  Compass::*:
175
233
  enabled: false
data/.travis.yml CHANGED
@@ -1,5 +1,6 @@
1
1
  language: ruby
2
2
  rvm: 2.0.0
3
+ sudo: false
3
4
  branches:
4
5
  except:
5
6
  - gh-pages
data/CONTRIBUTING.md CHANGED
@@ -1,4 +1,7 @@
1
- We love pull requests. Here's a quick guide:
1
+ We love pull requests from everyone. By participating in this project, you
2
+ agree to abide by the thoughtbot [code of conduct]. Here’s a quick guide:
3
+
4
+ [code of conduct]: https://thoughtbot.com/open-source-code-of-conduct
2
5
 
3
6
  1. Fork the repository.
4
7
  2. Make your changes in a topic branch.
data/Gulpfile.js ADDED
@@ -0,0 +1,33 @@
1
+ var bourbon = require("bourbon").includePaths,
2
+ autoprefix = require("gulp-autoprefixer"),
3
+ connect = require("gulp-connect"),
4
+ gulp = require("gulp"),
5
+ sass = require("gulp-sass");
6
+
7
+ var paths = {
8
+ scss: [
9
+ "./app/assets/stylesheets/**/*.scss",
10
+ "./contrib/styles.scss"]
11
+ };
12
+
13
+ gulp.task("sass", function () {
14
+ return gulp.src(paths.scss)
15
+ .pipe(sass({
16
+ includePaths: ["styles"].concat(bourbon)
17
+ }))
18
+ .pipe(autoprefix("last 2 versions"))
19
+ .pipe(gulp.dest("./contrib"))
20
+ .pipe(connect.reload());
21
+ });
22
+
23
+ gulp.task("connect", function() {
24
+ connect.server({
25
+ root: "contrib",
26
+ port: 8000,
27
+ livereload: true
28
+ });
29
+ });
30
+
31
+ gulp.task("default", ["sass", "connect"], function() {
32
+ gulp.watch(paths.scss, ["sass"]);
33
+ });
data/README.md CHANGED
@@ -90,6 +90,23 @@ For command line help, visit our wiki page on Neat’s [command line interface](
90
90
 
91
91
  It should be noted that `@import` rules are not compatible with Sprockets directives. You need to use one or the other.
92
92
 
93
+ ## Installing with npm and using a Node-based asset pipeline
94
+
95
+ 1. Add Neat as a dependency:
96
+
97
+ ```bash
98
+ npm install --save bourbon-neat
99
+ ```
100
+
101
+ 1. If you’re using [Eyeglass](http://eyeglass.rocks), skip to Step 3. Otherwise, you’ll need to add Bourbon and Neat to your node-sass `includePaths` option. `require("bourbon-neat").includePaths` is an array of directories that you should pass to node-sass. How you do this depends on how node-sass is integrated into your project. You will also need to ensure that Bourbon is in the `includePaths` passed to node-sass.
102
+
103
+ 1. Import Neat into your Sass files, after Bourbon:
104
+
105
+ ```scss
106
+ @import "bourbon";
107
+ @import "neat";
108
+ ```
109
+
93
110
  ## Installing older versions of Neat
94
111
 
95
112
  1. Uninstall any Neat gem versions you already have:
@@ -125,7 +142,7 @@ In your newly created `_grid-settings.scss`, import `neat-helpers` if you are p
125
142
  $column: 90px;
126
143
  $gutter: 30px;
127
144
  $grid-columns: 10;
128
- $max-width: em(1088);
145
+ $max-width: 1200px;
129
146
 
130
147
  // Define your breakpoints
131
148
  $tablet: new-breakpoint(max-width 768px 8);
@@ -189,7 +206,11 @@ To make your layout responsive, use the `media()` mixin to modify both the grid
189
206
  }
190
207
  ```
191
208
 
192
- By setting `$visual-grid` to `true`, you can display the base grid in the background (default) or as an overlay. You can even change the color and opacity of the grid-lines by overriding the default settings as detailed in the section below.
209
+ By setting `$visual-grid` to `true` in a file that is imported before
210
+ `neat-helpers` (or prior to `neat` itself if you are using the default
211
+ breakpoints), you can display the base grid in the background (default) or as an
212
+ overlay. You can even change the color and opacity of the grid-lines by
213
+ overriding the default settings as detailed in the section below.
193
214
 
194
215
  The visual grid reflects the changes applied to the grid via the `new-breakpoint()` mixin, as long as the media contexts are defined *before* importing Neat.
195
216
 
@@ -207,8 +228,8 @@ splitting](http://simurai.com/blog/2012/08/29/media-query-splitting). This would
207
228
  ```scss
208
229
  $first-breakpoint-value: 400px;
209
230
  $second-breakpoint-value: 700px;
210
- $medium-viewport: new-breakpoint(min-width em($first-breakpoint-value) max-width em($second-breakpoint-value));
211
- $large-viewport: new-breakpoint(min-width em($second-breakpoint-value + 1));
231
+ $medium-viewport: new-breakpoint(min-width $first-breakpoint-value max-width $second-breakpoint-value);
232
+ $large-viewport: new-breakpoint(min-width $second-breakpoint-value + 1);
212
233
 
213
234
  .element {
214
235
  @include media($medium-viewport) {
@@ -229,7 +250,7 @@ If, for some reason, you still think that `omega-reset` is the only way you want
229
250
 
230
251
  The visual grid is built using CSS gradients whose stops might contain decimal values depending on the default settings of your grid. In order to render the gradient, browsers round the pixel values since they can’t deal with pixel fractions.
231
252
 
232
- As a result the viusal grid might be few pixels off in some browsers. The result is also inconsistent across browsers. For best results, preview your website on Firefox as it renders closest to the expected outcome.
253
+ As a result the visual grid might be few pixels off in some browsers. The result is also inconsistent across browsers. For best results, preview your website on Firefox as it renders closest to the expected outcome.
233
254
 
234
255
  At this point, writing an internal rounding mechanism is not high priority.
235
256
 
@@ -259,14 +280,14 @@ Copyright © 2012–2015 [thoughtbot, inc](http://thoughtbot.com). Neat is free
259
280
 
260
281
  ## About thoughtbot
261
282
 
262
- ![thoughtbot](https://thoughtbot.com/logo.png)
283
+ [<img src="http://thoughtbot.github.io/images/signature.svg" width="250" alt="thoughtbot logo">][hire]
263
284
 
264
285
  Neat is maintained and funded by thoughtbot, inc.
265
286
  The names and logos for thoughtbot are trademarks of thoughtbot, inc.
266
287
 
267
288
  We love open source software!
268
- See [our other projects][community] or
269
- [hire us][hire] to design, develop, and grow your product.
289
+ See [our other projects][community]
290
+ or [hire us][hire] to design, develop, and grow your product.
270
291
 
271
292
  [community]: https://thoughtbot.com/community?utm_source=github
272
293
  [hire]: https://thoughtbot.com/hire-us?utm_source=github
@@ -1,4 +1,4 @@
1
- // Neat 1.7.2
1
+ // Neat 1.7.3
2
2
  // http://neat.bourbon.io
3
3
  // Copyright 2012-2015 thoughtbot, inc.
4
4
  // MIT License
@@ -1,6 +1,6 @@
1
1
  @charset "UTF-8";
2
2
 
3
- /// Makes an element a outer container by centring it in the viewport, clearing its floats, and setting its `max-width`.
3
+ /// Makes an element a outer container by centering it in the viewport, clearing its floats, and setting its `max-width`.
4
4
  /// Although optional, using `outer-container` is recommended. The mixin can be called on more than one element per page, as long as they are not nested.
5
5
  ///
6
6
  /// @param {Number [unit]} $local-max-width [$max-width]
@@ -12,7 +12,7 @@
12
12
  /// `$columns` also accepts decimals for when it's necessary to break out of the standard grid. E.g. Passing `2.4` in a standard 12 column grid will divide the row into 5 columns.
13
13
  ///
14
14
  /// @param {String} $display [block]
15
- /// Sets the display property of the element. By default it sets the display propert of the element to `block`.
15
+ /// Sets the display property of the element. By default it sets the display property of the element to `block`.
16
16
  ///
17
17
  /// If passed `block-collapse`, it also removes the margin gutter by adding it to the element width.
18
18
  ///
@@ -1,12 +1,12 @@
1
1
  @charset "UTF-8";
2
2
 
3
- /// Sets the relative width of a single grid column. The unit used should be the same one used to define `$gutter`. To learn more about modular-scale() see [Bourbon docs](http://bourbon.io/docs/#modular-scale). Set with a `!global` flag.
3
+ /// Sets the relative width of a single grid column. The unit used should be the same one used to define `$gutter`. To learn more about `modular-scale()` see [Bourbon docs](http://bourbon.io/docs/#modular-scale). Set with a `!global` flag.
4
4
  ///
5
5
  /// @type Number (Unit)
6
6
 
7
7
  $column: modular-scale(3, 1em, $golden) !default;
8
8
 
9
- /// Sets the relative width of a single grid gutter. The unit used should be the same one used to define `$column`. To learn more about modular-scale() see [Bourbon docs](http://bourbon.io/docs/#modular-scale). Set with the `!global` flag.
9
+ /// Sets the relative width of a single grid gutter. The unit used should be the same one used to define `$column`. To learn more about `modular-scale()` see [Bourbon docs](http://bourbon.io/docs/#modular-scale). Set with the `!global` flag.
10
10
  ///
11
11
  /// @type Number (Unit)
12
12
 
@@ -18,11 +18,11 @@ $gutter: modular-scale(1, 1em, $golden) !default;
18
18
 
19
19
  $grid-columns: 12 !default;
20
20
 
21
- /// Sets the max-width property of the element that includes `outer-container()`. To learn more about `em()` see [Bourbon docs](http://bourbon.io/docs/#px-to-em). Set with the `!global` flag.
21
+ /// Sets the max-width property of the element that includes `outer-container()`. Set with the `!global` flag.
22
22
  ///
23
23
  /// @type Number (Unit)
24
24
  ///
25
- $max-width: em(1088) !default;
25
+ $max-width: 1200px !default;
26
26
 
27
27
  /// When set to true, it sets the box-sizing property of all elements to `border-box`. Set with a `!global` flag.
28
28
  ///
data/bower.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "neat",
3
3
  "description": "A lightweight, semantic grid framework built with Bourbon",
4
- "version": "1.7.2",
4
+ "version": "1.7.3",
5
5
  "main": "app/assets/stylesheets/_neat.scss",
6
6
  "license": "MIT",
7
7
  "ignore": [
@@ -0,0 +1,225 @@
1
+ <!DOCTYPE html>
2
+ <html lang="en">
3
+ <head>
4
+ <meta charset="utf-8">
5
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
6
+ <meta name="viewport" content="width=device-width,initial-scale=1">
7
+ <title>Have fun ❤︎</title>
8
+ <link rel="stylesheet" href="styles.css">
9
+ </head>
10
+ <body>
11
+ <header class="welcome-message" role="banner">
12
+ <div class="container">
13
+ <h1 class="welcome-message-title">
14
+ Hey there! Thanks for contributing to
15
+ <a href="http://neat.bourbon.io">Neat</a>.
16
+ </h1>
17
+ <p>
18
+ The purpose of this page is to help contributors view and test
19
+ changes to Neat.
20
+ </p>
21
+ </div>
22
+ </header>
23
+ <main role="main">
24
+ <h3>Basic</h3>
25
+ <section class="page-section zero">
26
+ <code>@include outer-container;</code>
27
+ <div class="page-section-inner zero-alpha">
28
+ <code>@include span-columns(6);</code>
29
+ </div>
30
+ <div class="page-section-inner zero-beta">
31
+ <code>@include span-columns(6);</code>
32
+ </div>
33
+ </section>
34
+ <h3>Multiple rows</h3>
35
+ <section class="page-section first">
36
+ <code>@include outer-container;</code>
37
+ <div class="page-section-inner first-alpha">
38
+ <code>(1)</code>
39
+ </div>
40
+ <div class="page-section-inner first-beta">
41
+ <code>
42
+ @include span-columns(11);<br>
43
+ @include omega();
44
+ </code>
45
+ </div>
46
+ <div class="page-section-inner first-gamma">
47
+ <code>
48
+ @include span-columns(2);
49
+ </code>
50
+ </div>
51
+ <div class="page-section-inner first-delta">
52
+ <code>
53
+ @include span-columns(10);<br>
54
+ @include omega();
55
+ </code>
56
+ </div>
57
+ <div class="page-section-inner first-epsilon">
58
+ <code>
59
+ @include span-columns(3);
60
+ </code>
61
+ </div>
62
+ <div class="page-section-inner first-zeta">
63
+ <code>
64
+ @include span-columns(9);<br>
65
+ @include omega();
66
+ </code>
67
+ </div>
68
+ <div class="page-section-inner first-eta">
69
+ <code>
70
+ @include span-columns(4);
71
+ </code>
72
+ </div>
73
+ <div class="page-section-inner first-theta">
74
+ <code>
75
+ @include span-columns(8);<br>
76
+ @include omega();
77
+ </code>
78
+ </div>
79
+ <div class="page-section-inner first-iota">
80
+ <code>
81
+ @include span-columns(5);
82
+ </code>
83
+ </div>
84
+ <div class="page-section-inner first-kappa">
85
+ <code>
86
+ @include span-columns(7);<br>
87
+ @include omega();
88
+ </code>
89
+ </div>
90
+ <div class="page-section-inner first-lambda">
91
+ <code>
92
+ @include span-columns(6);
93
+ </code>
94
+ </div>
95
+ <div class="page-section-inner first-mu">
96
+ <code>
97
+ @include span-columns(6);<br>
98
+ @include omega();
99
+ </code>
100
+ </div>
101
+ </section>
102
+ <h3>Nesting columns</h3>
103
+ <section class="page-section second">
104
+ <code>@include outer-container;</code>
105
+ <div class="page-section-inner second-alpha">
106
+ <code>@include span-columns(4);</code>
107
+ </div>
108
+ <div class="page-section-inner second-beta">
109
+ <code class="block">@include span-columns(8);</code>
110
+ <aside class="second-beta-alpha">
111
+ <code>@include span-columns(4 of 8);</code>
112
+ </aside>
113
+ <article class="second-beta-beta">
114
+ <code>@include span-columns(4 of 8);</code>
115
+ </article>
116
+ </div>
117
+ </section>
118
+ <h3>Table grid</h3>
119
+ <section class="page-section third">
120
+ <code>@include outer-container;</code>
121
+ <div class="page-section-inner third-dummy">
122
+ <code>
123
+ @include fill-parent();<br>
124
+ @include row(table);
125
+ </code>
126
+ </div>
127
+ <div class="page-section-inner third-alpha">
128
+ <aside class="third-alpha-alpha">
129
+ <code>
130
+ @include span-columns(4);<br>
131
+ @include pad();
132
+ </code>
133
+ </aside>
134
+ <article class="third-alpha-beta">
135
+ <code>
136
+ @include span-columns(8);<br>
137
+ @include reset-display;
138
+ </code>
139
+ </article>
140
+ </div>
141
+ </section>
142
+ <h3>Shifting columns</h3>
143
+ <section class="page-section fourth">
144
+ <code>@include outer-container;</code>
145
+ <div class="page-section-inner fourth-alpha">
146
+ <code>
147
+ @include span-columns(6);<br>
148
+ @include shift(3);
149
+ </code>
150
+ </div>
151
+ </section>
152
+ <h3>Automatic rows</h3>
153
+ <div class="code">
154
+ <code>@include outer-container;</code>
155
+ </div>
156
+ <section class="page-section fifth">
157
+ <div class="box">
158
+ <pre>
159
+ .box {
160
+ @include span-columns(3);
161
+ @include omega(4n);
162
+ }
163
+ </pre>
164
+ </div>
165
+ <div class="fifth-box page-section-inner">
166
+ <code>.box</code>
167
+ </div>
168
+ <div class="fifth-box page-section-inner">
169
+ <code>.box</code>
170
+ </div>
171
+ <div class="fifth-box page-section-inner">
172
+ <code>.box</code>
173
+ </div>
174
+ <div class="fifth-box page-section-inner">
175
+ <code>.box</code>
176
+ </div>
177
+ <div class="fifth-box page-section-inner">
178
+ <code>.box</code>
179
+ </div>
180
+ <div class="fifth-box page-section-inner">
181
+ <code>.box</code>
182
+ </div>
183
+ <div class="fifth-box page-section-inner">
184
+ <code>.box</code>
185
+ </div>
186
+ <div class="fifth-box page-section-inner">
187
+ <code>.box</code>
188
+ </div>
189
+ <div class="fifth-box page-section-inner">
190
+ <code>.box</code>
191
+ </div>
192
+ <div class="fifth-box page-section-inner">
193
+ <code>.box</code>
194
+ </div>
195
+ <div class="fifth-box page-section-inner">
196
+ <code>.box</code>
197
+ </div>
198
+ </section>
199
+ <h3>Media Queries</h3>
200
+ <section class="page-section sixth">
201
+ <pre>
202
+ @include outer-container;
203
+ $mobile: new-breakpoint(max-width 500px 4);
204
+ </pre>
205
+ <div class="page-section-inner sixth-alpha">
206
+ <pre>
207
+ @include span-columns(4);
208
+
209
+ @include media($mobile) {
210
+ @include span-columns(3);
211
+ }
212
+ </pre>
213
+ </div>
214
+ <div class="page-section-inner sixth-beta">
215
+ <pre>
216
+ @include span-columns(8);
217
+ @include media($mobile) {
218
+ @include span-columns(3);
219
+ }
220
+ </pre>
221
+ </div>
222
+ </section>
223
+ </main>
224
+ </body>
225
+ </html>
@@ -0,0 +1,292 @@
1
+ @import "bourbon";
2
+ @import "../app/assets/stylesheets/neat";
3
+
4
+ // Grid Settings
5
+ $column: 90px;
6
+ $gutter: 30px;
7
+ $grid-columns: 12;
8
+ $max-width: 1200px;
9
+
10
+ // Media
11
+ $medium-screen: 600px;
12
+ $large-screen: 900px;
13
+
14
+ $medium-screen-up: new-breakpoint(min-width $medium-screen 4);
15
+ $large-screen-up: new-breakpoint(min-width $large-screen 8);
16
+
17
+ // Base
18
+ $base-line-height: 1.625;
19
+ $base-spacing: $base-line-height * 1em;
20
+
21
+ // Visual Grid
22
+ $visual-grid: true;
23
+ $visual-grid-color: #e6f6ff;
24
+ $visual-grid-opacity: 0.4;
25
+
26
+ // Colors
27
+ $white: #fafafa;
28
+ $lightblue: #d5eefb;
29
+ $blue: #aadbf5;
30
+ $darkblue: #41a8df;
31
+ $darkerblue: #072f44;
32
+
33
+ // Base
34
+ // ============================================
35
+
36
+ body {
37
+ color: $darkerblue;
38
+ font-family: $helvetica;
39
+ line-height: $base-line-height;
40
+ margin: 0 0 (1.5rem * 2);
41
+ text-align: center;
42
+ }
43
+
44
+ h3 {
45
+ margin: 1em;
46
+ }
47
+
48
+ a,
49
+ a:visited {
50
+ color: inherit;
51
+ }
52
+
53
+ pre {
54
+ line-height: 1.6em;
55
+ }
56
+
57
+ code {
58
+ display: block;
59
+ }
60
+
61
+ // Header
62
+ // ============================================
63
+
64
+ .container {
65
+ @include margin(null auto);
66
+ @include padding(null $gutter);
67
+ max-width: 500px;
68
+ position: relative;
69
+ }
70
+
71
+ .welcome-message {
72
+ @include clearfix();
73
+ @include padding($base-spacing null);
74
+ background-color: $blue;
75
+ margin-bottom: 1.5rem;
76
+ text-align: center;
77
+ }
78
+
79
+ .welcome-message-title {
80
+ font-weight: 200;
81
+ line-height: 1;
82
+ }
83
+
84
+ // ============================================
85
+
86
+ .code {
87
+ @include outer-container();
88
+ background-color: $lightblue;
89
+ padding: 0.5em;
90
+ text-align: center;
91
+ }
92
+
93
+ .page-section {
94
+ @include outer-container;
95
+ background-color: $lightblue;
96
+ line-height: $base-line-height * 1.5;
97
+ margin-bottom: 3em;
98
+ text-align: center;
99
+ }
100
+
101
+ .page-section-inner {
102
+ background-color: $blue;
103
+ font-size: 0.8em;
104
+ height: $base-line-height * 4rem;
105
+ line-height: $base-line-height;
106
+ margin-bottom: 2em;
107
+ padding: 1em;
108
+ text-align: left;
109
+ }
110
+
111
+ // Zero
112
+ // ============================================
113
+
114
+ .zero-alpha,
115
+ .zero-beta {
116
+ @include span-columns(6);
117
+ height: $base-line-height * 4rem;
118
+ line-height: $base-line-height;
119
+ padding: 1em;
120
+ text-align: left;
121
+ }
122
+
123
+ // First
124
+ // ============================================
125
+
126
+ .first-alpha {
127
+ @include span-columns(1);
128
+ }
129
+
130
+ .first-beta {
131
+ @include span-columns(11);
132
+ }
133
+
134
+ .first-gamma {
135
+ @include span-columns(2);
136
+ }
137
+
138
+ .first-delta {
139
+ @include span-columns(10);
140
+ }
141
+
142
+ .first-epsilon {
143
+ @include span-columns(3);
144
+ }
145
+
146
+ .first-zeta {
147
+ @include span-columns(9);
148
+ }
149
+
150
+ .first-eta {
151
+ @include span-columns(4);
152
+ }
153
+
154
+ .first-theta {
155
+ @include span-columns(8);
156
+ }
157
+
158
+ .first-iota {
159
+ @include span-columns(5);
160
+ }
161
+
162
+ .first-kappa {
163
+ @include span-columns(7);
164
+ }
165
+
166
+ .first-lambda {
167
+ @include span-columns(6);
168
+ }
169
+
170
+ .first-mu {
171
+ @include span-columns(6);
172
+ }
173
+
174
+ .first-beta,
175
+ .first-delta,
176
+ .first-zeta,
177
+ .first-theta,
178
+ .first-kappa,
179
+ .first-mu {
180
+ @include omega;
181
+ }
182
+
183
+ // Second
184
+ // ============================================
185
+
186
+ .second-alpha {
187
+ @include span-columns(4);
188
+ }
189
+
190
+ .second-beta {
191
+ @include span-columns(8);
192
+ line-height: $base-line-height * 2;
193
+ padding: 0;
194
+ text-align: center;
195
+ }
196
+
197
+ .second-beta-alpha,
198
+ .second-beta-beta {
199
+ @include span-columns(4 of 8);
200
+ background-color: $lightblue;
201
+ height: 84%;
202
+ padding: 1em;
203
+ }
204
+
205
+ // Third
206
+ // ===================================
207
+
208
+ .third-dummy {
209
+ border-bottom: 0;
210
+ height: 5.5em;
211
+ text-align: center;
212
+ }
213
+
214
+ .third-alpha {
215
+ @include fill-parent();
216
+ @include row(table);
217
+ margin-bottom: 0;
218
+ padding: 0;
219
+ }
220
+
221
+ .third-alpha-alpha {
222
+ @include span-columns(4);
223
+ border-right: 1px solid rgba($white, 0.5);
224
+ }
225
+
226
+ .third-alpha-beta {
227
+ @include reset-display;
228
+ @include span-columns(8);
229
+ height: 20em;
230
+ }
231
+
232
+ // Fourth
233
+ // ===================================
234
+
235
+ .fourth {
236
+
237
+ .fourth-alpha {
238
+ @include span-columns(6);
239
+ @include shift(3);
240
+ height: 20em;
241
+ text-align: center;
242
+ }
243
+ }
244
+
245
+ // Fifth
246
+ // ===================================
247
+
248
+ .fifth-box {
249
+ @include omega(4n);
250
+ @include span-columns(3);
251
+ font-size: 0.78em;
252
+ height: 8em;
253
+ margin-top: 2em;
254
+ }
255
+
256
+ // Fifth
257
+ // ===================================
258
+
259
+ .sixth {
260
+ @include media($medium-screen) {
261
+ font-size: 0.9em;
262
+ line-height: 1.5em;
263
+ }
264
+
265
+ pre {
266
+ padding: 10px 0;
267
+ }
268
+ }
269
+
270
+ .sixth-alpha,
271
+ .sixth-beta {
272
+ line-height: 2em;
273
+ min-height: 20em;
274
+ padding: 1em;
275
+ text-align: left;
276
+ }
277
+
278
+ .sixth-alpha {
279
+ @include span-columns(4);
280
+
281
+ @include media($medium-screen) {
282
+ @include span-columns(3);
283
+ }
284
+ }
285
+
286
+ .sixth-beta {
287
+ @include span-columns(8);
288
+
289
+ @include media($medium-screen) {
290
+ @include span-columns(3);
291
+ }
292
+ }
@@ -0,0 +1,7 @@
1
+ var neat = require("./index");
2
+
3
+ module.exports = function(eyeglass, sass) {
4
+ return {
5
+ sassDir: neat.includePaths[0]
6
+ };
7
+ };
data/index.js ADDED
@@ -0,0 +1,7 @@
1
+ var path = require("path");
2
+
3
+ module.exports = {
4
+ includePaths: [
5
+ path.join(__dirname, "app/assets/stylesheets"),
6
+ ]
7
+ };
data/lib/neat/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Neat
2
- VERSION = '1.7.2'
2
+ VERSION = "1.7.3"
3
3
  end
data/neat.gemspec CHANGED
@@ -26,12 +26,12 @@ enough to use out of the box and flexible enough to customize down the road.
26
26
  s.add_dependency('sass', '>= 3.3')
27
27
  s.add_dependency('bourbon', '>= 4.0')
28
28
 
29
+ s.add_development_dependency("scss_lint", "~> 0.43")
29
30
  s.add_development_dependency('aruba', '~> 0.5.0')
30
- s.add_development_dependency('rake')
31
- s.add_development_dependency('css_parser')
32
- s.add_development_dependency('rspec')
33
- s.add_development_dependency('rdoc')
34
31
  s.add_development_dependency('bundler')
32
+ s.add_development_dependency('css_parser')
33
+ s.add_development_dependency('rake')
35
34
  s.add_development_dependency('rb-fsevent', '~> 0.9.1')
36
- s.add_development_dependency('scss-lint', '~> 0.29.0')
35
+ s.add_development_dependency('rdoc')
36
+ s.add_development_dependency('rspec')
37
37
  end
data/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "bourbon-neat",
3
- "version": "1.7.2",
3
+ "version": "1.7.3",
4
4
  "description": "A lightweight, semantic grid framework built with Bourbon",
5
5
  "keywords": [
6
6
  "bourbon",
@@ -13,7 +13,8 @@
13
13
  "queries",
14
14
  "sass",
15
15
  "scss",
16
- "semantic"
16
+ "semantic",
17
+ "eyeglass-module"
17
18
  ],
18
19
  "homepage": "http://neat.bourbon.io",
19
20
  "bugs": {
@@ -24,12 +25,27 @@
24
25
  "name": "thoughtbot",
25
26
  "url": "http://thoughtbot.com"
26
27
  },
27
- "main": "app/assets/stylesheets/_neat.scss",
28
+ "main": "index.js",
28
29
  "repository": {
29
30
  "type": "git",
30
31
  "url": "https://github.com/thoughtbot/neat.git"
31
32
  },
32
33
  "scripts": {
33
34
  "test": "echo \"No test specified\""
35
+ },
36
+ "dependencies": {
37
+ "bourbon": "^4.2",
38
+ "node-sass": "^3.4"
39
+ },
40
+ "devDependencies": {
41
+ "gulp": "^3.9",
42
+ "gulp-autoprefixer": "^3.1",
43
+ "gulp-connect": "^2.3",
44
+ "gulp-sass": "^2.2"
45
+ },
46
+ "eyeglass": {
47
+ "name": "neat",
48
+ "needs": "*",
49
+ "exports": "eyeglass-exports.js"
34
50
  }
35
51
  }
data/test/_setup.scss CHANGED
@@ -1,3 +1,3 @@
1
- @import 'bourbon/bourbon';
2
- @import '../app/assets/stylesheets/neat';
1
+ @import "bourbon/bourbon";
2
+ @import "../app/assets/stylesheets/neat";
3
3
  $disable-warnings: true !global;
data/test/default.scss CHANGED
@@ -1 +1 @@
1
- @import 'setup';
1
+ @import "setup";
@@ -1,4 +1,4 @@
1
- @import 'setup';
1
+ @import "setup";
2
2
 
3
3
  @include direction-context() {
4
4
  .default-block {
@@ -1,4 +1,4 @@
1
- @import 'setup';
1
+ @import "setup";
2
2
 
3
3
  @include display-context(table) {
4
4
  .display-table-block {
data/test/media.scss CHANGED
@@ -1,4 +1,4 @@
1
- @import 'setup';
1
+ @import "setup";
2
2
 
3
3
  $composite: new-breakpoint(max-width 768px min-width 110px orientation portait 6);
4
4
 
@@ -1,4 +1,4 @@
1
- @import 'setup';
1
+ @import "setup";
2
2
 
3
3
  $tablet: new-breakpoint(max-width 768px 12);
4
4
 
data/test/omega.scss CHANGED
@@ -1,4 +1,4 @@
1
- @import 'setup';
1
+ @import "setup";
2
2
 
3
3
  .omega-default {
4
4
  @include omega;
@@ -1,4 +1,4 @@
1
- @import 'setup';
1
+ @import "setup";
2
2
 
3
3
  $max-width: 960px;
4
4
 
data/test/pad.scss CHANGED
@@ -1,4 +1,4 @@
1
- @import 'setup';
1
+ @import "setup";
2
2
 
3
3
  .pad-default {
4
4
  @include pad;
data/test/row.scss CHANGED
@@ -1,4 +1,4 @@
1
- @import 'setup';
1
+ @import "setup";
2
2
 
3
3
  .row-default {
4
4
  @include row;
data/test/shift.scss CHANGED
@@ -1,4 +1,4 @@
1
- @import 'setup';
1
+ @import "setup";
2
2
 
3
3
  .shift-default {
4
4
  @include shift;
@@ -1,4 +1,4 @@
1
- @import 'setup';
1
+ @import "setup";
2
2
 
3
3
  .span-columns-default {
4
4
  @include span-columns(6);
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: neat
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.7.2
4
+ version: 1.7.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Joel Oliveira
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2015-03-13 00:00:00.000000000 Z
13
+ date: 2016-02-29 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: sass
@@ -41,35 +41,35 @@ dependencies:
41
41
  - !ruby/object:Gem::Version
42
42
  version: '4.0'
43
43
  - !ruby/object:Gem::Dependency
44
- name: aruba
44
+ name: scss_lint
45
45
  requirement: !ruby/object:Gem::Requirement
46
46
  requirements:
47
47
  - - "~>"
48
48
  - !ruby/object:Gem::Version
49
- version: 0.5.0
49
+ version: '0.43'
50
50
  type: :development
51
51
  prerelease: false
52
52
  version_requirements: !ruby/object:Gem::Requirement
53
53
  requirements:
54
54
  - - "~>"
55
55
  - !ruby/object:Gem::Version
56
- version: 0.5.0
56
+ version: '0.43'
57
57
  - !ruby/object:Gem::Dependency
58
- name: rake
58
+ name: aruba
59
59
  requirement: !ruby/object:Gem::Requirement
60
60
  requirements:
61
- - - ">="
61
+ - - "~>"
62
62
  - !ruby/object:Gem::Version
63
- version: '0'
63
+ version: 0.5.0
64
64
  type: :development
65
65
  prerelease: false
66
66
  version_requirements: !ruby/object:Gem::Requirement
67
67
  requirements:
68
- - - ">="
68
+ - - "~>"
69
69
  - !ruby/object:Gem::Version
70
- version: '0'
70
+ version: 0.5.0
71
71
  - !ruby/object:Gem::Dependency
72
- name: css_parser
72
+ name: bundler
73
73
  requirement: !ruby/object:Gem::Requirement
74
74
  requirements:
75
75
  - - ">="
@@ -83,7 +83,7 @@ dependencies:
83
83
  - !ruby/object:Gem::Version
84
84
  version: '0'
85
85
  - !ruby/object:Gem::Dependency
86
- name: rspec
86
+ name: css_parser
87
87
  requirement: !ruby/object:Gem::Requirement
88
88
  requirements:
89
89
  - - ">="
@@ -97,7 +97,7 @@ dependencies:
97
97
  - !ruby/object:Gem::Version
98
98
  version: '0'
99
99
  - !ruby/object:Gem::Dependency
100
- name: rdoc
100
+ name: rake
101
101
  requirement: !ruby/object:Gem::Requirement
102
102
  requirements:
103
103
  - - ">="
@@ -111,47 +111,47 @@ dependencies:
111
111
  - !ruby/object:Gem::Version
112
112
  version: '0'
113
113
  - !ruby/object:Gem::Dependency
114
- name: bundler
114
+ name: rb-fsevent
115
115
  requirement: !ruby/object:Gem::Requirement
116
116
  requirements:
117
- - - ">="
117
+ - - "~>"
118
118
  - !ruby/object:Gem::Version
119
- version: '0'
119
+ version: 0.9.1
120
120
  type: :development
121
121
  prerelease: false
122
122
  version_requirements: !ruby/object:Gem::Requirement
123
123
  requirements:
124
- - - ">="
124
+ - - "~>"
125
125
  - !ruby/object:Gem::Version
126
- version: '0'
126
+ version: 0.9.1
127
127
  - !ruby/object:Gem::Dependency
128
- name: rb-fsevent
128
+ name: rdoc
129
129
  requirement: !ruby/object:Gem::Requirement
130
130
  requirements:
131
- - - "~>"
131
+ - - ">="
132
132
  - !ruby/object:Gem::Version
133
- version: 0.9.1
133
+ version: '0'
134
134
  type: :development
135
135
  prerelease: false
136
136
  version_requirements: !ruby/object:Gem::Requirement
137
137
  requirements:
138
- - - "~>"
138
+ - - ">="
139
139
  - !ruby/object:Gem::Version
140
- version: 0.9.1
140
+ version: '0'
141
141
  - !ruby/object:Gem::Dependency
142
- name: scss-lint
142
+ name: rspec
143
143
  requirement: !ruby/object:Gem::Requirement
144
144
  requirements:
145
- - - "~>"
145
+ - - ">="
146
146
  - !ruby/object:Gem::Version
147
- version: 0.29.0
147
+ version: '0'
148
148
  type: :development
149
149
  prerelease: false
150
150
  version_requirements: !ruby/object:Gem::Requirement
151
151
  requirements:
152
- - - "~>"
152
+ - - ">="
153
153
  - !ruby/object:Gem::Version
154
- version: 0.29.0
154
+ version: '0'
155
155
  description: |
156
156
  Neat is a fluid grid framework built with Bourbon with the aim of being easy
157
157
  enough to use out of the box and flexible enough to customize down the road.
@@ -162,11 +162,13 @@ extensions: []
162
162
  extra_rdoc_files: []
163
163
  files:
164
164
  - ".gitignore"
165
+ - ".npmignore"
165
166
  - ".rspec"
166
167
  - ".scss-lint.yml"
167
168
  - ".travis.yml"
168
169
  - CONTRIBUTING.md
169
170
  - Gemfile
171
+ - Gulpfile.js
170
172
  - LICENSE.md
171
173
  - NEWS.md
172
174
  - README.md
@@ -194,6 +196,10 @@ files:
194
196
  - app/assets/stylesheets/settings/_visual-grid.scss
195
197
  - bin/neat
196
198
  - bower.json
199
+ - contrib/index.html
200
+ - contrib/styles.scss
201
+ - eyeglass-exports.js
202
+ - index.js
197
203
  - lib/neat.rb
198
204
  - lib/neat/engine.rb
199
205
  - lib/neat/generator.rb
@@ -252,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
252
258
  version: '0'
253
259
  requirements: []
254
260
  rubyforge_project: neat
255
- rubygems_version: 2.2.2
261
+ rubygems_version: 2.5.2
256
262
  signing_key:
257
263
  specification_version: 4
258
264
  summary: A lightweight, semantic grid framework built with Bourbon
@@ -287,3 +293,4 @@ test_files:
287
293
  - test/row.scss
288
294
  - test/shift.scss
289
295
  - test/span-columns.scss
296
+ has_rdoc: