flutie 1.0.4 → 1.1

Sign up to get free protection for your applications and to get access to all the features.
data/README.textile CHANGED
@@ -12,7 +12,7 @@ Flutie is recommended to be run as a gem and included in your Gemfile.
12
12
 
13
13
  The installer will copy the Flutie stylesheets into public/flutie/stylesheets
14
14
 
15
- Once Flutie is installed, with your application running (not in production environment) you can browse to /styleguide. This will present you with many standard markup elements that are present in a Rails application, in your default application layout.
15
+ Once Flutie is installed, with your application running (not in production environment) you can browse to /styleguides. This will present you with many standard markup elements that are present in a Rails application, in your default application layout.
16
16
 
17
17
  Click on the "Default styles" link to view the same markup with a barebones layout that only contains the Flutie stylesheets. Click on "Application styles" to view the markup in your application layout.
18
18
 
@@ -24,6 +24,14 @@ Flutie registers a :flutie shortcut for stylesheets, so in your layout you can d
24
24
 
25
25
  ...this will include all the flutie stylesheets, then the 'admin' stylesheet, and it will cache them all into one file.
26
26
 
27
+ h3. Sass
28
+
29
+ If you use Sass in your application, the flutie stylesheets are also available as scss files, installed in public/flutie/sass. This location is automatically added to your Sass template load path. These files can be imported into your own css files for use with the following:
30
+
31
+ @import "flutie"
32
+
33
+ h3. Custom Styles
34
+
27
35
  To add custom styles to the styleguide add partials to the app/views/styleguides directory. For example:
28
36
 
29
37
  bc. app/views/styleguides/_todo_item.erb:
@@ -1,9 +1 @@
1
- ActionView::Helpers::AssetTagHelper.register_stylesheet_expansion :flutie => [
2
- '/flutie/stylesheets/reset',
3
- '/flutie/stylesheets/defaults',
4
- '/flutie/stylesheets/type',
5
- '/flutie/stylesheets/forms',
6
- '/flutie/stylesheets/tables',
7
- '/flutie/stylesheets/lists',
8
- '/flutie/stylesheets/screen'
9
- ]
1
+ ActionView::Helpers::AssetTagHelper.register_stylesheet_expansion :flutie => [ '/flutie/stylesheets/flutie' ]
@@ -0,0 +1,3 @@
1
+ if defined?(Sass::Plugin) && defined?(Rails)
2
+ Sass::Plugin.add_template_location(Rails.root.join('public', 'flutie', 'stylesheets', 'sass').to_s)
3
+ end
@@ -0,0 +1,458 @@
1
+ /* http://meyerweb.com/eric/tools/css/reset/ */
2
+ /* v1.0 | 20080212 */
3
+ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p,
4
+ blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em,
5
+ font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var,
6
+ b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table,
7
+ caption, tbody, tfoot, thead, tr, th, td {
8
+ margin: 0;
9
+ padding: 0;
10
+ border: 0;
11
+ outline: 0;
12
+ font-size: 100%;
13
+ vertical-align: baseline;
14
+ background: transparent; }
15
+
16
+ body {
17
+ line-height: 1; }
18
+
19
+ ol, ul {
20
+ list-style: none; }
21
+
22
+ blockquote, q {
23
+ quotes: none; }
24
+
25
+ blockquote:before, blockquote:after,
26
+ q:before, q:after {
27
+ content: '';
28
+ content: none; }
29
+
30
+ /* remember to define focus styles! */
31
+ :focus {
32
+ outline: 0; }
33
+
34
+ /* remember to highlight inserts somehow! */
35
+ ins {
36
+ text-decoration: none; }
37
+
38
+ del {
39
+ text-decoration: line-through; }
40
+
41
+ /* tables still need 'cellspacing="0"' in the markup */
42
+ table {
43
+ border-collapse: collapse;
44
+ border-spacing: 0; }
45
+
46
+ body {
47
+ color: #222;
48
+ font-size: 13px;
49
+ font-family: arial, "helvetica neue", helvetica, "lucida grande", sans-serif; }
50
+
51
+ h1, h2, h3, h4, h5, h6 {
52
+ color: #111;
53
+ font-family: "helvetica neue", Helvetica, arial, sans-serif; }
54
+
55
+ /* Success, error & notice boxes for messages and errors. */
56
+ div.error, div.notice, div.success,
57
+ #flash_failure, #flash_success, #flash_notice {
58
+ border: 1px solid #ddd;
59
+ -moz-border-radius: 8px;
60
+ -webkit-border-radius: 8px;
61
+ margin-bottom: 1em;
62
+ padding: 0.8em; }
63
+
64
+ div.error,
65
+ #flash_failure {
66
+ background: #FBE3E4;
67
+ border-color: #FBC2C4;
68
+ color: #D12F19; }
69
+
70
+ div.error a,
71
+ #flash_failure a {
72
+ color: #D12F19; }
73
+
74
+ div.notice,
75
+ #flash_notice {
76
+ background: #FFF6BF;
77
+ border-color: #FFD324;
78
+ color: #817134; }
79
+
80
+ div.notice a,
81
+ #flash_notice a {
82
+ color: #817134; }
83
+
84
+ div.success,
85
+ #flash_success {
86
+ background: #E6EFC2;
87
+ border-color: #C6D880;
88
+ color: #529214; }
89
+
90
+ div.success a,
91
+ #flash_success a {
92
+ color: #529214; }
93
+
94
+ /* Misc classes and elements */
95
+ /* Use a .box to create a padded box inside a column. */
96
+ .box {
97
+ background: #eee;
98
+ margin-bottom: 1.5em;
99
+ padding: 1.5em; }
100
+
101
+ /* Use this to create a horizontal ruler across a column. */
102
+ hr {
103
+ background: #ddd;
104
+ border: none;
105
+ clear: both;
106
+ color: #ddd;
107
+ float: none;
108
+ height: 1px;
109
+ margin: 0 0 1.4em;
110
+ width: 100%; }
111
+
112
+ hr.space {
113
+ background: #fff;
114
+ color: #fff; }
115
+
116
+ /* Clearfix hack I love you */
117
+ .clearfix:after {
118
+ content: ".";
119
+ display: block;
120
+ height: 0;
121
+ clear: both;
122
+ visibility: hidden; }
123
+
124
+ .clearfix {
125
+ display: inline-block; }
126
+
127
+ /* Hide from IE Mac \*/
128
+ .clearfix {
129
+ display: block; }
130
+
131
+ /* End hide from IE Mac */
132
+ /* Headings */
133
+ h1, h2, h3, h4, h5, h6 {
134
+ font-weight: bold; }
135
+
136
+ h1 {
137
+ font-size: 2.2em;
138
+ line-height: 1;
139
+ margin-bottom: 0.25em; }
140
+
141
+ h2 {
142
+ font-size: 1.6em;
143
+ line-height: 1.1;
144
+ margin-bottom: 0.25em; }
145
+
146
+ h3 {
147
+ font-size: 1.3em;
148
+ line-height: 1;
149
+ margin-bottom: 0.25em; }
150
+
151
+ h4 {
152
+ font-size: 1.1em;
153
+ line-height: 1.25;
154
+ margin-bottom: 0.25em; }
155
+
156
+ h5 {
157
+ font-size: 1em;
158
+ margin-bottom: 0.25em; }
159
+
160
+ h6 {
161
+ font-size: 1em;
162
+ margin-bottom: 0.25em; }
163
+
164
+ /* Text elements */
165
+ p {
166
+ margin-bottom: 0.5em; }
167
+
168
+ p.last {
169
+ margin-bottom: 0; }
170
+
171
+ p img {
172
+ float: left;
173
+ margin: 1.5em 1.5em 1.5em 0;
174
+ padding: 0; }
175
+
176
+ /* Use this if the image is at the top of the <p>. */
177
+ p img.top {
178
+ margin-top: 0; }
179
+
180
+ img {
181
+ margin: 0 0 1.5em; }
182
+
183
+ abbr, acronym {
184
+ border-bottom: 1px dotted #666;
185
+ cursor: help; }
186
+
187
+ address {
188
+ font-style: italic;
189
+ margin-top: 1.5em; }
190
+
191
+ del {
192
+ color: #666; }
193
+
194
+ a, a:link {
195
+ color: #1a4882;
196
+ text-decoration: underline; }
197
+
198
+ a:visited {
199
+ color: #1a4882; }
200
+
201
+ a:hover {
202
+ color: #052246; }
203
+
204
+ a:active,
205
+ a:focus {
206
+ color: #1a4882; }
207
+
208
+ blockquote {
209
+ border-left: 4px solid #d1d1d1;
210
+ color: #666;
211
+ font-style: italic;
212
+ margin: 1.5em 0;
213
+ padding-left: 1em; }
214
+
215
+ strong {
216
+ font-weight: bold; }
217
+
218
+ em,
219
+ dfn {
220
+ font-style: italic; }
221
+
222
+ dfn {
223
+ font-weight: bold; }
224
+
225
+ pre, code {
226
+ margin: 1.5em 0;
227
+ white-space: pre; }
228
+
229
+ pre, code, tt {
230
+ font: 1em 'andale mono', 'monotype.com', 'lucida console', monospace;
231
+ line-height: 1.5; }
232
+
233
+ pre.code {
234
+ background: #000;
235
+ color: #fff;
236
+ padding: 20px; }
237
+
238
+ tt {
239
+ display: block;
240
+ line-height: 1.5;
241
+ margin: 1.5em 0; }
242
+
243
+ /* Forms */
244
+ /*removes dotted outline on submit buttons when clicking in firefox */
245
+ input[type="submit"]::-moz-focus-inner {
246
+ border: none; }
247
+
248
+ form ol {
249
+ list-style: none;
250
+ margin: 0 0 1em 0; }
251
+
252
+ form ol ol {
253
+ margin-left: 0; }
254
+
255
+ form ol li {
256
+ list-style-position: outside;
257
+ margin: 0 0 1em 0; }
258
+
259
+ /*list-style-position fixes IE label margin bug*/
260
+ form ol ol li {
261
+ list-style-position: outside;
262
+ margin: 0 0 .25em 0; }
263
+
264
+ form ol li.error input {
265
+ background: #FBE3E4; }
266
+
267
+ p.inline-errors {
268
+ color: #D12F19; }
269
+
270
+ form ol li.file {
271
+ background: #e1e1e1;
272
+ border: 1px solid #c8c8c8;
273
+ padding: 10px; }
274
+
275
+ form abbr {
276
+ border-bottom: 0; }
277
+
278
+ label {
279
+ display: block; }
280
+
281
+ .required label {
282
+ font-weight: bold; }
283
+
284
+ .checkbox_field label,
285
+ .radio_field label {
286
+ font-weight: normal; }
287
+
288
+ a.cancel {
289
+ color: #7d0d0d; }
290
+
291
+ .inline-hints {
292
+ color: #666;
293
+ font-size: 0.8em;
294
+ margin-bottom: 0.25em; }
295
+
296
+ /* Fieldsets */
297
+ fieldset {
298
+ background: #f1f1f1;
299
+ border: 1px solid #e3e3e3;
300
+ margin: 0 0 1.5em 0;
301
+ padding: 1.5em 1.5em 1em 1.5em; }
302
+
303
+ fieldset fieldset,
304
+ fieldset fieldset fieldset {
305
+ border: 0;
306
+ padding: 0; }
307
+
308
+ legend {
309
+ font-weight: bold; }
310
+
311
+ fieldset.buttons {
312
+ background: inherit;
313
+ border: 0;
314
+ padding: 0; }
315
+
316
+ fieldset.buttons li {
317
+ display: inline; }
318
+
319
+ .radio fieldset {
320
+ margin: 0;
321
+ padding: 0; }
322
+
323
+ /* Text fields */
324
+ input[type="color"],
325
+ input[type="date"],
326
+ input[type="datetime"],
327
+ input[type="datetime-local"],
328
+ input[type="email"],
329
+ input[type="month"],
330
+ input[type="number"],
331
+ input[type="password"]
332
+ input[type="range"],
333
+ input[type="search"],
334
+ input[type="tel"],
335
+ input[type="text"],
336
+ input[type="time"],
337
+ input[type="url"],
338
+ input[type="week"] {
339
+ font-size: inherit;
340
+ padding: 3px 2px;
341
+ width: 300px; }
342
+
343
+ input[disabled='disabled'] {
344
+ background-color: #fcfcfc;
345
+ cursor: default; }
346
+
347
+ input[type="checkbox"] {
348
+ margin: 0 3px 0 0;
349
+ position: relative;
350
+ top: -2px;
351
+ vertical-align: middle; }
352
+
353
+ input[type="radio"] {
354
+ margin: 0 3px 0 0;
355
+ position: relative;
356
+ top: -2px;
357
+ vertical-align: middle; }
358
+
359
+ .check_boxes label {
360
+ display: inline;
361
+ padding: 0;
362
+ vertical-align: middle; }
363
+
364
+ .radio label {
365
+ padding: 0; }
366
+
367
+ /* Textareas */
368
+ textarea {
369
+ font-size: inherit;
370
+ height: 200px;
371
+ margin: 0 0.5em 0.5em 0;
372
+ padding: 5px;
373
+ width: 440px; }
374
+
375
+ /* Select fields */
376
+ fieldset .select select {
377
+ width: 200px;
378
+ font-size: 0.9em; }
379
+
380
+ optgroup {
381
+ margin: 0 0 .5em 0; }
382
+
383
+ /* Date & Time */
384
+ form ol li.date ol li,
385
+ form ol li.time ol li {
386
+ display: inline; }
387
+
388
+ form ol li.datetime ol li {
389
+ display: inline-block; }
390
+
391
+ form ol li.datetime select,
392
+ form ol li.date select,
393
+ form ol li.time select {
394
+ display: inline;
395
+ width: auto; }
396
+
397
+ form ol li.date label,
398
+ form ol li.time label {
399
+ display: none; }
400
+
401
+ /* Tables */
402
+ table {
403
+ margin-bottom: 2em;
404
+ width: 100%; }
405
+
406
+ th {
407
+ border-bottom: 2px solid #ccc;
408
+ font-weight: bold;
409
+ text-align: left; }
410
+
411
+ td {
412
+ border-bottom: 1px solid #ddd; }
413
+
414
+ caption, th, td {
415
+ padding: 4px 10px 4px 0; }
416
+
417
+ caption {
418
+ background: #f1f1f1;
419
+ margin-bottom: 1em;
420
+ padding: 10px 0; }
421
+
422
+ tr, td, th {
423
+ vertical-align: middle; }
424
+
425
+ /* Use this if you use span-x classes on th/td. */
426
+ table .last {
427
+ padding-right: 0; }
428
+
429
+ /* Lists */
430
+ ul, ol {
431
+ list-style-position: inside;
432
+ margin-bottom: 1.5em; }
433
+
434
+ ul {
435
+ list-style-type: disc; }
436
+
437
+ ol {
438
+ list-style-type: decimal; }
439
+
440
+ dl {
441
+ line-height: 1.4;
442
+ margin-bottom: 1.5em; }
443
+
444
+ dl dt {
445
+ font-weight: bold;
446
+ margin-top: 0.5em; }
447
+
448
+ dl dd {
449
+ margin-bottom: 0em; }
450
+
451
+ dd {
452
+ margin-left: 0.5em; }
453
+
454
+ li {
455
+ line-height: 1.4; }
456
+
457
+ ol ol, ol ul, ul ul, ul ol {
458
+ margin-left: 1em; }
@@ -1,70 +1,80 @@
1
- body {
2
- color: #222;
1
+ body {
2
+ color: #222;
3
3
  font-size: 13px;
4
- font-family: arial, "Helvetica Neue", "Lucida Grande", Helvetica, Arial, Verdana, sans-serif;
4
+ font-family: arial, "helvetica neue", helvetica, "lucida grande", sans-serif;
5
5
  }
6
6
 
7
- h1, h2, h3, h4, h5, h6 {
8
- color: #111;
9
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
7
+ h1, h2, h3, h4, h5, h6 {
8
+ color: #111;
9
+ font-family: "helvetica neue", Helvetica, arial, sans-serif;
10
10
  }
11
11
 
12
12
  /* Success, error & notice boxes for messages and errors. */
13
13
  div.error, div.notice, div.success,
14
14
  #flash_failure, #flash_success, #flash_notice {
15
- padding: 0.8em;
16
- margin-bottom: 1em;
17
15
  border: 1px solid #ddd;
18
16
  -moz-border-radius: 8px;
19
17
  -webkit-border-radius: 8px;
18
+ margin-bottom: 1em;
19
+ padding: 0.8em;
20
20
  }
21
+
21
22
  div.error,
22
23
  #flash_failure {
23
24
  background: #FBE3E4;
24
- color: #D12F19;
25
25
  border-color: #FBC2C4;
26
+ color: #D12F19;
26
27
  }
28
+
27
29
  div.error a,
28
- #flash_failure a { color: #D12F19; }
30
+ #flash_failure a {
31
+ color: #D12F19;
32
+ }
29
33
 
30
34
  div.notice,
31
35
  #flash_notice {
32
36
  background: #FFF6BF;
33
- color: #817134;
34
37
  border-color: #FFD324;
38
+ color: #817134;
35
39
  }
40
+
36
41
  div.notice a,
37
- #flash_notice a { color: #817134; }
42
+ #flash_notice a {
43
+ color: #817134;
44
+ }
38
45
 
39
46
  div.success,
40
47
  #flash_success {
41
48
  background: #E6EFC2;
42
- color: #529214;
43
49
  border-color: #C6D880;
50
+ color: #529214;
44
51
  }
52
+
45
53
  div.success a,
46
- #flash_success a { color: #529214; }
54
+ #flash_success a {
55
+ color: #529214;
56
+ }
47
57
 
48
58
  /* Misc classes and elements */
49
-
50
- /* Use a .box to create a padded box inside a column. */
59
+ /* Use a .box to create a padded box inside a column. */
51
60
  .box {
52
- padding: 1.5em;
53
- margin-bottom: 1.5em;
54
61
  background: #eee;
62
+ margin-bottom: 1.5em;
63
+ padding: 1.5em;
55
64
  }
56
65
 
57
66
  /* Use this to create a horizontal ruler across a column. */
58
67
  hr {
59
68
  background: #ddd;
60
- color: #ddd;
69
+ border: none;
61
70
  clear: both;
71
+ color: #ddd;
62
72
  float: none;
63
- width: 100%;
64
73
  height: 1px;
65
74
  margin: 0 0 1.4em;
66
- border: none;
75
+ width: 100%;
67
76
  }
77
+
68
78
  hr.space {
69
79
  background: #fff;
70
80
  color: #fff;
@@ -0,0 +1,191 @@
1
+ /* Forms */
2
+
3
+ /*removes dotted outline on submit buttons when clicking in firefox */
4
+ input[type="submit"]::-moz-focus-inner {
5
+ border: none;
6
+ }
7
+
8
+ form ol {
9
+ list-style: none;
10
+ margin: 0 0 1em 0;
11
+ }
12
+
13
+ form ol ol {
14
+ margin-left: 0;
15
+ }
16
+
17
+ form ol li {
18
+ list-style-position: outside;
19
+ margin: 0 0 1em 0;
20
+ }
21
+
22
+ /*list-style-position fixes IE label margin bug*/
23
+ form ol ol li {
24
+ list-style-position: outside;
25
+ margin: 0 0 .25em 0;
26
+ }
27
+
28
+ form ol li.error input {
29
+ background: #FBE3E4;
30
+ }
31
+
32
+ p.inline-errors {
33
+ color: #D12F19;
34
+ }
35
+
36
+ form ol li.file {
37
+ background: #e1e1e1;
38
+ border: 1px solid #c8c8c8;
39
+ padding: 10px;
40
+ }
41
+
42
+ form abbr {
43
+ border-bottom: 0;
44
+ }
45
+
46
+ label {
47
+ display: block;
48
+ }
49
+
50
+ .required label {
51
+ font-weight: bold;
52
+ }
53
+
54
+ .checkbox_field label,
55
+ .radio_field label {
56
+ font-weight: normal;
57
+ }
58
+
59
+ a.cancel {
60
+ color: #7d0d0d;
61
+ }
62
+
63
+ .inline-hints {
64
+ color: #666;
65
+ font-size: 0.8em;
66
+ margin-bottom: 0.25em;
67
+ }
68
+
69
+ /* Fieldsets */
70
+ fieldset {
71
+ background: #f1f1f1;
72
+ border: 1px solid #e3e3e3;
73
+ margin: 0 0 1.5em 0;
74
+ padding: 1.5em 1.5em 1em 1.5em;
75
+ }
76
+
77
+ fieldset fieldset,
78
+ fieldset fieldset fieldset {
79
+ border: 0;
80
+ padding: 0;
81
+ }
82
+
83
+ legend {
84
+ font-weight: bold;
85
+ }
86
+
87
+ fieldset.buttons {
88
+ background: inherit;
89
+ border: 0;
90
+ padding: 0;
91
+ }
92
+
93
+ fieldset.buttons li {
94
+ display: inline;
95
+ }
96
+
97
+ .radio fieldset {
98
+ margin: 0;
99
+ padding: 0;
100
+ }
101
+
102
+ /* Text fields */
103
+ input[type="color"],
104
+ input[type="date"],
105
+ input[type="datetime"],
106
+ input[type="datetime-local"],
107
+ input[type="email"],
108
+ input[type="month"],
109
+ input[type="number"],
110
+ input[type="password"]
111
+ input[type="range"],
112
+ input[type="search"],
113
+ input[type="tel"],
114
+ input[type="text"],
115
+ input[type="time"],
116
+ input[type="url"],
117
+ input[type="week"] {
118
+ font-size: inherit;
119
+ padding: 3px 2px;
120
+ width: 300px;
121
+ }
122
+
123
+ input[disabled='disabled'] {
124
+ background-color: #fcfcfc;
125
+ cursor:default;
126
+ }
127
+
128
+ input[type="checkbox"] {
129
+ margin: 0 3px 0 0;
130
+ position: relative;
131
+ top: -2px;
132
+ vertical-align: middle;
133
+ }
134
+
135
+ input[type="radio"] {
136
+ margin: 0 3px 0 0;
137
+ position: relative;
138
+ top: -2px;
139
+ vertical-align: middle;
140
+ }
141
+
142
+ .check_boxes label {
143
+ display: inline;
144
+ padding: 0;
145
+ vertical-align: middle;
146
+ }
147
+
148
+ .radio label {
149
+ padding: 0;
150
+ }
151
+
152
+ /* Textareas */
153
+ textarea {
154
+ font-size: inherit;
155
+ height: 200px;
156
+ margin: 0 0.5em 0.5em 0;
157
+ padding: 5px;
158
+ width: 440px;
159
+ }
160
+
161
+ /* Select fields */
162
+ fieldset .select select {
163
+ width: 200px;
164
+ font-size: 0.9em;
165
+ }
166
+
167
+ optgroup {
168
+ margin: 0 0 .5em 0;
169
+ }
170
+
171
+ /* Date & Time */
172
+ form ol li.date ol li,
173
+ form ol li.time ol li {
174
+ display: inline;
175
+ }
176
+
177
+ form ol li.datetime ol li {
178
+ display: inline-block;
179
+ }
180
+
181
+ form ol li.datetime select,
182
+ form ol li.date select,
183
+ form ol li.time select {
184
+ display: inline;
185
+ width: auto;
186
+ }
187
+
188
+ form ol li.date label,
189
+ form ol li.time label {
190
+ display: none;
191
+ }
@@ -1,24 +1,39 @@
1
1
  /* Lists */
2
2
 
3
3
  ul, ol {
4
- margin-bottom: 1.5em;
5
4
  list-style-position: inside;
5
+ margin-bottom: 1.5em;
6
+ }
7
+
8
+ ul {
9
+ list-style-type: disc;
10
+ }
11
+
12
+ ol {
13
+ list-style-type: decimal;
6
14
  }
7
- ul { list-style-type: disc; }
8
- ol { list-style-type: decimal; }
9
15
 
10
16
  dl {
11
- margin-bottom: 1.5em;
12
17
  line-height: 1.4;
18
+ margin-bottom: 1.5em;
13
19
  }
20
+
14
21
  dl dt {
15
22
  font-weight: bold;
16
23
  margin-top: 0.5em;
17
24
  }
18
- dl dd { margin-bottom: 0em;}
19
- dd { margin-left: 0.5em; }
20
25
 
21
- li { line-height: 1.4; }
26
+ dl dd {
27
+ margin-bottom: 0em;
28
+ }
29
+
30
+ dd {
31
+ margin-left: 0.5em;
32
+ }
33
+
34
+ li {
35
+ line-height: 1.4;
36
+ }
22
37
 
23
38
  ol ol, ol ul, ul ul, ul ol {
24
39
  margin-left: 1em;
@@ -1,10 +1,9 @@
1
1
  /* http://meyerweb.com/eric/tools/css/reset/ */
2
2
  /* v1.0 | 20080212 */
3
-
4
- html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p,
5
- blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em,
6
- font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var,
7
- b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table,
3
+ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p,
4
+ blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em,
5
+ font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var,
6
+ b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table,
8
7
  caption, tbody, tfoot, thead, tr, th, td {
9
8
  margin: 0;
10
9
  padding: 0;
@@ -14,15 +13,19 @@ caption, tbody, tfoot, thead, tr, th, td {
14
13
  vertical-align: baseline;
15
14
  background: transparent;
16
15
  }
16
+
17
17
  body {
18
18
  line-height: 1;
19
19
  }
20
+
20
21
  ol, ul {
21
22
  list-style: none;
22
23
  }
24
+
23
25
  blockquote, q {
24
26
  quotes: none;
25
27
  }
28
+
26
29
  blockquote:before, blockquote:after,
27
30
  q:before, q:after {
28
31
  content: '';
@@ -38,6 +41,7 @@ q:before, q:after {
38
41
  ins {
39
42
  text-decoration: none;
40
43
  }
44
+
41
45
  del {
42
46
  text-decoration: line-through;
43
47
  }
@@ -4,24 +4,32 @@ table {
4
4
  margin-bottom: 2em;
5
5
  width: 100%;
6
6
  }
7
+
7
8
  th {
8
9
  border-bottom: 2px solid #ccc;
9
10
  font-weight: bold;
10
11
  text-align: left;
11
12
  }
12
- td { border-bottom: 1px solid #ddd; }
13
+
14
+ td {
15
+ border-bottom: 1px solid #ddd;
16
+ }
17
+
13
18
  caption, th, td {
14
19
  padding: 4px 10px 4px 0;
15
20
  }
21
+
16
22
  caption {
17
23
  background: #f1f1f1;
18
- padding: 10px 0;
19
24
  margin-bottom: 1em;
25
+ padding: 10px 0;
20
26
  }
21
27
 
22
- tr,td,th {
28
+ tr, td, th {
23
29
  vertical-align: middle;
24
30
  }
25
31
 
26
32
  /* Use this if you use span-x classes on th/td. */
27
- table .last { padding-right: 0; }
33
+ table .last {
34
+ padding-right: 0;
35
+ }
@@ -1,90 +1,137 @@
1
1
  /* Headings */
2
-
3
- h1, h2, h3, h4, h5, h6 { font-weight: bold; }
2
+ h1, h2, h3, h4, h5, h6 {
3
+ font-weight: bold;
4
+ }
4
5
 
5
6
  h1 {
6
7
  font-size: 2.2em;
7
8
  line-height: 1;
8
9
  margin-bottom: 0.25em;
9
10
  }
11
+
10
12
  h2 {
11
13
  font-size: 1.6em;
12
- margin-bottom: 0.25em;
13
14
  line-height: 1.1;
15
+ margin-bottom: 0.25em;
14
16
  }
17
+
15
18
  h3 {
16
19
  font-size: 1.3em;
17
20
  line-height: 1;
18
21
  margin-bottom: 0.25em;
19
22
  }
23
+
20
24
  h4 {
21
25
  font-size: 1.1em;
22
26
  line-height: 1.25;
23
27
  margin-bottom: 0.25em;
24
28
  }
29
+
25
30
  h5 {
26
31
  font-size: 1em;
27
32
  margin-bottom: 0.25em;
28
33
  }
34
+
29
35
  h6 {
30
36
  font-size: 1em;
31
37
  margin-bottom: 0.25em;
32
38
  }
33
39
 
34
40
  /* Text elements */
35
- p { margin-bottom: 0.5em; }
36
- p.last { margin-bottom: 0; }
41
+ p {
42
+ margin-bottom: 0.5em;
43
+ }
44
+
45
+ p.last {
46
+ margin-bottom: 0;
47
+ }
48
+
37
49
  p img {
38
50
  float: left;
39
51
  margin: 1.5em 1.5em 1.5em 0;
40
52
  padding: 0;
41
53
  }
42
- p img.top { margin-top: 0; } /* Use this if the image is at the top of the <p>. */
43
- img { margin: 0 0 1.5em; }
54
+
55
+ /* Use this if the image is at the top of the <p>. */
56
+ p img.top {
57
+ margin-top: 0;
58
+ }
59
+
60
+ img {
61
+ margin: 0 0 1.5em;
62
+ }
44
63
 
45
64
  abbr, acronym {
46
65
  border-bottom: 1px dotted #666;
47
66
  cursor: help;
48
67
  }
68
+
49
69
  address {
50
- margin-top: 1.5em;
51
70
  font-style: italic;
71
+ margin-top: 1.5em;
72
+ }
73
+
74
+ del {
75
+ color:#666;
52
76
  }
53
- del { color:#666; }
54
77
 
55
78
  a, a:link {
56
79
  color: #1a4882;
57
80
  text-decoration: underline;
58
81
  }
59
- a:visited { color: #1a4882; }
60
- a:hover { color: #052246; }
61
- a:active, a:focus { color: #1a4882; }
82
+
83
+ a:visited {
84
+ color: #1a4882;
85
+ }
86
+
87
+ a:hover {
88
+ color: #052246;
89
+ }
90
+
91
+ a:active,
92
+ a:focus {
93
+ color: #1a4882;
94
+ }
62
95
 
63
96
  blockquote {
64
- margin: 1.5em 0;
97
+ border-left: 4px solid #d1d1d1;
65
98
  color: #666;
66
99
  font-style: italic;
100
+ margin: 1.5em 0;
67
101
  padding-left: 1em;
68
- border-left: 4px solid #d1d1d1;
69
102
  }
70
- strong { font-weight: bold; }
71
- em, dfn { font-style: italic; }
72
- dfn { font-weight: bold; }
103
+
104
+ strong {
105
+ font-weight: bold;
106
+ }
107
+
108
+ em,
109
+ dfn {
110
+ font-style: italic;
111
+ }
112
+
113
+ dfn {
114
+ font-weight: bold;
115
+ }
116
+
73
117
  pre, code {
74
118
  margin: 1.5em 0;
75
119
  white-space: pre;
76
120
  }
121
+
77
122
  pre, code, tt {
78
123
  font: 1em 'andale mono', 'monotype.com', 'lucida console', monospace;
79
124
  line-height: 1.5;
80
125
  }
126
+
81
127
  pre.code {
82
- background: #000;
128
+ background: #000;
83
129
  color: #fff;
84
130
  padding: 20px;
85
131
  }
132
+
86
133
  tt {
87
134
  display: block;
88
- margin: 1.5em 0;
89
135
  line-height: 1.5;
90
- }
136
+ margin: 1.5em 0;
137
+ }
@@ -0,0 +1,7 @@
1
+ @import 'reset';
2
+ @import 'defaults';
3
+ @import 'type';
4
+ @import 'forms';
5
+ @import 'tables';
6
+ @import 'lists';
7
+ @import 'screen';
metadata CHANGED
@@ -1,13 +1,12 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: flutie
3
3
  version: !ruby/object:Gem::Version
4
- hash: 31
4
+ hash: 13
5
5
  prerelease: false
6
6
  segments:
7
7
  - 1
8
- - 0
9
- - 4
10
- version: 1.0.4
8
+ - 1
9
+ version: "1.1"
11
10
  platform: ruby
12
11
  authors:
13
12
  - Chad Pytel
@@ -21,8 +20,21 @@ cert_chain: []
21
20
 
22
21
  date: 2010-09-05 00:00:00 -04:00
23
22
  default_executable:
24
- dependencies: []
25
-
23
+ dependencies:
24
+ - !ruby/object:Gem::Dependency
25
+ name: haml
26
+ prerelease: false
27
+ requirement: &id001 !ruby/object:Gem::Requirement
28
+ none: false
29
+ requirements:
30
+ - - ">="
31
+ - !ruby/object:Gem::Version
32
+ hash: 3
33
+ segments:
34
+ - 0
35
+ version: "0"
36
+ type: :development
37
+ version_requirements: *id001
26
38
  description: Flutie is a starting point for personal discovery
27
39
  email: support@thoughtbot.com
28
40
  executables: []
@@ -38,17 +50,20 @@ files:
38
50
  - app/views/flutie/styleguides/show.erb
39
51
  - app/views/layouts/flutie.erb
40
52
  - config/initializers/expansion.rb
53
+ - config/initializers/sass.rb
41
54
  - config/routes.rb
42
55
  - lib/flutie/engine.rb
43
56
  - lib/flutie.rb
44
57
  - lib/tasks/flutie.rake
45
- - public/stylesheets/defaults.css
46
- - public/stylesheets/forms.css
47
- - public/stylesheets/lists.css
48
- - public/stylesheets/reset.css
49
- - public/stylesheets/screen.css
50
- - public/stylesheets/tables.css
51
- - public/stylesheets/type.css
58
+ - public/stylesheets/flutie.css
59
+ - public/stylesheets/sass/_defaults.scss
60
+ - public/stylesheets/sass/_forms.scss
61
+ - public/stylesheets/sass/_lists.scss
62
+ - public/stylesheets/sass/_reset.scss
63
+ - public/stylesheets/sass/_screen.scss
64
+ - public/stylesheets/sass/_tables.scss
65
+ - public/stylesheets/sass/_type.scss
66
+ - public/stylesheets/sass/flutie.scss
52
67
  has_rdoc: true
53
68
  homepage: http://github.com/thoughtbot/flutie
54
69
  licenses: []
@@ -1,117 +0,0 @@
1
- /* Forms */
2
-
3
- input[type="submit"]::-moz-focus-inner {
4
- border: none;
5
- } /*removes dotted outline on submit buttons when clicking in firefox */
6
-
7
- form ol {
8
- list-style: none;
9
- margin: 0 0 1em 0;
10
- }
11
- form ol ol { margin-left: 0; }
12
- form ol li { margin: 0 0 1em 0; list-style-position: outside; }
13
- form ol ol li { margin: 0 0 .25em 0; list-style-position: outside; } /*list-style-position fixes IE label margin bug*/
14
-
15
- form ol li.error input { background: #FBE3E4; }
16
- p.inline-errors { color: #D12F19; }
17
- form ol li.file {
18
- background: #e1e1e1;
19
- border: 1px solid #c8c8c8;
20
- padding: 10px;
21
- }
22
-
23
- form abbr { border-bottom: 0; }
24
-
25
- label { display: block; }
26
- .required label { font-weight: bold; }
27
- .checkbox_field label, .radio_field label { font-weight: normal; }
28
-
29
- a.cancel { color: #7d0d0d; }
30
- .inline-hints {
31
- font-size: 0.8em;
32
- color: #666;
33
- margin-bottom: 0.25em;
34
- }
35
-
36
- /* Fieldsets */
37
- fieldset {
38
- margin: 0 0 1.5em 0;
39
- background: #f1f1f1;
40
- padding: 1.5em 1.5em 1em 1.5em;
41
- border: 1px solid #e3e3e3;
42
- }
43
- fieldset fieldset, fieldset fieldset fieldset {
44
- padding: 0;
45
- border: 0;
46
- }
47
- legend { font-weight: bold; }
48
- fieldset.buttons {
49
- background: inherit;
50
- border: 0;
51
- padding: 0;
52
- }
53
- fieldset.buttons li { display: inline; }
54
- .radio fieldset {
55
- padding: 0;
56
- margin: 0;
57
- }
58
-
59
- /* Text fields */
60
- input[type="text"], input[type="password"] {
61
- width: 300px;
62
- padding: 3px 2px;
63
- font-size: inherit;
64
- }
65
- input[disabled='disabled'] {
66
- background-color: #fcfcfc;
67
- cursor:default;
68
- }
69
- input[type="checkbox"] {
70
- margin: 0 3px 0 0;
71
- vertical-align: middle;
72
- position: relative;
73
- top: -2px;
74
- }
75
- input[type="radio"] {
76
- margin: 0 3px 0 0;
77
- vertical-align: middle;
78
- position: relative;
79
- top: -2px;
80
- }
81
- .check_boxes label {
82
- vertical-align: middle;
83
- padding: 0;
84
- display: inline;
85
- }
86
- .radio label { padding: 0; }
87
-
88
- /* Textareas */
89
- textarea {
90
- width: 440px;
91
- height: 200px;
92
- margin: 0 0.5em 0.5em 0;
93
- padding: 5px;
94
- font-size: inherit;
95
- }
96
-
97
- /* Select fields */
98
- fieldset .select select {
99
- width:200px;
100
- font-size: 0.9em;
101
- }
102
- optgroup { margin: 0 0 .5em 0; }
103
-
104
- /* Date & Time */
105
- form ol li.date ol li, form ol li.time ol li {
106
- display: inline;
107
- }
108
- form ol li.datetime ol li {
109
- display: inline-block;
110
- }
111
- form ol li.datetime select, form ol li.date select, form ol li.time select {
112
- display: inline;
113
- width: auto;
114
- }
115
- form ol li.date label, form ol li.time label {
116
- display: none;
117
- }