foundation-rails 5.5.1.2 → 5.5.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (65) hide show
  1. data/bower.json +2 -2
  2. data/lib/foundation/rails/version.rb +1 -1
  3. data/vendor/assets/javascripts/foundation.js +1 -1
  4. data/vendor/assets/javascripts/foundation/foundation.abide.js +96 -28
  5. data/vendor/assets/javascripts/foundation/foundation.accordion.js +28 -7
  6. data/vendor/assets/javascripts/foundation/foundation.alert.js +3 -3
  7. data/vendor/assets/javascripts/foundation/foundation.clearing.js +50 -20
  8. data/vendor/assets/javascripts/foundation/foundation.dropdown.js +26 -11
  9. data/vendor/assets/javascripts/foundation/foundation.equalizer.js +43 -16
  10. data/vendor/assets/javascripts/foundation/foundation.interchange.js +19 -14
  11. data/vendor/assets/javascripts/foundation/foundation.joyride.js +1 -1
  12. data/vendor/assets/javascripts/foundation/foundation.js +51 -29
  13. data/vendor/assets/javascripts/foundation/foundation.magellan.js +40 -28
  14. data/vendor/assets/javascripts/foundation/foundation.offcanvas.js +3 -3
  15. data/vendor/assets/javascripts/foundation/foundation.orbit.js +1 -1
  16. data/vendor/assets/javascripts/foundation/foundation.reveal.js +70 -43
  17. data/vendor/assets/javascripts/foundation/foundation.slider.js +23 -5
  18. data/vendor/assets/javascripts/foundation/foundation.tab.js +30 -18
  19. data/vendor/assets/javascripts/foundation/foundation.tooltip.js +47 -15
  20. data/vendor/assets/javascripts/foundation/foundation.topbar.js +31 -25
  21. data/vendor/assets/stylesheets/foundation.scss +37 -38
  22. data/vendor/assets/stylesheets/foundation/_functions.scss +52 -42
  23. data/vendor/assets/stylesheets/foundation/_settings.scss +53 -34
  24. data/vendor/assets/stylesheets/foundation/components/_accordion.scss +7 -7
  25. data/vendor/assets/stylesheets/foundation/components/_alert-boxes.scss +11 -11
  26. data/vendor/assets/stylesheets/foundation/components/_block-grid.scss +13 -13
  27. data/vendor/assets/stylesheets/foundation/components/_breadcrumbs.scss +17 -18
  28. data/vendor/assets/stylesheets/foundation/components/_button-groups.scss +29 -22
  29. data/vendor/assets/stylesheets/foundation/components/_buttons.scss +13 -17
  30. data/vendor/assets/stylesheets/foundation/components/_clearing.scss +51 -47
  31. data/vendor/assets/stylesheets/foundation/components/_dropdown-buttons.scss +10 -11
  32. data/vendor/assets/stylesheets/foundation/components/_dropdown.scss +42 -36
  33. data/vendor/assets/stylesheets/foundation/components/_flex-video.scss +7 -7
  34. data/vendor/assets/stylesheets/foundation/components/_forms.scss +82 -50
  35. data/vendor/assets/stylesheets/foundation/components/_global.scss +86 -64
  36. data/vendor/assets/stylesheets/foundation/components/_grid.scss +24 -21
  37. data/vendor/assets/stylesheets/foundation/components/_icon-bar.scss +335 -234
  38. data/vendor/assets/stylesheets/foundation/components/_inline-lists.scss +8 -8
  39. data/vendor/assets/stylesheets/foundation/components/_joyride.scss +40 -42
  40. data/vendor/assets/stylesheets/foundation/components/_keystrokes.scss +2 -3
  41. data/vendor/assets/stylesheets/foundation/components/_labels.scss +6 -6
  42. data/vendor/assets/stylesheets/foundation/components/_magellan.scss +2 -2
  43. data/vendor/assets/stylesheets/foundation/components/_offcanvas.scss +178 -175
  44. data/vendor/assets/stylesheets/foundation/components/_orbit.scss +82 -62
  45. data/vendor/assets/stylesheets/foundation/components/_pagination.scss +15 -15
  46. data/vendor/assets/stylesheets/foundation/components/_panels.scss +21 -15
  47. data/vendor/assets/stylesheets/foundation/components/_pricing-tables.scss +16 -16
  48. data/vendor/assets/stylesheets/foundation/components/_progress-bars.scss +4 -4
  49. data/vendor/assets/stylesheets/foundation/components/_range-slider.scss +23 -16
  50. data/vendor/assets/stylesheets/foundation/components/_reveal.scss +27 -27
  51. data/vendor/assets/stylesheets/foundation/components/_side-nav.scss +15 -11
  52. data/vendor/assets/stylesheets/foundation/components/_split-buttons.scss +16 -16
  53. data/vendor/assets/stylesheets/foundation/components/_sub-nav.scss +14 -11
  54. data/vendor/assets/stylesheets/foundation/components/_switches.scss +22 -19
  55. data/vendor/assets/stylesheets/foundation/components/_tables.scss +8 -8
  56. data/vendor/assets/stylesheets/foundation/components/_tabs.scss +49 -32
  57. data/vendor/assets/stylesheets/foundation/components/_thumbs.scss +8 -8
  58. data/vendor/assets/stylesheets/foundation/components/_tooltips.scss +25 -25
  59. data/vendor/assets/stylesheets/foundation/components/_top-bar.scss +163 -122
  60. data/vendor/assets/stylesheets/foundation/components/_type.scss +19 -19
  61. data/vendor/assets/stylesheets/foundation/components/_visibility.scss +23 -5
  62. data/vendor/assets/stylesheets/normalize.scss +8 -11
  63. metadata +28 -20
  64. checksums.yaml +0 -7
  65. data/vendor/assets/stylesheets/foundation/components/_toolbar.scss +0 -72
@@ -2,7 +2,7 @@
2
2
  // foundation.zurb.com
3
3
  // Licensed under MIT Open Source
4
4
 
5
- @import "../functions";
5
+ @import '../functions';
6
6
  //
7
7
  // Foundation Variables
8
8
  //
@@ -80,7 +80,7 @@ $base-line-height: 1.5 !default;
80
80
  // We use this to add box-sizing across browser prefixes
81
81
  @mixin box-sizing($type:border-box) {
82
82
  -webkit-box-sizing: $type; // Android < 2.3, iOS < 4
83
- -moz-box-sizing: $type; // Firefox < 29
83
+ -moz-box-sizing: $type;
84
84
  box-sizing: $type; // Chrome, IE 8+, Opera, Safari 5.1
85
85
  }
86
86
 
@@ -91,11 +91,11 @@ $base-line-height: 1.5 !default;
91
91
  // $triangle-color - Used to set border-color which makes up triangle. No default
92
92
  // $triangle-direction - Used to determine which direction triangle points. Options: top, bottom, left, right
93
93
  @mixin css-triangle($triangle-size, $triangle-color, $triangle-direction) {
94
+ border: inset $triangle-size;
94
95
  content: "";
95
96
  display: block;
96
- width: 0;
97
97
  height: 0;
98
- border: inset $triangle-size;
98
+ width: 0;
99
99
  @if ($triangle-direction == top) {
100
100
  border-color: $triangle-color transparent transparent transparent;
101
101
  border-top-style: solid;
@@ -128,9 +128,9 @@ $base-line-height: 1.5 !default;
128
128
  @mixin hamburger($width, $left, $top, $thickness, $gap, $color, $hover-color, $offcanvas) {
129
129
  span::after {
130
130
  content: "";
131
- position: absolute;
132
131
  display: block;
133
132
  height: 0;
133
+ position: absolute;
134
134
 
135
135
  @if $offcanvas {
136
136
  @if $top {
@@ -148,8 +148,8 @@ $base-line-height: 1.5 !default;
148
148
  }
149
149
  }
150
150
  @else {
151
- top: 50%;
152
151
  margin-top: -($width/2);
152
+ top: 50%;
153
153
  #{$opposite-direction}: $topbar-link-padding;
154
154
  }
155
155
 
@@ -183,8 +183,8 @@ $base-line-height: 1.5 !default;
183
183
  transition: box-shadow $fade-time, border-color $fade-time ease-in-out;
184
184
 
185
185
  &:#{$selector} {
186
- box-shadow: 0 0 5px $glowing-effect-color;
187
186
  border-color: $glowing-effect-color;
187
+ box-shadow: 0 0 5px $glowing-effect-color;
188
188
  }
189
189
  }
190
190
 
@@ -194,7 +194,7 @@ $base-line-height: 1.5 !default;
194
194
  // $horizontal: Default: 0
195
195
  // $vertical: Default: 0
196
196
  @mixin translate2d($horizontal:0, $vertical:0) {
197
- transform: translate($horizontal,$vertical)
197
+ transform: translate($horizontal, $vertical)
198
198
  }
199
199
 
200
200
  // @mixins
@@ -202,11 +202,11 @@ $base-line-height: 1.5 !default;
202
202
  // Makes an element visually hidden, but accessible.
203
203
  // @see http://snook.ca/archives/html_and_css/hiding-content-for-accessibility
204
204
  @mixin element-invisible {
205
- position: absolute !important;
205
+ clip: rect(1px, 1px, 1px, 1px);
206
206
  height: 1px;
207
- width: 1px;
208
207
  overflow: hidden;
209
- clip: rect(1px, 1px, 1px, 1px);
208
+ position: absolute !important;
209
+ width: 1px;
210
210
  }
211
211
 
212
212
  // @mixins
@@ -291,17 +291,22 @@ $shiny-edge-active-color: rgba(#000, .2) !default;
291
291
  // We use this to control whether or not CSS classes come through in the gem files.
292
292
  $include-html-classes: true !default;
293
293
  $include-print-styles: true !default;
294
+ $include-js-meta-styles: true !default; // Warning! Meta styles are a dependancy of the Javascript.
294
295
  $include-html-global-classes: $include-html-classes !default;
295
296
 
296
297
  $column-gutter: rem-calc(30) !default;
297
298
 
298
299
  // Media Query Ranges
299
- $small-range: (0, 40em) !default;
300
- $medium-range: (40.063em, 64em) !default;
301
- $large-range: (64.063em, 90em) !default;
302
- $xlarge-range: (90.063em, 120em) !default;
303
- $xxlarge-range: (120.063em, 99999999em) !default;
300
+ $small-breakpoint: em-calc(640) !default;
301
+ $medium-breakpoint: em-calc(1024) !default;
302
+ $large-breakpoint: em-calc(1440) !default;
303
+ $xlarge-breakpoint: em-calc(1920) !default;
304
304
 
305
+ $small-range: (0, $small-breakpoint) !default;
306
+ $medium-range: ($small-breakpoint + em-calc(1), $medium-breakpoint) !default;
307
+ $large-range: ($medium-breakpoint + em-calc(1), $large-breakpoint) !default;
308
+ $xlarge-range: ($large-breakpoint + em-calc(1), $xlarge-breakpoint) !default;
309
+ $xxlarge-range: ($xlarge-breakpoint + em-calc(1), em-calc(99999999)) !default;
305
310
 
306
311
  $screen: "only screen" !default;
307
312
 
@@ -323,6 +328,15 @@ $xlarge-only: "#{$screen} and (min-width:#{lower-bound($xlarge-range)}) and (max
323
328
  $xxlarge-up: "#{$screen} and (min-width:#{lower-bound($xxlarge-range)})" !default;
324
329
  $xxlarge-only: "#{$screen} and (min-width:#{lower-bound($xxlarge-range)}) and (max-width:#{upper-bound($xxlarge-range)})" !default;
325
330
 
331
+ $retina: (
332
+ "#{$screen} and (-webkit-min-device-pixel-ratio: 2)",
333
+ "#{$screen} and (min--moz-device-pixel-ratio: 2)",
334
+ "#{$screen} and (-o-min-device-pixel-ratio: 2/1)",
335
+ "#{$screen} and (min-device-pixel-ratio: 2)",
336
+ "#{$screen} and (min-resolution: 192dpi)",
337
+ "#{$screen} and (min-resolution: 2dppx)"
338
+ );
339
+
326
340
  // Legacy
327
341
  $small: $medium-up;
328
342
  $medium: $medium-up;
@@ -341,61 +355,65 @@ $cursor-text-value: text !default;
341
355
 
342
356
  @include exports("global") {
343
357
 
344
- // Meta styles are included in all builds, as they are a dependancy of the Javascript.
358
+ // Meta styles are a dependancy of the Javascript.
345
359
  // Used to provide media query values for javascript components.
346
360
  // Forward slash placed around everything to convince PhantomJS to read the value.
347
361
 
348
- meta.foundation-version {
349
- font-family: "/5.5.1/";
350
- }
362
+ @if $include-js-meta-styles {
351
363
 
352
- meta.foundation-mq-small {
353
- font-family: "/" + unquote($small-up) + "/";
354
- width: lower-bound($small-range);
355
- }
364
+ meta.foundation-version {
365
+ font-family: "/5.5.2/";
366
+ }
356
367
 
357
- meta.foundation-mq-small-only {
358
- font-family: "/" + unquote($small-only) + "/";
359
- width: lower-bound($small-range);
360
- }
368
+ meta.foundation-mq-small {
369
+ font-family: "/" + unquote($small-up) + "/";
370
+ width: lower-bound($small-range);
371
+ }
361
372
 
362
- meta.foundation-mq-medium {
363
- font-family: "/" + unquote($medium-up) + "/";
364
- width: lower-bound($medium-range);
365
- }
373
+ meta.foundation-mq-small-only {
374
+ font-family: "/" + unquote($small-only) + "/";
375
+ width: lower-bound($small-range);
376
+ }
366
377
 
367
- meta.foundation-mq-medium-only {
368
- font-family: "/" + unquote($medium-only) + "/";
369
- width: lower-bound($medium-range);
370
- }
378
+ meta.foundation-mq-medium {
379
+ font-family: "/" + unquote($medium-up) + "/";
380
+ width: lower-bound($medium-range);
381
+ }
371
382
 
372
- meta.foundation-mq-large {
373
- font-family: "/" + unquote($large-up) + "/";
374
- width: lower-bound($large-range);
375
- }
383
+ meta.foundation-mq-medium-only {
384
+ font-family: "/" + unquote($medium-only) + "/";
385
+ width: lower-bound($medium-range);
386
+ }
376
387
 
377
- meta.foundation-mq-large-only {
378
- font-family: "/" + unquote($large-only) + "/";
379
- width: lower-bound($large-range);
380
- }
388
+ meta.foundation-mq-large {
389
+ font-family: "/" + unquote($large-up) + "/";
390
+ width: lower-bound($large-range);
391
+ }
381
392
 
382
- meta.foundation-mq-xlarge {
383
- font-family: "/" + unquote($xlarge-up) + "/";
384
- width: lower-bound($xlarge-range);
385
- }
393
+ meta.foundation-mq-large-only {
394
+ font-family: "/" + unquote($large-only) + "/";
395
+ width: lower-bound($large-range);
396
+ }
386
397
 
387
- meta.foundation-mq-xlarge-only {
388
- font-family: "/" + unquote($xlarge-only) + "/";
389
- width: lower-bound($xlarge-range);
390
- }
398
+ meta.foundation-mq-xlarge {
399
+ font-family: "/" + unquote($xlarge-up) + "/";
400
+ width: lower-bound($xlarge-range);
401
+ }
391
402
 
392
- meta.foundation-mq-xxlarge {
393
- font-family: "/" + unquote($xxlarge-up) + "/";
394
- width: lower-bound($xxlarge-range);
395
- }
403
+ meta.foundation-mq-xlarge-only {
404
+ font-family: "/" + unquote($xlarge-only) + "/";
405
+ width: lower-bound($xlarge-range);
406
+ }
407
+
408
+ meta.foundation-mq-xxlarge {
409
+ font-family: "/" + unquote($xxlarge-up) + "/";
410
+ width: lower-bound($xxlarge-range);
411
+ }
412
+
413
+ meta.foundation-data-attribute-namespace {
414
+ font-family: #{$namespace};
415
+ }
396
416
 
397
- meta.foundation-data-attribute-namespace {
398
- font-family: #{$namespace};
399
417
  }
400
418
 
401
419
  @if $include-html-global-classes {
@@ -404,10 +422,13 @@ $cursor-text-value: text !default;
404
422
  html, body { height: 100%; }
405
423
 
406
424
  // Set box-sizing globally to handle padding and border widths
425
+ html {
426
+ box-sizing: border-box;
427
+ }
407
428
  *,
408
429
  *:before,
409
430
  *:after {
410
- @include box-sizing(border-box);
431
+ @include box-sizing(inherit);
411
432
  }
412
433
 
413
434
  html,
@@ -417,14 +438,14 @@ $cursor-text-value: text !default;
417
438
  body {
418
439
  background: $body-bg;
419
440
  color: $body-font-color;
420
- padding: 0;
421
- margin: 0;
441
+ cursor: $cursor-auto-value;
422
442
  font-family: $body-font-family;
423
- font-weight: $body-font-weight;
424
443
  font-style: $body-font-style;
444
+ font-weight: $body-font-weight;
425
445
  line-height: $base-line-height; // Set to $base-line-height to take on browser default of 150%
446
+ margin: 0;
447
+ padding: 0;
426
448
  position: relative;
427
- cursor: $cursor-auto-value;
428
449
  }
429
450
 
430
451
  a:hover { cursor: $cursor-pointer-value; }
@@ -435,7 +456,8 @@ $cursor-text-value: text !default;
435
456
  img { -ms-interpolation-mode: bicubic; }
436
457
 
437
458
  #map_canvas,
438
- .map_canvas {
459
+ .map_canvas,
460
+ .mqa-display {
439
461
  img,
440
462
  embed,
441
463
  object { max-width: none !important;
@@ -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
@@ -29,7 +29,9 @@ $last-child-float: $opposite-direction !default;
29
29
  // $colNumber - Found in settings file
30
30
  // $totalColumns - Found in settings file
31
31
  @function grid-calc($colNumber, $totalColumns) {
32
- @return percentage(($colNumber / $totalColumns));
32
+ $result: percentage(($colNumber / $totalColumns));
33
+ @if $result == 0% { $result: 0; }
34
+ @return $result;
33
35
  }
34
36
 
35
37
  //
@@ -44,36 +46,30 @@ $last-child-float: $opposite-direction !default;
44
46
 
45
47
  // use @include grid-row(nest); to include a nested row
46
48
  @if $behavior == nest {
47
- width: auto;
48
- margin-#{$default-float}: -($column-gutter/2);
49
- margin-#{$opposite-direction}: -($column-gutter/2);
50
- margin-top: 0;
51
- margin-bottom: 0;
49
+ margin: 0 (-($column-gutter/2));
52
50
  max-width: none;
51
+ width: auto;
53
52
  }
54
53
 
55
54
  // use @include grid-row(collapse); to collapsed a container row margins
56
55
  @else if $behavior == collapse {
57
- width: 100%;
58
56
  margin: 0;
59
57
  max-width: $row-width;
58
+ width: 100%;
60
59
  }
61
60
 
62
61
  // use @include grid-row(nest-collapse); to collapse outer margins on a nested row
63
62
  @else if $behavior == nest-collapse {
64
- width: auto;
65
63
  margin: 0;
66
64
  max-width: none;
65
+ width: auto;
67
66
  }
68
67
 
69
68
  // use @include grid-row; to use a container row
70
69
  @else {
71
- width: 100%;
72
- margin-#{$default-float}: auto;
73
- margin-#{$opposite-direction}: auto;
74
- margin-top: 0;
75
- margin-bottom: 0;
70
+ margin: 0 auto;
76
71
  max-width: $row-width;
72
+ width: 100%;
77
73
  }
78
74
 
79
75
  // Clearfix for all rows
@@ -169,19 +165,19 @@ $last-child-float: $opposite-direction !default;
169
165
 
170
166
 
171
167
  @for $i from 1 through $total-columns {
172
- .#{$size}-#{$i} { @include grid-column($columns:$i,$collapse:null,$float:false); }
168
+ .#{$size}-#{$i} { @include grid-column($columns:$i, $collapse:null, $float:false); }
173
169
  }
174
170
 
175
171
  @for $i from 0 through $total-columns - 1 {
176
- .#{$size}-offset-#{$i} { @include grid-column($offset:$i, $collapse:null,$float:false); }
172
+ .#{$size}-offset-#{$i} { @include grid-column($offset:$i, $collapse:null, $float:false); }
177
173
  }
178
174
 
179
175
  .#{$size}-reset-order {
176
+ float: $default-float;
177
+ left: auto;
180
178
  margin-#{$default-float}: 0;
181
179
  margin-#{$opposite-direction}: 0;
182
- left: auto;
183
180
  right: auto;
184
- float: $default-float;
185
181
  }
186
182
 
187
183
  .column.#{$size}-centered,
@@ -189,9 +185,9 @@ $last-child-float: $opposite-direction !default;
189
185
 
190
186
  .column.#{$size}-uncentered,
191
187
  .columns.#{$size}-uncentered {
188
+ float: $default-float;
192
189
  margin-#{$default-float}: 0;
193
190
  margin-#{$opposite-direction}: 0;
194
- float: $default-float;
195
191
  }
196
192
 
197
193
  // Fighting [class*="column"] + [class*="column"]:last-child
@@ -247,8 +243,15 @@ $last-child-float: $opposite-direction !default;
247
243
  .column,
248
244
  .columns { @include grid-column($columns:$total-columns); }
249
245
 
250
- [class*="column"] + [class*="column"]:last-child { float: $last-child-float; }
251
- [class*="column"] + [class*="column"].end { float: $default-float; }
246
+ .column,
247
+ .columns {
248
+ & + &:last-child {
249
+ float: $last-child-float;
250
+ }
251
+ & + &.end {
252
+ float: $default-float;
253
+ }
254
+ }
252
255
 
253
256
  @media #{$small-up} {
254
257
  @include grid-html-classes($size:small);
@@ -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
+ }
41
73
 
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
- }
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
+ }
102
+
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,38 @@ $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
204
  pointer-events: none;
205
205
  >* {
206
206
  opacity: $icon-bar-disabled-opacity;
@@ -230,15 +230,116 @@ $icon-bar-disabled-cursor: $cursor-disabled-value !default;
230
230
  $bar-icon-color-hover:$icon-bar-icon-color-hover,
231
231
  $bar-active-color:$icon-bar-active-color,
232
232
  $padding: $icon-bar-item-padding,
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,
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,
237
237
  $base-style:true,
238
238
  $disabled:true) {
239
239
  @include icon-bar-base();
240
240
  @include icon-bar-size($padding, $font-size, $icon-size, $image-width, $image-height);
241
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
+ }
242
343
  }
243
344
 
244
345
  @include exports("icon-bar") {
@@ -251,109 +352,109 @@ $icon-bar-disabled-cursor: $cursor-disabled-value !default;
251
352
 
252
353
  @if $include-html-icon-bar-classes {
253
354
 
254
- // toolbar styles
255
-
256
- .icon-bar {
257
-
258
- // Counts
259
-
260
- &.two-up {
261
- .item { width: 50%; }
262
- &.vertical .item, &.small-vertical .item { width: auto; }
263
- &.medium-vertical .item {
264
- @media #{$medium-up} {
265
- width: auto;
266
- }
267
- }
268
- &.large-vertical .item {
269
- @media #{$large-up} {
270
- width: auto;
271
- }
272
- }
273
- }
274
- &.three-up {
275
- .item { width: 33.3333%; }
276
- &.vertical .item, &.small-vertical .item { width: auto; }
277
- &.medium-vertical .item {
278
- @media #{$medium-up} {
279
- width: auto;
280
- }
281
- }
282
- &.large-vertical .item {
283
- @media #{$large-up} {
284
- width: auto;
285
- }
286
- }
287
- }
288
- &.four-up {
289
- .item { width: 25%; }
290
- &.vertical .item, &.small-vertical .item { width: auto; }
291
- &.medium-vertical .item {
292
- @media #{$medium-up} {
293
- width: auto;
294
- }
295
- }
296
- &.large-vertical .item {
297
- @media #{$large-up} {
298
- width: auto;
299
- }
300
- }
301
- }
302
- &.five-up {
303
- .item { width: 20%; }
304
- &.vertical .item, &.small-vertical .item { width: auto; }
305
- &.medium-vertical .item {
306
- @media #{$medium-up} {
307
- width: auto;
308
- }
309
- }
310
- &.large-vertical .item {
311
- @media #{$large-up} {
312
- width: auto;
313
- }
314
- }
315
- }
316
- &.six-up {
317
- .item { width: 16.66667%; }
318
- &.vertical .item, &.small-vertical .item { width: auto; }
319
- &.medium-vertical .item {
320
- @media #{$medium-up} {
321
- width: auto;
322
- }
323
- }
324
- &.large-vertical .item {
325
- @media #{$large-up} {
326
- width: auto;
327
- }
328
- }
329
- }
330
- &.seven-up {
331
- .item { width: 14.28571%; }
332
- &.vertical .item, &.small-vertical .item { width: auto; }
333
- &.medium-vertical .item {
334
- @media #{$medium-up} {
335
- width: auto;
336
- }
337
- }
338
- &.large-vertical .item {
339
- @media #{$large-up} {
340
- width: auto;
341
- }
342
- }
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
+ }
343
444
  }
344
445
  &.eight-up {
345
- .item { width: 12.5%; }
346
- &.vertical .item, &.small-vertical .item { width: auto; }
347
- &.medium-vertical .item {
348
- @media #{$medium-up} {
349
- width: auto;
350
- }
351
- }
352
- &.large-vertical .item {
353
- @media #{$large-up} {
354
- width: auto;
355
- }
356
- }
357
- }
358
- }
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
+ }
359
460
  }