catscope 0.1.0 → 0.1.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (87) hide show
  1. checksums.yaml +4 -4
  2. data/assets/bower.json +1 -0
  3. data/assets/bower_components/foundation/LICENSE +22 -0
  4. data/assets/bower_components/foundation/README.md +46 -0
  5. data/assets/bower_components/foundation/bower.json +2 -4
  6. data/assets/bower_components/foundation/css/foundation.css +1695 -1230
  7. data/assets/bower_components/foundation/css/foundation.css.map +1 -1
  8. data/assets/bower_components/foundation/css/foundation.min.css +1 -0
  9. data/assets/bower_components/foundation/css/normalize.css +9 -12
  10. data/assets/bower_components/foundation/css/normalize.css.map +1 -1
  11. data/assets/bower_components/foundation/css/normalize.min.css +1 -0
  12. data/assets/bower_components/foundation/js/foundation/foundation.abide.js +171 -75
  13. data/assets/bower_components/foundation/js/foundation/foundation.accordion.js +70 -12
  14. data/assets/bower_components/foundation/js/foundation/foundation.alert.js +5 -5
  15. data/assets/bower_components/foundation/js/foundation/foundation.clearing.js +84 -40
  16. data/assets/bower_components/foundation/js/foundation/foundation.dropdown.js +104 -79
  17. data/assets/bower_components/foundation/js/foundation/foundation.equalizer.js +57 -26
  18. data/assets/bower_components/foundation/js/foundation/foundation.interchange.js +50 -38
  19. data/assets/bower_components/foundation/js/foundation/foundation.joyride.js +121 -110
  20. data/assets/bower_components/foundation/js/foundation/foundation.js +121 -79
  21. data/assets/bower_components/foundation/js/foundation/foundation.magellan.js +75 -59
  22. data/assets/bower_components/foundation/js/foundation/foundation.offcanvas.js +95 -22
  23. data/assets/bower_components/foundation/js/foundation/foundation.orbit.js +127 -123
  24. data/assets/bower_components/foundation/js/foundation/foundation.reveal.js +147 -69
  25. data/assets/bower_components/foundation/js/foundation/foundation.slider.js +101 -72
  26. data/assets/bower_components/foundation/js/foundation/foundation.tab.js +52 -39
  27. data/assets/bower_components/foundation/js/foundation/foundation.tooltip.js +97 -49
  28. data/assets/bower_components/foundation/js/foundation/foundation.topbar.js +70 -57
  29. data/assets/bower_components/foundation/js/foundation.js +1544 -951
  30. data/assets/bower_components/foundation/js/foundation.min.js +5 -4
  31. data/assets/bower_components/foundation/js/vendor/fastclick.js +8 -9
  32. data/assets/bower_components/foundation/js/vendor/jquery.js +6 -6
  33. data/assets/bower_components/foundation/js/vendor/modernizr.js +1 -1
  34. data/assets/bower_components/foundation/package.json +57 -0
  35. data/assets/bower_components/foundation/scss/foundation/_functions.scss +53 -43
  36. data/assets/bower_components/foundation/scss/foundation/_settings.scss +59 -37
  37. data/assets/bower_components/foundation/scss/foundation/components/_accordion.scss +12 -8
  38. data/assets/bower_components/foundation/scss/foundation/components/_alert-boxes.scss +12 -12
  39. data/assets/bower_components/foundation/scss/foundation/components/_block-grid.scss +14 -13
  40. data/assets/bower_components/foundation/scss/foundation/components/_breadcrumbs.scss +19 -19
  41. data/assets/bower_components/foundation/scss/foundation/components/_button-groups.scss +33 -25
  42. data/assets/bower_components/foundation/scss/foundation/components/_buttons.scss +30 -28
  43. data/assets/bower_components/foundation/scss/foundation/components/_clearing.scss +51 -47
  44. data/assets/bower_components/foundation/scss/foundation/components/_dropdown-buttons.scss +10 -11
  45. data/assets/bower_components/foundation/scss/foundation/components/_dropdown.scss +45 -38
  46. data/assets/bower_components/foundation/scss/foundation/components/_flex-video.scss +7 -7
  47. data/assets/bower_components/foundation/scss/foundation/components/_forms.scss +99 -62
  48. data/assets/bower_components/foundation/scss/foundation/components/_global.scss +152 -67
  49. data/assets/bower_components/foundation/scss/foundation/components/_grid.scss +39 -36
  50. data/assets/bower_components/foundation/scss/foundation/components/_icon-bar.scss +337 -235
  51. data/assets/bower_components/foundation/scss/foundation/components/_inline-lists.scss +9 -8
  52. data/assets/bower_components/foundation/scss/foundation/components/_joyride.scss +40 -42
  53. data/assets/bower_components/foundation/scss/foundation/components/_keystrokes.scss +2 -3
  54. data/assets/bower_components/foundation/scss/foundation/components/_labels.scss +6 -6
  55. data/assets/bower_components/foundation/scss/foundation/components/_magellan.scss +2 -2
  56. data/assets/bower_components/foundation/scss/foundation/components/_offcanvas.scss +259 -168
  57. data/assets/bower_components/foundation/scss/foundation/components/_orbit.scss +82 -62
  58. data/assets/bower_components/foundation/scss/foundation/components/_pagination.scss +16 -15
  59. data/assets/bower_components/foundation/scss/foundation/components/_panels.scss +21 -15
  60. data/assets/bower_components/foundation/scss/foundation/components/_pricing-tables.scss +16 -16
  61. data/assets/bower_components/foundation/scss/foundation/components/_progress-bars.scss +10 -4
  62. data/assets/bower_components/foundation/scss/foundation/components/_range-slider.scss +28 -20
  63. data/assets/bower_components/foundation/scss/foundation/components/_reveal.scss +38 -28
  64. data/assets/bower_components/foundation/scss/foundation/components/_side-nav.scss +15 -11
  65. data/assets/bower_components/foundation/scss/foundation/components/_split-buttons.scss +22 -18
  66. data/assets/bower_components/foundation/scss/foundation/components/_sub-nav.scss +14 -12
  67. data/assets/bower_components/foundation/scss/foundation/components/_switches.scss +22 -19
  68. data/assets/bower_components/foundation/scss/foundation/components/_tables.scss +8 -8
  69. data/assets/bower_components/foundation/scss/foundation/components/_tabs.scss +50 -31
  70. data/assets/bower_components/foundation/scss/foundation/components/_thumbs.scss +8 -8
  71. data/assets/bower_components/foundation/scss/foundation/components/_tooltips.scss +25 -25
  72. data/assets/bower_components/foundation/scss/foundation/components/_top-bar.scss +176 -122
  73. data/assets/bower_components/foundation/scss/foundation/components/_type.scss +38 -38
  74. data/assets/bower_components/foundation/scss/foundation/components/_visibility.scss +33 -16
  75. data/assets/bower_components/foundation/scss/foundation.scss +37 -40
  76. data/assets/bower_components/foundation/scss/normalize.scss +8 -11
  77. data/assets/bower_components/jquery/bower.json +2 -1
  78. data/assets/bower_components/jquery/dist/jquery.js +9 -4
  79. data/assets/bower_components/jquery/dist/jquery.min.js +4 -4
  80. data/assets/bower_components/jquery/dist/jquery.min.map +1 -1
  81. data/assets/bower_components/jquery/src/core.js +6 -1
  82. data/assets/scss/_settings.scss +2 -0
  83. data/assets/stylesheets/app.css +3066 -2429
  84. data/lib/catscope/version.rb +1 -1
  85. data/lib/catscope/views/layout.erb +6 -2
  86. metadata +8 -4
  87. data/assets/bower_components/foundation/scss/foundation/components/_toolbar.scss +0 -70
@@ -2,7 +2,7 @@
2
2
  // foundation.zurb.com
3
3
  // Licensed under MIT Open Source
4
4
 
5
- @import "global";
5
+ @import 'global';
6
6
 
7
7
 
8
8
  // @name
@@ -27,7 +27,7 @@ $icon-bar-active-color: $primary-color !default;
27
27
  $icon-bar-item-padding: 1.25rem !default;
28
28
 
29
29
  // We use this to set default opacity and cursor for disabled icons.
30
- $icon-bar-disabled-opacity: 0.7 !default;
30
+ $icon-bar-disabled-opacity: .7 !default;
31
31
  $icon-bar-disabled-cursor: $cursor-disabled-value !default;
32
32
 
33
33
 
@@ -38,123 +38,123 @@ $icon-bar-disabled-cursor: $cursor-disabled-value !default;
38
38
  // We use this mixin to create the base styles for our Icon bar element.
39
39
  //
40
40
  @mixin icon-bar-base() {
41
+ display: inline-block;
42
+ font-size: 0;
43
+ width: 100%;
44
+
45
+ > * {
46
+ display: block;
47
+ float: left;
48
+ font-size: $icon-bar-font-size;
49
+ margin: 0 auto;
50
+ padding: $icon-bar-item-padding;
51
+ text-align: center;
52
+ width: 25%;
53
+
54
+ i, img {
55
+ display: block;
56
+ margin: 0 auto;
57
+
58
+ & + label {
59
+ margin-top: .0625rem;
60
+ }
61
+ }
62
+
63
+ i {
64
+ font-size: $icon-bar-icon-size;
65
+ vertical-align: middle;
66
+ }
67
+
68
+ img {
69
+ height: $icon-bar-image-height;
70
+ width: $icon-bar-image-width;
71
+ }
72
+ }
73
+
74
+ &.label-right > * {
75
+
76
+ i, img {
77
+ display: inline-block;
78
+ margin: 0 .0625rem 0 0;
79
+
80
+ & + label {
81
+ margin-top: 0;
82
+ }
83
+ }
84
+
85
+ label { display: inline-block; }
86
+ }
87
+
88
+ &.vertical.label-right > * {
89
+ text-align: left;
90
+ }
91
+
92
+ &.vertical, &.small-vertical{
93
+ height: 100%;
94
+ width: auto;
95
+
96
+ .item {
97
+ float: none;
98
+ margin: auto;
99
+ width: auto;
100
+ }
101
+ }
41
102
 
42
- width: 100%;
43
- font-size: 0;
44
- display: inline-block;
45
-
46
- & > * {
47
- text-align: center;
48
- font-size: $icon-bar-font-size;
49
- width: 25%;
50
- margin: 0 auto;
51
- display: block;
52
- padding: $icon-bar-item-padding;
53
- float: left;
54
-
55
- i, img {
56
- display: block;
57
- margin: 0 auto;
58
-
59
- & + label {
60
- margin-top: .0625rem;
61
- }
62
- }
63
-
64
- i {
65
- font-size: $icon-bar-icon-size;
66
- vertical-align: middle;
67
- }
68
-
69
- img {
70
- width: $icon-bar-image-width;
71
- height: $icon-bar-image-height;
72
- }
73
- }
74
-
75
- &.label-right > * {
76
-
77
- i, img {
78
- margin: 0 .0625rem 0 0;
79
- display: inline-block;
80
-
81
- & + label {
82
- margin-top: 0;
83
- }
84
- }
85
-
86
- label { display: inline-block; }
87
- }
88
-
89
- &.vertical.label-right > * {
90
- text-align: left;
91
- }
92
-
93
- &.vertical, &.small-vertical{
94
- height: 100%;
95
- width: auto;
96
-
97
- .item {
98
- width: auto;
99
- margin: auto;
100
- float: none;
101
- }
102
- }
103
-
104
- &.medium-vertical {
105
- @media #{$medium-up} {
106
- height: 100%;
107
- width: auto;
108
-
109
- .item {
110
- width: auto;
111
- margin: auto;
112
- float: none;
113
- }
114
- }
115
- }
116
- &.large-vertical {
117
- @media #{$large-up} {
118
- height: 100%;
119
- width: auto;
120
-
121
- .item {
122
- width: auto;
123
- margin: auto;
124
- float: none;
125
- }
126
- }
127
- }
103
+ &.medium-vertical {
104
+ @media #{$medium-up} {
105
+ height: 100%;
106
+ width: auto;
107
+
108
+ .item {
109
+ float: none;
110
+ margin: auto;
111
+ width: auto;
112
+ }
113
+ }
114
+ }
115
+ &.large-vertical {
116
+ @media #{$large-up} {
117
+ height: 100%;
118
+ width: auto;
119
+
120
+ .item {
121
+ float: none;
122
+ margin: auto;
123
+ width: auto;
124
+ }
125
+ }
126
+ }
128
127
  }
129
128
 
130
129
  // We use this mixin to create the size styles for icon bars.
131
130
  @mixin icon-bar-size(
132
- $padding: $icon-bar-item-padding,
133
- $font-size: $icon-bar-font-size,
134
- $icon-size: $icon-bar-icon-size,
135
- $image-width: $icon-bar-image-width,
136
- $image-height: $icon-bar-image-height) {
131
+ $padding: $icon-bar-item-padding,
132
+ $font-size: $icon-bar-font-size,
133
+ $icon-size: $icon-bar-icon-size,
134
+ $image-width: $icon-bar-image-width,
135
+ $image-height: $icon-bar-image-height) {
137
136
 
138
- & > * {
139
- font-size: $font-size;
140
- padding: $padding;
137
+ > * {
138
+ font-size: $font-size;
139
+ padding: $padding;
141
140
 
142
- i, img {
141
+ i, img {
143
142
 
144
- & + label {
145
- margin-top: .0625rem;
146
- }
147
- }
143
+ & + label {
144
+ margin-top: .0625rem;
145
+ font-size: $font-size;
146
+ }
147
+ }
148
148
 
149
- i {
150
- font-size: $icon-size;
151
- }
149
+ i {
150
+ font-size: $icon-size;
151
+ }
152
152
 
153
- img {
154
- width: $image-width;
155
- height: $image-height;
156
- }
157
- }
153
+ img {
154
+ height: $image-height;
155
+ width: $image-width;
156
+ }
157
+ }
158
158
 
159
159
  }
160
160
 
@@ -169,38 +169,39 @@ $icon-bar-disabled-cursor: $cursor-disabled-value !default;
169
169
  $base-style:true,
170
170
  $disabled:false) {
171
171
 
172
- @if $base-style {
172
+ @if $base-style {
173
173
 
174
- background: $bar-bg;
174
+ background: $bar-bg;
175
175
 
176
- & > * {
177
- label { color: $bar-font-color; }
176
+ > * {
177
+ label { color: $bar-font-color; }
178
178
 
179
- i { color: $bar-icon-color; }
180
- }
179
+ i { color: $bar-icon-color; }
180
+ }
181
181
 
182
- & > a:hover {
182
+ > a:hover {
183
183
 
184
- background: $bar-hover-color;
184
+ background: $bar-hover-color;
185
185
 
186
- label { color: $bar-font-color-hover; }
186
+ label { color: $bar-font-color-hover; }
187
187
 
188
- i { color: $bar-icon-color-hover; }
189
- }
188
+ i { color: $bar-icon-color-hover; }
189
+ }
190
190
 
191
- & > a.active {
191
+ > a.active {
192
192
 
193
- background: $bar-active-color;
193
+ background: $bar-active-color;
194
194
 
195
- label { color: $bar-font-color-hover; }
195
+ label { color: $bar-font-color-hover; }
196
196
 
197
- i { color: $bar-icon-color-hover; }
198
- }
199
- }
197
+ i { color: $bar-icon-color-hover; }
198
+ }
199
+ }
200
200
  @if $disabled {
201
201
  .item.disabled {
202
- opacity: $icon-bar-disabled-opacity;
203
202
  cursor: $icon-bar-disabled-cursor;
203
+ opacity: $icon-bar-disabled-opacity;
204
+ pointer-events: none;
204
205
  >* {
205
206
  opacity: $icon-bar-disabled-opacity;
206
207
  cursor: $icon-bar-disabled-cursor;
@@ -229,15 +230,116 @@ $icon-bar-disabled-cursor: $cursor-disabled-value !default;
229
230
  $bar-icon-color-hover:$icon-bar-icon-color-hover,
230
231
  $bar-active-color:$icon-bar-active-color,
231
232
  $padding: $icon-bar-item-padding,
232
- $font-size: $icon-bar-font-size,
233
- $icon-size: $icon-bar-icon-size,
234
- $image-width: $icon-bar-image-width,
235
- $image-height: $icon-bar-image-height,
233
+ $font-size: $icon-bar-font-size,
234
+ $icon-size: $icon-bar-icon-size,
235
+ $image-width: $icon-bar-image-width,
236
+ $image-height: $icon-bar-image-height,
236
237
  $base-style:true,
237
- $disabled:false) {
238
+ $disabled:true) {
238
239
  @include icon-bar-base();
239
240
  @include icon-bar-size($padding, $font-size, $icon-size, $image-width, $image-height);
240
241
  @include icon-bar-style($bar-bg, $bar-font-color, $bar-font-color-hover, $bar-hover-color, $bar-icon-color, $bar-icon-color-hover, $bar-active-color, $base-style, $disabled);
242
+
243
+ // Counts
244
+
245
+ &.two-up {
246
+ .item { width: 50%; }
247
+ &.vertical .item, &.small-vertical .item { width: auto; }
248
+ &.medium-vertical .item {
249
+ @media #{$medium-up} {
250
+ width: auto;
251
+ }
252
+ }
253
+ &.large-vertical .item {
254
+ @media #{$large-up} {
255
+ width: auto;
256
+ }
257
+ }
258
+ }
259
+ &.three-up {
260
+ .item { width: 33.3333%; }
261
+ &.vertical .item, &.small-vertical .item { width: auto; }
262
+ &.medium-vertical .item {
263
+ @media #{$medium-up} {
264
+ width: auto;
265
+ }
266
+ }
267
+ &.large-vertical .item {
268
+ @media #{$large-up} {
269
+ width: auto;
270
+ }
271
+ }
272
+ }
273
+ &.four-up {
274
+ .item { width: 25%; }
275
+ &.vertical .item, &.small-vertical .item { width: auto; }
276
+ &.medium-vertical .item {
277
+ @media #{$medium-up} {
278
+ width: auto;
279
+ }
280
+ }
281
+ &.large-vertical .item {
282
+ @media #{$large-up} {
283
+ width: auto;
284
+ }
285
+ }
286
+ }
287
+ &.five-up {
288
+ .item { width: 20%; }
289
+ &.vertical .item, &.small-vertical .item { width: auto; }
290
+ &.medium-vertical .item {
291
+ @media #{$medium-up} {
292
+ width: auto;
293
+ }
294
+ }
295
+ &.large-vertical .item {
296
+ @media #{$large-up} {
297
+ width: auto;
298
+ }
299
+ }
300
+ }
301
+ &.six-up {
302
+ .item { width: 16.66667%; }
303
+ &.vertical .item, &.small-vertical .item { width: auto; }
304
+ &.medium-vertical .item {
305
+ @media #{$medium-up} {
306
+ width: auto;
307
+ }
308
+ }
309
+ &.large-vertical .item {
310
+ @media #{$large-up} {
311
+ width: auto;
312
+ }
313
+ }
314
+ }
315
+ &.seven-up {
316
+ .item { width: 14.28571%; }
317
+ &.vertical .item, &.small-vertical .item { width: auto; }
318
+ &.medium-vertical .item {
319
+ @media #{$medium-up} {
320
+ width: auto;
321
+ }
322
+ }
323
+ &.large-vertical .item {
324
+ @media #{$large-up} {
325
+ width: auto;
326
+ }
327
+ }
328
+ }
329
+ &.eight-up {
330
+ .item { width: 12.5%; }
331
+ &.vertical .item, &.small-vertical .item { width: auto; }
332
+ &.medium-vertical .item {
333
+ @media #{$medium-up} {
334
+ width: auto;
335
+ }
336
+ }
337
+ &.large-vertical .item {
338
+ @media #{$large-up} {
339
+ width: auto;
340
+ }
341
+ }
342
+ }
241
343
  }
242
344
 
243
345
  @include exports("icon-bar") {
@@ -250,109 +352,109 @@ $icon-bar-disabled-cursor: $cursor-disabled-value !default;
250
352
 
251
353
  @if $include-html-icon-bar-classes {
252
354
 
253
- // toolbar styles
254
-
255
- .icon-bar {
256
-
257
- // Counts
258
-
259
- &.two-up {
260
- .item { width: 50%; }
261
- &.vertical .item, &.small-vertical .item { width: auto; }
262
- &.medium-vertical .item {
263
- @media #{$medium-up} {
264
- width: auto;
265
- }
266
- }
267
- &.large-vertical .item {
268
- @media #{$large-up} {
269
- width: auto;
270
- }
271
- }
272
- }
273
- &.three-up {
274
- .item { width: 33.3333%; }
275
- &.vertical .item, &.small-vertical .item { width: auto; }
276
- &.medium-vertical .item {
277
- @media #{$medium-up} {
278
- width: auto;
279
- }
280
- }
281
- &.large-vertical .item {
282
- @media #{$large-up} {
283
- width: auto;
284
- }
285
- }
286
- }
287
- &.four-up {
288
- .item { width: 25%; }
289
- &.vertical .item, &.small-vertical .item { width: auto; }
290
- &.medium-vertical .item {
291
- @media #{$medium-up} {
292
- width: auto;
293
- }
294
- }
295
- &.large-vertical .item {
296
- @media #{$large-up} {
297
- width: auto;
298
- }
299
- }
300
- }
301
- &.five-up {
302
- .item { width: 20%; }
303
- &.vertical .item, &.small-vertical .item { width: auto; }
304
- &.medium-vertical .item {
305
- @media #{$medium-up} {
306
- width: auto;
307
- }
308
- }
309
- &.large-vertical .item {
310
- @media #{$large-up} {
311
- width: auto;
312
- }
313
- }
314
- }
315
- &.six-up {
316
- .item { width: 16.66667%; }
317
- &.vertical .item, &.small-vertical .item { width: auto; }
318
- &.medium-vertical .item {
319
- @media #{$medium-up} {
320
- width: auto;
321
- }
322
- }
323
- &.large-vertical .item {
324
- @media #{$large-up} {
325
- width: auto;
326
- }
327
- }
328
- }
329
- &.seven-up {
330
- .item { width: 14.28571%; }
331
- &.vertical .item, &.small-vertical .item { width: auto; }
332
- &.medium-vertical .item {
333
- @media #{$medium-up} {
334
- width: auto;
335
- }
336
- }
337
- &.large-vertical .item {
338
- @media #{$large-up} {
339
- width: auto;
340
- }
341
- }
355
+ // toolbar styles
356
+
357
+ .icon-bar {
358
+
359
+ // Counts
360
+
361
+ &.two-up {
362
+ .item { width: 50%; }
363
+ &.vertical .item, &.small-vertical .item { width: auto; }
364
+ &.medium-vertical .item {
365
+ @media #{$medium-up} {
366
+ width: auto;
367
+ }
368
+ }
369
+ &.large-vertical .item {
370
+ @media #{$large-up} {
371
+ width: auto;
372
+ }
373
+ }
374
+ }
375
+ &.three-up {
376
+ .item { width: 33.3333%; }
377
+ &.vertical .item, &.small-vertical .item { width: auto; }
378
+ &.medium-vertical .item {
379
+ @media #{$medium-up} {
380
+ width: auto;
381
+ }
382
+ }
383
+ &.large-vertical .item {
384
+ @media #{$large-up} {
385
+ width: auto;
386
+ }
387
+ }
388
+ }
389
+ &.four-up {
390
+ .item { width: 25%; }
391
+ &.vertical .item, &.small-vertical .item { width: auto; }
392
+ &.medium-vertical .item {
393
+ @media #{$medium-up} {
394
+ width: auto;
395
+ }
396
+ }
397
+ &.large-vertical .item {
398
+ @media #{$large-up} {
399
+ width: auto;
400
+ }
401
+ }
402
+ }
403
+ &.five-up {
404
+ .item { width: 20%; }
405
+ &.vertical .item, &.small-vertical .item { width: auto; }
406
+ &.medium-vertical .item {
407
+ @media #{$medium-up} {
408
+ width: auto;
409
+ }
410
+ }
411
+ &.large-vertical .item {
412
+ @media #{$large-up} {
413
+ width: auto;
414
+ }
415
+ }
416
+ }
417
+ &.six-up {
418
+ .item { width: 16.66667%; }
419
+ &.vertical .item, &.small-vertical .item { width: auto; }
420
+ &.medium-vertical .item {
421
+ @media #{$medium-up} {
422
+ width: auto;
423
+ }
424
+ }
425
+ &.large-vertical .item {
426
+ @media #{$large-up} {
427
+ width: auto;
428
+ }
429
+ }
430
+ }
431
+ &.seven-up {
432
+ .item { width: 14.28571%; }
433
+ &.vertical .item, &.small-vertical .item { width: auto; }
434
+ &.medium-vertical .item {
435
+ @media #{$medium-up} {
436
+ width: auto;
437
+ }
438
+ }
439
+ &.large-vertical .item {
440
+ @media #{$large-up} {
441
+ width: auto;
442
+ }
443
+ }
342
444
  }
343
445
  &.eight-up {
344
- .item { width: 12.5%; }
345
- &.vertical .item, &.small-vertical .item { width: auto; }
346
- &.medium-vertical .item {
347
- @media #{$medium-up} {
348
- width: auto;
349
- }
350
- }
351
- &.large-vertical .item {
352
- @media #{$large-up} {
353
- width: auto;
354
- }
355
- }
356
- }
357
- }
446
+ .item { width: 12.5%; }
447
+ &.vertical .item, &.small-vertical .item { width: auto; }
448
+ &.medium-vertical .item {
449
+ @media #{$medium-up} {
450
+ width: auto;
451
+ }
452
+ }
453
+ &.large-vertical .item {
454
+ @media #{$large-up} {
455
+ width: auto;
456
+ }
457
+ }
458
+ }
459
+ }
358
460
  }
@@ -2,7 +2,7 @@
2
2
  // foundation.zurb.com
3
3
  // Licensed under MIT Open Source
4
4
 
5
- @import "global";
5
+ @import 'global';
6
6
 
7
7
  //
8
8
  // @variables
@@ -32,19 +32,20 @@ $inline-list-children-display: block !default;
32
32
  //
33
33
  // We use this mixin to create inline lists
34
34
  @mixin inline-list {
35
- margin: $inline-list-top-margin auto $inline-list-bottom-margin auto;
35
+ list-style: none;
36
+ margin-top: $inline-list-top-margin;
37
+ margin-bottom: $inline-list-bottom-margin;
36
38
  margin-#{$default-float}: $inline-list-default-float-margin;
37
39
  margin-#{$opposite-direction}: $inline-list-opposite-margin;
38
- padding: $inline-list-padding;
39
- list-style: none;
40
40
  overflow: $inline-list-overflow;
41
+ padding: $inline-list-padding;
41
42
 
42
- & > li {
43
- list-style: none;
43
+ > li {
44
+ display: $inline-list-display;
44
45
  float: $default-float;
46
+ list-style: none;
45
47
  margin-#{$default-float}: $inline-list-default-float-list-margin;
46
- display: $inline-list-display;
47
- &>* { display: $inline-list-children-display; }
48
+ > * { display: $inline-list-children-display; }
48
49
  }
49
50
  }
50
51