foundation-rails 6.2.4.0 → 6.3.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (114) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +2 -2
  3. data/Rakefile +2 -0
  4. data/bower.json +2 -2
  5. data/lib/foundation/rails/version.rb +1 -1
  6. data/lib/generators/foundation/templates/_settings.scss +117 -70
  7. data/lib/generators/foundation/templates/foundation_and_overrides.scss +2 -1
  8. data/vendor/assets/_vendor/normalize-scss/sass/_normalize.scss +3 -0
  9. data/vendor/assets/_vendor/normalize-scss/sass/normalize/_import-now.scss +11 -0
  10. data/vendor/assets/_vendor/normalize-scss/sass/normalize/_normalize-mixin.scss +676 -0
  11. data/vendor/assets/_vendor/normalize-scss/sass/normalize/_variables.scss +36 -0
  12. data/vendor/assets/_vendor/normalize-scss/sass/normalize/_vertical-rhythm.scss +61 -0
  13. data/vendor/assets/_vendor/sassy-lists/stylesheets/functions/_purge.scss +38 -0
  14. data/vendor/assets/_vendor/sassy-lists/stylesheets/functions/_remove.scss +31 -0
  15. data/vendor/assets/_vendor/sassy-lists/stylesheets/functions/_replace.scss +46 -0
  16. data/vendor/assets/_vendor/sassy-lists/stylesheets/functions/_to-list.scss +27 -0
  17. data/vendor/assets/_vendor/sassy-lists/stylesheets/helpers/_missing-dependencies.scss +25 -0
  18. data/vendor/assets/_vendor/sassy-lists/stylesheets/helpers/_true.scss +13 -0
  19. data/vendor/assets/js/foundation.abide.js.es6 +28 -0
  20. data/vendor/assets/js/foundation.accordion.js.es6 +1 -1
  21. data/vendor/assets/js/foundation.accordionMenu.js.es6 +9 -1
  22. data/vendor/assets/js/foundation.core.js.es6 +4 -4
  23. data/vendor/assets/js/foundation.drilldown.js.es6 +128 -14
  24. data/vendor/assets/js/foundation.dropdown.js.es6 +48 -42
  25. data/vendor/assets/js/foundation.dropdownMenu.js.es6 +20 -18
  26. data/vendor/assets/js/foundation.equalizer.js.es6 +12 -6
  27. data/vendor/assets/js/foundation.interchange.js.es6 +3 -2
  28. data/vendor/assets/js/foundation.js.es6 +2 -1
  29. data/vendor/assets/js/foundation.magellan.js.es6 +28 -9
  30. data/vendor/assets/js/foundation.offcanvas.js.es6 +90 -123
  31. data/vendor/assets/js/foundation.orbit.js.es6 +61 -10
  32. data/vendor/assets/js/foundation.responsiveMenu.js.es6 +2 -0
  33. data/vendor/assets/js/foundation.responsiveToggle.js.es6 +52 -12
  34. data/vendor/assets/js/foundation.reveal.js.es6 +48 -48
  35. data/vendor/assets/js/foundation.slider.js.es6 +124 -42
  36. data/vendor/assets/js/foundation.sticky.js.es6 +11 -9
  37. data/vendor/assets/js/foundation.tabs.js.es6 +164 -35
  38. data/vendor/assets/js/foundation.toggler.js.es6 +3 -0
  39. data/vendor/assets/js/foundation.tooltip.js.es6 +20 -10
  40. data/vendor/assets/js/foundation.util.box.js.es6 +2 -2
  41. data/vendor/assets/js/foundation.util.keyboard.js.es6 +37 -0
  42. data/vendor/assets/js/foundation.util.mediaQuery.js.es6 +16 -0
  43. data/vendor/assets/js/foundation.util.motion.js.es6 +7 -1
  44. data/vendor/assets/js/foundation.util.nest.js.es6 +10 -5
  45. data/vendor/assets/js/foundation.util.timerAndImageLoader.js.es6 +6 -4
  46. data/vendor/assets/js/foundation.util.triggers.js.es6 +54 -36
  47. data/vendor/assets/js/foundation.zf.responsiveAccordionTabs.js.es6 +240 -0
  48. data/vendor/assets/scss/_global.scss +25 -450
  49. data/vendor/assets/scss/components/_accordion-menu.scss +8 -4
  50. data/vendor/assets/scss/components/_accordion.scss +43 -22
  51. data/vendor/assets/scss/components/_badge.scss +17 -9
  52. data/vendor/assets/scss/components/_breadcrumbs.scss +7 -5
  53. data/vendor/assets/scss/components/_button-group.scss +54 -6
  54. data/vendor/assets/scss/components/_button.scss +27 -16
  55. data/vendor/assets/scss/components/_callout.scss +3 -2
  56. data/vendor/assets/scss/components/_card.scss +121 -0
  57. data/vendor/assets/scss/components/_close-button.scss +54 -13
  58. data/vendor/assets/scss/components/_drilldown.scss +19 -5
  59. data/vendor/assets/scss/components/_dropdown-menu.scss +23 -18
  60. data/vendor/assets/scss/components/_dropdown.scss +14 -7
  61. data/vendor/assets/scss/components/_flex-video.scss +1 -63
  62. data/vendor/assets/scss/components/_float.scss +1 -1
  63. data/vendor/assets/scss/components/_label.scss +16 -8
  64. data/vendor/assets/scss/components/_media-object.scss +2 -3
  65. data/vendor/assets/scss/components/_menu.scss +68 -33
  66. data/vendor/assets/scss/components/_off-canvas.scss +231 -80
  67. data/vendor/assets/scss/components/_orbit.scss +8 -6
  68. data/vendor/assets/scss/components/_pagination.scss +42 -22
  69. data/vendor/assets/scss/components/_progress-bar.scss +1 -1
  70. data/vendor/assets/scss/components/_responsive-embed.scss +66 -0
  71. data/vendor/assets/scss/components/_reveal.scss +17 -11
  72. data/vendor/assets/scss/components/_slider.scss +6 -1
  73. data/vendor/assets/scss/components/_sticky.scss +3 -3
  74. data/vendor/assets/scss/components/_switch.scss +47 -36
  75. data/vendor/assets/scss/components/_table.scss +83 -23
  76. data/vendor/assets/scss/components/_tabs.scss +54 -23
  77. data/vendor/assets/scss/components/_thumbnail.scss +17 -4
  78. data/vendor/assets/scss/components/_title-bar.scss +5 -6
  79. data/vendor/assets/scss/components/_tooltip.scss +15 -12
  80. data/vendor/assets/scss/components/_top-bar.scss +11 -8
  81. data/vendor/assets/scss/forms/_checkbox.scss +2 -1
  82. data/vendor/assets/scss/forms/_error.scss +10 -6
  83. data/vendor/assets/scss/forms/_fieldset.scss +7 -7
  84. data/vendor/assets/scss/forms/_input-group.scss +17 -11
  85. data/vendor/assets/scss/forms/_label.scss +2 -0
  86. data/vendor/assets/scss/forms/_meter.scss +9 -10
  87. data/vendor/assets/scss/forms/_progress.scss +9 -9
  88. data/vendor/assets/scss/forms/_range.scss +20 -15
  89. data/vendor/assets/scss/forms/_select.scss +26 -8
  90. data/vendor/assets/scss/forms/_text.scss +19 -16
  91. data/vendor/assets/scss/foundation.scss +19 -3
  92. data/vendor/assets/scss/grid/_classes.scss +31 -14
  93. data/vendor/assets/scss/grid/_column.scss +10 -24
  94. data/vendor/assets/scss/grid/_flex-grid.scss +84 -76
  95. data/vendor/assets/scss/grid/_grid.scss +0 -16
  96. data/vendor/assets/scss/grid/_gutter.scss +53 -5
  97. data/vendor/assets/scss/grid/_layout.scss +3 -3
  98. data/vendor/assets/scss/grid/_position.scss +3 -3
  99. data/vendor/assets/scss/grid/_row.scss +24 -19
  100. data/vendor/assets/scss/settings/_settings.scss +117 -70
  101. data/vendor/assets/scss/typography/_base.scss +110 -44
  102. data/vendor/assets/scss/typography/_helpers.scss +1 -0
  103. data/vendor/assets/scss/typography/_print.scss +7 -3
  104. data/vendor/assets/scss/typography/_typography.scss +0 -2
  105. data/vendor/assets/scss/util/_breakpoint.scss +28 -19
  106. data/vendor/assets/scss/util/_color.scss +69 -16
  107. data/vendor/assets/scss/util/_flex.scss +20 -3
  108. data/vendor/assets/scss/util/_math.scss +72 -0
  109. data/vendor/assets/scss/util/_mixins.scss +63 -26
  110. data/vendor/assets/scss/util/_selector.scss +3 -2
  111. data/vendor/assets/scss/util/_unit.scss +61 -4
  112. data/vendor/assets/scss/util/_util.scss +1 -0
  113. data/vendor/assets/scss/util/_value.scss +33 -0
  114. metadata +17 -2
@@ -10,23 +10,27 @@ $accordionmenu-arrows: true !default;
10
10
  /// @type Color
11
11
  $accordionmenu-arrow-color: $primary-color !default;
12
12
 
13
+ /// Sets accordion menu arrow size if arrow is used.
14
+ /// @type Length
15
+ $accordionmenu-arrow-size: 6px !default;
16
+
13
17
  @mixin foundation-accordion-menu {
14
18
  @if $accordionmenu-arrows {
15
19
  .is-accordion-submenu-parent > a {
16
20
  position: relative;
17
21
 
18
22
  &::after {
19
- @include css-triangle(6px, $accordionmenu-arrow-color, down);
23
+ @include css-triangle($accordionmenu-arrow-size, $accordionmenu-arrow-color, down);
20
24
  position: absolute;
21
25
  top: 50%;
22
- margin-top: -4px;
23
- right: 1rem;
26
+ margin-top: -1 * ($accordionmenu-arrow-size / 2);
27
+ #{$global-right}: 1rem;
24
28
  }
25
29
  }
26
30
 
27
31
  .is-accordion-submenu-parent[aria-expanded='true'] > a::after {
32
+ transform: rotate(180deg);
28
33
  transform-origin: 50% 50%;
29
- transform: scaleY(-1);
30
34
  }
31
35
  }
32
36
  }
@@ -14,9 +14,13 @@ $accordion-background: $white !default;
14
14
  /// @type Boolean
15
15
  $accordion-plusminus: true !default;
16
16
 
17
+ /// Font size of accordion titles.
18
+ /// @type Number
19
+ $accordion-title-font-size: rem-calc(12) !default;
20
+
17
21
  /// Default text color for items in a Menu.
18
22
  /// @type Color
19
- $accordion-item-color: foreground($accordion-background, $primary-color) !default;
23
+ $accordion-item-color: $primary-color !default;
20
24
 
21
25
  /// Default background color on hover for items in a Menu.
22
26
  /// @type Color
@@ -36,17 +40,19 @@ $accordion-content-border: 1px solid $light-gray !default;
36
40
 
37
41
  /// Default text color of tab content.
38
42
  /// @type Color
39
- $accordion-content-color: foreground($accordion-content-background, $body-font-color) !default;
43
+ $accordion-content-color: $body-font-color !default;
40
44
 
41
45
  /// Default padding for tab content.
42
46
  /// @type Number | List
43
47
  $accordion-content-padding: 1rem !default;
44
48
 
45
49
  /// Adds styles for an accordion container. Apply this to the same element that gets `data-accordion`.
46
- @mixin accordion-container {
47
- list-style-type: none;
48
- background: $accordion-background;
50
+ @mixin accordion-container (
51
+ $background: $accordion-background
52
+ ) {
49
53
  margin-#{$global-left}: 0;
54
+ background: $background;
55
+ list-style-type: none;
50
56
  }
51
57
 
52
58
  /// Adds styles for the accordion item. Apply this to the list item within an accordion ul.
@@ -61,33 +67,41 @@ $accordion-content-padding: 1rem !default;
61
67
  }
62
68
 
63
69
  /// Adds styles for the title of an accordion item. Apply this to the link within an accordion item.
64
- @mixin accordion-title {
65
- display: block;
66
- padding: $accordion-item-padding;
67
- line-height: 1;
68
- font-size: rem-calc(12);
69
- color: $accordion-item-color;
70
+ @mixin accordion-title (
71
+ $padding: $accordion-item-padding,
72
+ $font-size: $accordion-title-font-size,
73
+ $color: $accordion-item-color,
74
+ $border: $accordion-content-border,
75
+ $background-hover: $accordion-item-background-hover
76
+ ) {
70
77
  position: relative;
71
- border: $accordion-content-border;
78
+ display: block;
79
+ padding: $padding;
80
+
81
+ border: $border;
72
82
  border-bottom: 0;
73
83
 
84
+ font-size: $font-size;
85
+ line-height: 1;
86
+ color: $color;
87
+
74
88
  :last-child:not(.is-active) > & {
89
+ border-bottom: $border;
75
90
  border-radius: 0 0 $global-radius $global-radius;
76
- border-bottom: $accordion-content-border;
77
91
  }
78
92
 
79
93
  &:hover,
80
94
  &:focus {
81
- background-color: $accordion-item-background-hover;
95
+ background-color: $background-hover;
82
96
  }
83
97
 
84
98
  @if $accordion-plusminus {
85
99
  &::before {
86
- content: '+';
87
100
  position: absolute;
88
- #{$global-right}: 1rem;
89
101
  top: 50%;
102
+ #{$global-right}: 1rem;
90
103
  margin-top: -0.5rem;
104
+ content: '+';
91
105
  }
92
106
 
93
107
  .is-active > &::before {
@@ -97,16 +111,23 @@ $accordion-content-padding: 1rem !default;
97
111
  }
98
112
 
99
113
  /// Adds styles for accordion content. Apply this to the content pane below an accordion item's title.
100
- @mixin accordion-content {
101
- padding: $accordion-content-padding;
114
+ @mixin accordion-content (
115
+ $padding: $accordion-content-padding,
116
+ $border: $accordion-content-border,
117
+ $background: $accordion-content-background,
118
+ $color: $accordion-content-color
119
+ ) {
102
120
  display: none;
103
- border: $accordion-content-border;
121
+ padding: $padding;
122
+
123
+ border: $border;
104
124
  border-bottom: 0;
105
- background-color: $accordion-content-background;
106
- color: $accordion-content-color;
125
+ background-color: $background;
126
+
127
+ color: $color;
107
128
 
108
129
  :last-child > &:last-child {
109
- border-bottom: $accordion-content-border;
130
+ border-bottom: $border;
110
131
  }
111
132
  }
112
133
 
@@ -12,7 +12,15 @@ $badge-background: $primary-color !default;
12
12
 
13
13
  /// Default text color for badges.
14
14
  /// @type Color
15
- $badge-color: foreground($badge-background) !default;
15
+ $badge-color: $white !default;
16
+
17
+ /// Alternate text color for badges.
18
+ /// @type Color
19
+ $badge-color-alt: $black !default;
20
+
21
+ /// Coloring classes. A map of classes to output in your CSS, like `.secondary`, `.success`, and so on.
22
+ /// @type Map
23
+ $badge-palette: $foundation-palette !default;
16
24
 
17
25
  /// Default padding inside badges.
18
26
  /// @type Number
@@ -29,11 +37,13 @@ $badge-font-size: 0.6rem !default;
29
37
  /// Generates the base styles for a badge.
30
38
  @mixin badge {
31
39
  display: inline-block;
32
- padding: $badge-padding;
33
40
  min-width: $badge-minwidth;
41
+ padding: $badge-padding;
42
+
43
+ border-radius: 50%;
44
+
34
45
  font-size: $badge-font-size;
35
46
  text-align: center;
36
- border-radius: 50%;
37
47
  }
38
48
 
39
49
  @mixin foundation-badge {
@@ -43,12 +53,10 @@ $badge-font-size: 0.6rem !default;
43
53
  background: $badge-background;
44
54
  color: $badge-color;
45
55
 
46
- @each $name, $color in $foundation-palette {
47
- @if $name != primary {
48
- &.#{$name} {
49
- background: $color;
50
- color: foreground($color);
51
- }
56
+ @each $name, $color in $badge-palette {
57
+ &.#{$name} {
58
+ background: $color;
59
+ color: color-pick-contrast($color, ($badge-color, $badge-color-alt));
52
60
  }
53
61
  }
54
62
  }
@@ -41,14 +41,15 @@ $breadcrumbs-item-slash: true !default;
41
41
  /// Adds styles for a breadcrumbs container, along with the styles for the `<li>` and `<a>` elements inside of it.
42
42
  @mixin breadcrumbs-container {
43
43
  @include clearfix;
44
- list-style: none;
45
44
  margin: $breadcrumbs-margin;
45
+ list-style: none;
46
46
 
47
47
  // Item wrapper
48
48
  li {
49
49
  float: #{$global-left};
50
- color: $breadcrumbs-item-color-current;
50
+
51
51
  font-size: $breadcrumbs-item-font-size;
52
+ color: $breadcrumbs-item-color-current;
52
53
  cursor: default;
53
54
 
54
55
  @if $breadcrumbs-item-uppercase {
@@ -60,12 +61,13 @@ $breadcrumbs-item-slash: true !default;
60
61
  $slash: if($global-text-direction == 'ltr', '/', '\\');
61
62
 
62
63
  &:not(:last-child)::after {
63
- color: $medium-gray;
64
- content: $slash;
65
- margin: 0 $breadcrumbs-item-margin;
66
64
  position: relative;
67
65
  top: 1px;
66
+ margin: 0 $breadcrumbs-item-margin;
67
+
68
68
  opacity: 1;
69
+ content: $slash;
70
+ color: $medium-gray;
69
71
  }
70
72
  }
71
73
  @else {
@@ -22,6 +22,10 @@ $buttongroup-child-selector: '.button' !default;
22
22
  /// @type Number
23
23
  $buttongroup-expand-max: 6 !default;
24
24
 
25
+ /// Determines if $button-radius is applied to each button or the button group as a whole. Use $global-radius in _settings.scss to change radius.
26
+ /// @type Boolean
27
+ $buttongroup-radius-on-each: true !default;
28
+
25
29
  /// Add styles for a button group container.
26
30
  /// @param {String} $child-selector [$buttongroup-child-selector] - Selector for the buttons inside a button group.
27
31
  @mixin button-group(
@@ -52,6 +56,21 @@ $buttongroup-expand-max: 6 !default;
52
56
  &:last-child {
53
57
  margin-#{$global-right}: 0;
54
58
  }
59
+
60
+ @if not $buttongroup-radius-on-each {
61
+ border-radius: 0;
62
+
63
+ &:first-child {
64
+ border-top-#{$global-left}-radius: $global-radius;
65
+ border-bottom-#{$global-left}-radius: $global-radius;
66
+ }
67
+
68
+ &:last-child {
69
+ border-top-#{$global-right}-radius: $global-radius;
70
+ border-bottom-#{$global-right}-radius: $global-radius;
71
+ }
72
+ }
73
+
55
74
  }
56
75
  }
57
76
 
@@ -70,10 +89,9 @@ $buttongroup-expand-max: 6 !default;
70
89
  }
71
90
  }
72
91
 
73
- // scss-lint:disable ZeroUnit
74
92
  #{$selector} {
75
93
  @if $global-flexbox {
76
- flex: 1 1 0px;
94
+ flex: 1 1 0px; // sass-lint:disable-line zero-unit
77
95
  }
78
96
  @else {
79
97
  @for $i from 2 through $buttongroup-expand-max {
@@ -113,6 +131,23 @@ $buttongroup-expand-max: 6 !default;
113
131
  &:last-child {
114
132
  margin-bottom: 0;
115
133
  }
134
+
135
+
136
+ @if not $buttongroup-radius-on-each {
137
+ border-radius: 0;
138
+
139
+ &:first-child{
140
+ border-top-#{$global-left}-radius: $global-radius;
141
+ border-top-#{$global-right}-radius: $global-radius;
142
+ }
143
+
144
+ &:last-child {
145
+ margin-bottom: 0;
146
+ border-bottom-#{$global-left}-radius: $global-radius;
147
+ border-bottom-#{$global-right}-radius: $global-radius;
148
+ }
149
+ }
150
+
116
151
  }
117
152
  }
118
153
 
@@ -121,15 +156,29 @@ $buttongroup-expand-max: 6 !default;
121
156
  @mixin button-group-unstack(
122
157
  $selector: $buttongroup-child-selector
123
158
  ) {
124
- // scss-lint:disable ZeroUnit
125
159
  #{$selector} {
126
160
  @if $global-flexbox {
127
- flex: 1 1 0px;
161
+ flex: 1 1 0px; // sass-lint:disable-line zero-unit
128
162
  }
129
163
  @else {
130
164
  width: auto;
131
165
  }
132
166
  margin-bottom: 0;
167
+
168
+ @if not $buttongroup-radius-on-each {
169
+ &:first-child {
170
+ border-top-#{$global-left}-radius: $global-radius;
171
+ border-top-#{$global-right}-radius: 0;
172
+ border-bottom-#{$global-left}-radius: $global-radius;
173
+ }
174
+
175
+ &:last-child {
176
+ border-top-#{$global-right}-radius: $global-radius;
177
+ border-bottom-#{$global-right}-radius: $global-radius;
178
+ border-bottom-#{$global-left}-radius: 0;
179
+ }
180
+ }
181
+
133
182
  }
134
183
  }
135
184
 
@@ -180,8 +229,7 @@ $buttongroup-expand-max: 6 !default;
180
229
  }
181
230
  }
182
231
 
183
- // scss-lint:disable MergeableSelector
184
- &.stacked-for-small.expanded {
232
+ &.stacked-for-small.expanded { // sass-lint:disable-line force-element-nesting
185
233
  @include breakpoint(small only) {
186
234
  display: block;
187
235
 
@@ -30,7 +30,7 @@ $button-background-hover: scale-color($button-background, $lightness: -15%) !def
30
30
  /// @type List
31
31
  $button-color: $white !default;
32
32
 
33
- /// Font color for buttons, if the background is light.
33
+ /// Alternative font color for buttons.
34
34
  /// @type List
35
35
  $button-color-alt: $black !default;
36
36
 
@@ -47,6 +47,10 @@ $button-sizes: (
47
47
  large: 1.25rem,
48
48
  ) !default;
49
49
 
50
+ /// Coloring classes. A map of classes to output in your CSS, like `.secondary`, `.success`, and so on.
51
+ /// @type Map
52
+ $button-palette: $foundation-palette !default;
53
+
50
54
  /// opacity for a disabled button.
51
55
  /// @type List
52
56
  $button-opacity-disabled: 0.25 !default;
@@ -64,21 +68,27 @@ $button-hollow-hover-lightness: -50% !default;
64
68
  $button-margin: 0 0 $global-margin $global-margin !default;
65
69
  }
66
70
 
71
+ /// transitions for buttons.
72
+ /// @type List
73
+ $button-transition: background-color 0.25s ease-out, color 0.25s ease-out !default;
74
+
67
75
  // TODO: Document button-base() mixin
68
76
  @mixin button-base {
69
77
  @include disable-mouse-outline;
70
78
  display: inline-block;
71
- text-align: center;
72
- line-height: 1;
73
- cursor: pointer;
74
- -webkit-appearance: none;
75
- transition: background-color 0.25s ease-out, color 0.25s ease-out;
76
79
  vertical-align: middle;
80
+ margin: $button-margin;
81
+ padding: $button-padding;
82
+
83
+ -webkit-appearance: none;
77
84
  border: 1px solid transparent;
78
85
  border-radius: $button-radius;
79
- padding: $button-padding;
80
- margin: $button-margin;
86
+ transition: $button-transition;
87
+
81
88
  font-size: map-get($button-sizes, default);
89
+ line-height: 1;
90
+ text-align: center;
91
+ cursor: pointer;
82
92
  }
83
93
 
84
94
  /// Expands a button to make it full-width.
@@ -87,8 +97,8 @@ $button-hollow-hover-lightness: -50% !default;
87
97
  @if $expand {
88
98
  display: block;
89
99
  width: 100%;
90
- margin-left: 0;
91
100
  margin-right: 0;
101
+ margin-left: 0;
92
102
  }
93
103
  @else {
94
104
  display: inline-block;
@@ -108,7 +118,7 @@ $button-hollow-hover-lightness: -50% !default;
108
118
  $background-hover-lightness: $button-background-hover-lightness
109
119
  ) {
110
120
  @if $color == auto {
111
- $color: foreground($background, $button-color-alt, $button-color);
121
+ $color: color-pick-contrast($background, ($button-color, $button-color-alt));
112
122
  }
113
123
 
114
124
  @if $background-hover == auto {
@@ -171,9 +181,10 @@ $button-hollow-hover-lightness: -50% !default;
171
181
  @include css-triangle($size, $color, down);
172
182
  position: relative;
173
183
  top: 0.4em; // Aligns the arrow with the text of the button
184
+
185
+ display: inline-block;
174
186
  float: #{$global-right};
175
187
  margin-#{$global-left}: get-side($button-padding, right);
176
- display: inline-block;
177
188
  }
178
189
  }
179
190
 
@@ -219,7 +230,7 @@ $button-hollow-hover-lightness: -50% !default;
219
230
  &.expanded { @include button-expand; }
220
231
 
221
232
  // Colors
222
- @each $name, $color in $foundation-palette {
233
+ @each $name, $color in $button-palette {
223
234
  @if $button-fill != hollow {
224
235
  &.#{$name} {
225
236
  @include button-style($color, auto, auto);
@@ -242,7 +253,7 @@ $button-hollow-hover-lightness: -50% !default;
242
253
  @include button-hollow;
243
254
  @include button-hollow-style;
244
255
 
245
- @each $name, $color in $foundation-palette {
256
+ @each $name, $color in $button-palette {
246
257
  &.#{$name} {
247
258
  @include button-hollow-style($color);
248
259
  }
@@ -255,7 +266,7 @@ $button-hollow-hover-lightness: -50% !default;
255
266
  &[disabled] {
256
267
  @include button-disabled;
257
268
 
258
- @each $name, $color in $foundation-palette {
269
+ @each $name, $color in $button-palette {
259
270
  &.#{$name} {
260
271
  @include button-disabled($color);
261
272
  }
@@ -275,9 +286,9 @@ $button-hollow-hover-lightness: -50% !default;
275
286
 
276
287
  // Button with dropdown arrow only
277
288
  &.arrow-only::after {
278
- margin-#{$global-left}: 0;
279
- float: none;
280
289
  top: -0.1em;
290
+ float: none;
291
+ margin-#{$global-left}: 0;
281
292
  }
282
293
  }
283
294
  }