fustrate-rails 0.3.3 → 0.4.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (35) hide show
  1. checksums.yaml +4 -4
  2. data/lib/fustrate/rails/version.rb +1 -1
  3. data/vendor/assets/javascripts/fustrate/_module.coffee +14 -8
  4. data/vendor/assets/javascripts/fustrate/components/autocomplete.coffee +4 -4
  5. data/vendor/assets/javascripts/fustrate/components/file_picker.coffee +1 -0
  6. data/vendor/assets/javascripts/fustrate/components/flash.coffee +4 -4
  7. data/vendor/assets/javascripts/fustrate/components/modal.coffee +79 -19
  8. data/vendor/assets/javascripts/fustrate/components/pagination.coffee +5 -5
  9. data/vendor/assets/javascripts/fustrate/generic_form.coffee +4 -5
  10. data/vendor/assets/javascripts/fustrate/generic_page.coffee +6 -6
  11. data/vendor/assets/javascripts/fustrate/generic_table.coffee +2 -2
  12. data/vendor/assets/javascripts/fustrate/listenable.coffee +1 -1
  13. data/vendor/assets/stylesheets/_fustrate.sass +6 -6
  14. data/vendor/assets/stylesheets/awesomplete.sass +2 -1
  15. data/vendor/assets/stylesheets/fustrate/_colors.sass +3 -0
  16. data/vendor/assets/stylesheets/fustrate/_settings.sass +7 -7
  17. data/vendor/assets/stylesheets/fustrate/components/_components.sass +17 -17
  18. data/vendor/assets/stylesheets/fustrate/components/_functions.sass +9 -8
  19. data/vendor/assets/stylesheets/fustrate/components/alerts.sass +26 -18
  20. data/vendor/assets/stylesheets/fustrate/components/buttons.sass +17 -21
  21. data/vendor/assets/stylesheets/fustrate/components/disclosures.sass +5 -5
  22. data/vendor/assets/stylesheets/fustrate/components/dropdowns.sass +24 -19
  23. data/vendor/assets/stylesheets/fustrate/components/flash.sass +21 -16
  24. data/vendor/assets/stylesheets/fustrate/components/forms.sass +99 -92
  25. data/vendor/assets/stylesheets/fustrate/components/grid.sass +15 -23
  26. data/vendor/assets/stylesheets/fustrate/components/labels.sass +13 -12
  27. data/vendor/assets/stylesheets/fustrate/components/modals.sass +97 -49
  28. data/vendor/assets/stylesheets/fustrate/components/pagination.sass +41 -29
  29. data/vendor/assets/stylesheets/fustrate/components/panels.sass +30 -12
  30. data/vendor/assets/stylesheets/fustrate/components/popovers.sass +10 -6
  31. data/vendor/assets/stylesheets/fustrate/components/tables.sass +13 -9
  32. data/vendor/assets/stylesheets/fustrate/components/tabs.sass +6 -6
  33. data/vendor/assets/stylesheets/fustrate/components/tooltips.sass +12 -12
  34. data/vendor/assets/stylesheets/fustrate/components/typography.sass +140 -104
  35. metadata +5 -5
@@ -1,10 +1,10 @@
1
- @import "buttons"
2
- @import "panels"
1
+ @import 'buttons'
2
+ @import 'panels'
3
3
 
4
- $tabs-padding: rem-calc(10)
5
- $tabs-font-size: rem-calc(12)
6
- $tabs-content-padding: 0 rem-calc(10)
7
- $tabs-active-color: $primary-color
4
+ $tabs-padding: rem-calc(10) !default
5
+ $tabs-font-size: rem-calc(12) !default
6
+ $tabs-content-padding: 0 rem-calc(10) !default
7
+ $tabs-active-color: $primary-color !default
8
8
 
9
9
  =fustrate-tabs
10
10
  ul.tabs
@@ -1,6 +1,6 @@
1
- $tooltip-bg-color: #222
2
- $tooltip-color: #eee
3
- $tooltip-opacity: .9
1
+ $tooltip-bg-color: #222 !default
2
+ $tooltip-color: #eee !default
3
+ $tooltip-opacity: .9 !default
4
4
 
5
5
  =fustrate-tooltips
6
6
  [data-tooltip]
@@ -10,19 +10,19 @@ $tooltip-opacity: .9
10
10
  background: $tooltip-bg-color
11
11
  color: $tooltip-color
12
12
  font-size: .8rem
13
- padding: 5px 7px
14
- opacity: $tooltip-opacity
15
- position: absolute
16
13
  line-height: 1.2
17
14
  max-width: 200px
15
+ opacity: $tooltip-opacity
16
+ padding: 5px 7px
17
+ position: absolute
18
18
 
19
- &:before
20
- display: block
21
- width: 0px
22
- height: 0px
19
+ &::before
23
20
  border: 4px solid transparent
24
21
  border-bottom-color: $tooltip-bg-color
22
+ bottom: 100%
25
23
  content: ' '
26
- position: absolute
24
+ display: block
25
+ height: 0
27
26
  left: 8px
28
- bottom: 100%
27
+ position: absolute
28
+ width: 0
@@ -1,88 +1,93 @@
1
- $font-color: #222
1
+ $body-bg-color: #fafafa !default
2
+ $font-color: #222 !default
2
3
 
3
- $h1-font-size: rem-calc(34)
4
- $h2-font-size: rem-calc(30)
5
- $h3-font-size: rem-calc(26)
6
- $h4-font-size: rem-calc(22)
7
- $h5-font-size: rem-calc(18)
8
- $h6-font-size: 1rem
4
+ $h1-font-size: rem-calc(34) !default
5
+ $h2-font-size: rem-calc(30) !default
6
+ $h3-font-size: rem-calc(26) !default
7
+ $h4-font-size: rem-calc(22) !default
8
+ $h5-font-size: rem-calc(18) !default
9
+ $h6-font-size: 1rem !default
9
10
 
10
- $h1-font-reduction: rem-calc(10)
11
- $h2-font-reduction: rem-calc(10)
12
- $h3-font-reduction: rem-calc(5)
13
- $h4-font-reduction: rem-calc(5)
11
+ $h1-font-reduction: rem-calc(10) !default
12
+ $h2-font-reduction: rem-calc(10) !default
13
+ $h3-font-reduction: rem-calc(5) !default
14
+ $h4-font-reduction: rem-calc(5) !default
15
+
16
+ $print-color: #000 !default
17
+ $print-border-color: #999 !default
14
18
 
15
19
  =fustrate-typography
16
20
  html,
17
21
  body
18
- height: 100%
19
22
  font-size: 1em
23
+ height: 100%
20
24
 
21
- *,
22
- *:before,
23
- *:after
24
- box-sizing: border-box
25
+ *
26
+ &,
27
+ &::before,
28
+ &::after
29
+ box-sizing: border-box
25
30
 
26
31
  body
27
- background: #fafafa
32
+ background: $body-bg-color
28
33
  color: $font-color
29
- padding: 0
30
- margin: 0
31
- font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif
32
- font-weight: normal
34
+ cursor: default
35
+ font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif
33
36
  font-style: normal
37
+ font-weight: normal
34
38
  line-height: $base-line-height
39
+ margin: 0
40
+ padding: 0
35
41
  position: relative
36
- cursor: default
37
-
38
- a:hover
39
- cursor: pointer
40
42
 
41
43
  img
42
- max-width: 100%
43
- height: auto
44
+ -ms-interpolation-mode: bicubic
44
45
  display: inline-block
46
+ height: auto
47
+ max-width: 100%
45
48
  vertical-align: middle
46
- -ms-interpolation-mode: bicubic
47
49
 
50
+ blockquote,
51
+ dd,
48
52
  div,
49
53
  dl,
50
54
  dt,
51
- dd,
52
- ul,
53
- ol,
54
- li,
55
+ form,
55
56
  h1,
56
57
  h2,
57
58
  h3,
58
59
  h4,
59
60
  h5,
60
61
  h6,
61
- pre,
62
- form,
62
+ li,
63
+ ol,
63
64
  p,
64
- blockquote,
65
+ pre,
66
+ td,
65
67
  th,
66
- td
68
+ ul
67
69
  margin: 0
68
70
  padding: 0
69
71
 
70
72
  a
71
73
  color: $primary-color
72
- text-decoration: none
73
74
  line-height: inherit
75
+ text-decoration: none
74
76
 
75
77
  &:hover,
76
78
  &:active
77
79
  color: scale-color($primary-color, $lightness: -14%)
78
80
 
81
+ &:hover
82
+ cursor: pointer
83
+
79
84
  img
80
- border: none
85
+ border: 0
81
86
 
82
87
  p
83
88
  font-family: inherit
84
- font-weight: normal
85
89
  font-size: 1rem
90
+ font-weight: normal
86
91
  line-height: 1.6
87
92
  margin-bottom: rem-calc(20)
88
93
  text-rendering: optimizeLegibility
@@ -91,48 +96,58 @@ $h4-font-reduction: rem-calc(5)
91
96
  font-size: 1rem + rem-calc(3.5)
92
97
  line-height: 1.6
93
98
 
94
- h1, h2, h3, h4, h5, h6
99
+ h1,
100
+ h2,
101
+ h3,
102
+ h4,
103
+ h5,
104
+ h6
105
+ color: $font-color
95
106
  font-family: inherit
96
- font-weight: normal
97
107
  font-style: normal
98
- color: #222
99
- text-rendering: optimizeLegibility
100
- margin-top: .2rem
101
- margin-bottom: .5rem
108
+ font-weight: normal
102
109
  line-height: 1.4
110
+ margin-bottom: .5rem
111
+ margin-top: .2rem
103
112
  padding: 0 rem-calc(20)
113
+ text-rendering: optimizeLegibility
104
114
 
105
115
  small
116
+ color: scale-color($font-color, $lightness: 35%)
106
117
  font-size: 60%
107
- color: scale-color(#222, $lightness: 35%)
108
118
  line-height: 0
109
119
 
110
120
  h1
111
121
  font-size: $h1-font-size - $h1-font-reduction
122
+
112
123
  h2
113
124
  font-size: $h2-font-size - $h2-font-reduction
125
+
114
126
  h3
115
127
  font-size: $h3-font-size - $h3-font-reduction
128
+
116
129
  h4
117
130
  font-size: $h4-font-size - $h4-font-reduction
131
+
118
132
  h5
119
133
  font-size: $h5-font-size
134
+
120
135
  h6
121
136
  font-size: $h6-font-size
122
137
 
123
138
  .subheader
124
- line-height: 1.4
125
- color: scale-color(#222, $lightness: 35%)
139
+ color: scale-color($font-color, $lightness: 35%)
126
140
  font-weight: normal
127
- margin-top: .2rem
141
+ line-height: 1.4
128
142
  margin-bottom: .5rem
143
+ margin-top: .2rem
129
144
 
130
145
  hr
131
- border: solid #ccc
146
+ border: solid scale-color($font-color, $lightness: 75%)
132
147
  border-width: 1px 0 0
133
148
  clear: both
134
- margin: rem-calc(20) 0 (rem-calc(20) - rem-calc(1px))
135
149
  height: 0
150
+ margin: rem-calc(20) 0 (rem-calc(20) - rem-calc(1px))
136
151
 
137
152
  em,
138
153
  i
@@ -151,61 +166,64 @@ $h4-font-reduction: rem-calc(5)
151
166
  ul,
152
167
  ol,
153
168
  dl
169
+ font-family: inherit
154
170
  font-size: 1rem
155
171
  line-height: 1.6
156
- margin-bottom: rem-calc(20)
157
172
  list-style-position: outside
158
- font-family: inherit
173
+ margin-bottom: rem-calc(20)
159
174
 
160
175
  ul
161
176
  list-style-type: none
162
177
  margin-left: 0
163
178
  padding-left: 0
179
+
164
180
  &.no-bullet
181
+ list-style: none
165
182
  margin-left: 0
166
- li
167
- ul,
168
- ol
169
- margin-left: rem-calc(20)
170
- margin-bottom: 0
171
- list-style: none
172
183
 
173
- ul
174
- li
175
184
  ul,
176
185
  ol
177
- margin-left: rem-calc(20)
186
+ list-style: none
178
187
  margin-bottom: 0
188
+ margin-left: rem-calc(20)
189
+
190
+ ul,
191
+ ol
192
+ margin-bottom: 0
193
+ margin-left: rem-calc(20)
179
194
 
180
195
  &.square,
181
196
  &.circle,
182
197
  &.disc
183
198
  margin-left: 1.1rem
184
- li ul
199
+
200
+ ul
185
201
  list-style: inherit
186
202
 
187
203
  &.square
188
204
  list-style-type: square
205
+
189
206
  &.circle
190
207
  list-style-type: circle
208
+
191
209
  &.disc
192
210
  list-style-type: disc
193
- &.no-bullet
194
- list-style: none
195
211
 
196
212
  ol
197
213
  margin-left: 1.4rem
214
+
198
215
  li
199
216
  ul,
200
217
  ol
201
- margin-left: rem-calc(20)
202
218
  margin-bottom: 0
219
+ margin-left: rem-calc(20)
203
220
 
204
221
  dl
205
222
  dt
206
- padding-left: 0
207
- margin-bottom: .3rem
208
223
  font-weight: bold
224
+ margin-bottom: .3rem
225
+ padding-left: 0
226
+
209
227
  dd
210
228
  margin-bottom: rem-calc(12)
211
229
  padding-left: 10px
@@ -215,61 +233,48 @@ $h4-font-reduction: rem-calc(5)
215
233
 
216
234
  address
217
235
  font-style: normal
218
- white-space: pre
236
+ white-space: pre-line
219
237
 
220
238
  abbr,
221
239
  acronym
222
- text-transform: uppercase
223
- font-size: 90%
240
+ border-bottom: 1px dotted scale-color($text-color, $lightness: 85%)
224
241
  color: $font-color
225
- border-bottom: 1px dotted #ddd
226
242
  cursor: help
243
+ font-size: 90%
244
+ text-transform: uppercase
227
245
 
228
246
  abbr
229
247
  text-transform: none
230
248
 
231
249
  blockquote
250
+ border-left: 1px solid scale-color($text-color, $lightness: 85%)
232
251
  margin: 0 0 rem-calc(20)
233
252
  padding: rem-calc(9 20 9 19)
234
- border-left: 1px solid #ddd
235
253
 
236
254
  // Respect the padding, fool.
237
255
  & > :first-child
238
256
  margin-top: 0
257
+
239
258
  & > :last-child
240
259
  margin-bottom: 0
241
260
 
242
- blockquote,
243
- blockquote p
244
- line-height: 1.6
245
- color: scale-color(#222, $lightness: 35%)
261
+ &,
262
+ & p
263
+ color: scale-color($text-color, $lightness: 35%)
264
+ line-height: 1.6
246
265
 
247
266
  iframe
248
267
  margin-bottom: rem-calc(20)
249
268
 
250
- @media #{$medium-up}
251
- h1,h2,h3,h4,h5,h6
252
- line-height: 1.4
253
-
254
- h1
255
- font-size: $h1-font-size
256
- h2
257
- font-size: $h2-font-size
258
- h3
259
- font-size: $h3-font-size
260
- h4
261
- font-size: $h4-font-size
262
- h5
263
- font-size: $h5-font-size
264
- h6
265
- font-size: $h6-font-size
266
-
267
269
  .text-left
268
270
  text-align: left !important
271
+
269
272
  .text-right
270
273
  text-align: right !important
274
+
271
275
  .text-center
272
276
  text-align: center !important
277
+
273
278
  .text-justify
274
279
  text-align: justify !important
275
280
 
@@ -282,16 +287,19 @@ $h4-font-reduction: rem-calc(5)
282
287
 
283
288
  .left
284
289
  float: left !important
290
+
285
291
  .right
286
292
  float: right !important
293
+
287
294
  .clearfix
288
295
  +clearfix
296
+
289
297
  .hide
290
298
  display: none !important
291
299
 
292
300
  .antialiased
293
- -webkit-font-smoothing: antialiased
294
301
  -moz-osx-font-smoothing: grayscale
302
+ -webkit-font-smoothing: antialiased
295
303
 
296
304
  .print-only
297
305
  display: none !important
@@ -301,9 +309,9 @@ $h4-font-reduction: rem-calc(5)
301
309
  vertical-align: middle
302
310
 
303
311
  .help
304
- opacity: .7
305
- font-size: 0.8rem
312
+ font-size: .8rem
306
313
  margin: 0
314
+ opacity: .7
307
315
 
308
316
  .dim
309
317
  opacity: .6
@@ -314,16 +322,43 @@ $h4-font-reduction: rem-calc(5)
314
322
  .nowrap
315
323
  white-space: nowrap
316
324
 
325
+ @media #{$medium-up}
326
+ h1,
327
+ h2,
328
+ h3,
329
+ h4,
330
+ h5,
331
+ h6
332
+ line-height: 1.4
333
+
334
+ h1
335
+ font-size: $h1-font-size
336
+
337
+ h2
338
+ font-size: $h2-font-size
339
+
340
+ h3
341
+ font-size: $h3-font-size
342
+
343
+ h4
344
+ font-size: $h4-font-size
345
+
346
+ h5
347
+ font-size: $h5-font-size
348
+
349
+ h6
350
+ font-size: $h6-font-size
351
+
317
352
  @media print
318
353
  *
319
354
  background: transparent !important
320
- color: #000 !important
321
355
  box-shadow: none !important
356
+ color: $print-color !important
322
357
  text-shadow: none !important
323
358
 
324
- pre,
325
- blockquote
326
- border: 1px solid #999
359
+ blockquote,
360
+ pre
361
+ border: 1px solid $print-border-color
327
362
  page-break-inside: avoid
328
363
 
329
364
  thead
@@ -336,9 +371,6 @@ $h4-font-reduction: rem-calc(5)
336
371
  img
337
372
  max-width: 100% !important
338
373
 
339
- @page
340
- margin: 0.5cm
341
-
342
374
  p,
343
375
  h2,
344
376
  h3
@@ -351,5 +383,9 @@ $h4-font-reduction: rem-calc(5)
351
383
 
352
384
  .print-only
353
385
  display: inherit !important
386
+
354
387
  .no-print
355
388
  display: none !important
389
+
390
+ @page
391
+ margin: .5cm