foundation-rails 5.4.5.0 → 5.5.0.0
Sign up to get free protection for your applications and to get access to all the features.
- data/bower.json +2 -2
- data/foundation-rails.gemspec +1 -1
- data/lib/foundation/rails/generators/install_generator.rb +4 -4
- data/lib/foundation/rails/templates/application.html.erb +3 -2
- data/lib/foundation/rails/templates/application.html.haml +1 -1
- data/lib/foundation/rails/templates/application.html.slim +1 -1
- data/lib/foundation/rails/version.rb +1 -1
- data/vendor/assets/_settings.scss +25 -21
- data/vendor/assets/javascripts/foundation/foundation.abide.js +28 -23
- data/vendor/assets/javascripts/foundation/foundation.accordion.js +10 -8
- data/vendor/assets/javascripts/foundation/foundation.alert.js +4 -4
- data/vendor/assets/javascripts/foundation/foundation.clearing.js +3 -3
- data/vendor/assets/javascripts/foundation/foundation.dropdown.js +139 -22
- data/vendor/assets/javascripts/foundation/foundation.equalizer.js +1 -2
- data/vendor/assets/javascripts/foundation/foundation.interchange.js +14 -10
- data/vendor/assets/javascripts/foundation/foundation.joyride.js +18 -9
- data/vendor/assets/javascripts/foundation/foundation.js +86 -21
- data/vendor/assets/javascripts/foundation/foundation.magellan.js +15 -6
- data/vendor/assets/javascripts/foundation/foundation.offcanvas.js +14 -14
- data/vendor/assets/javascripts/foundation/foundation.orbit.js +3 -3
- data/vendor/assets/javascripts/foundation/foundation.reveal.js +16 -11
- data/vendor/assets/javascripts/foundation/foundation.slider.js +56 -28
- data/vendor/assets/javascripts/foundation/foundation.tab.js +9 -9
- data/vendor/assets/javascripts/foundation/foundation.tooltip.js +1 -1
- data/vendor/assets/javascripts/foundation/foundation.topbar.js +5 -5
- data/vendor/assets/stylesheets/foundation/_functions.scss +57 -12
- data/vendor/assets/stylesheets/foundation/_settings.scss +25 -21
- data/vendor/assets/stylesheets/foundation/components/_accordion.scss +1 -1
- data/vendor/assets/stylesheets/foundation/components/_alert-boxes.scss +2 -0
- data/vendor/assets/stylesheets/foundation/components/_button-groups.scss +1 -2
- data/vendor/assets/stylesheets/foundation/components/_buttons.scss +4 -5
- data/vendor/assets/stylesheets/foundation/components/_dropdown-buttons.scss +11 -10
- data/vendor/assets/stylesheets/foundation/components/_dropdown.scss +1 -0
- data/vendor/assets/stylesheets/foundation/components/_forms.scss +31 -32
- data/vendor/assets/stylesheets/foundation/components/_global.scss +53 -25
- data/vendor/assets/stylesheets/foundation/components/_grid.scss +18 -4
- data/vendor/assets/stylesheets/foundation/components/_icon-bar.scss +51 -15
- data/vendor/assets/stylesheets/foundation/components/_labels.scss +2 -2
- data/vendor/assets/stylesheets/foundation/components/_offcanvas.scss +8 -6
- data/vendor/assets/stylesheets/foundation/components/_orbit.scss +11 -11
- data/vendor/assets/stylesheets/foundation/components/_panels.scss +6 -0
- data/vendor/assets/stylesheets/foundation/components/_reveal.scss +6 -3
- data/vendor/assets/stylesheets/foundation/components/_sub-nav.scss +1 -3
- data/vendor/assets/stylesheets/foundation/components/_switches.scss +25 -13
- data/vendor/assets/stylesheets/foundation/components/_tabs.scss +2 -2
- data/vendor/assets/stylesheets/foundation/components/_toolbar.scss +3 -3
- data/vendor/assets/stylesheets/foundation/components/_top-bar.scss +64 -53
- data/vendor/assets/stylesheets/foundation/components/_visibility.scss +7 -7
- data/vendor/assets/stylesheets/normalize.scss +5 -3
- metadata +8 -8
@@ -15,15 +15,21 @@ $include-html-icon-bar-classes: $include-html-classes !default;
|
|
15
15
|
// We use these to style the icon-bar and items
|
16
16
|
$icon-bar-bg: $oil !default;
|
17
17
|
$icon-bar-font-color: $white !default;
|
18
|
+
$icon-bar-font-color-hover: $icon-bar-font-color !default;
|
18
19
|
$icon-bar-font-size: 1rem !default;
|
19
20
|
$icon-bar-hover-color: $primary-color !default;
|
20
21
|
$icon-bar-icon-color: $white !default;
|
22
|
+
$icon-bar-icon-color-hover: $icon-bar-icon-color !default;
|
21
23
|
$icon-bar-icon-size: 1.875rem !default;
|
22
24
|
$icon-bar-image-width: 1.875rem !default;
|
23
25
|
$icon-bar-image-height: 1.875rem !default;
|
24
26
|
$icon-bar-active-color: $primary-color !default;
|
25
27
|
$icon-bar-item-padding: 1.25rem !default;
|
26
28
|
|
29
|
+
// We use this to set default opacity and cursor for disabled icons.
|
30
|
+
$icon-bar-disabled-opacity: 0.7 !default;
|
31
|
+
$icon-bar-disabled-cursor: $cursor-default-value !default;
|
32
|
+
|
27
33
|
//
|
28
34
|
// @mixins
|
29
35
|
//
|
@@ -31,7 +37,7 @@ $icon-bar-item-padding: 1.25rem !default;
|
|
31
37
|
// We use this mixin to create the base styles for our Icon bar element.
|
32
38
|
//
|
33
39
|
@mixin icon-bar-base() {
|
34
|
-
|
40
|
+
|
35
41
|
width: 100%;
|
36
42
|
font-size: 0;
|
37
43
|
display: inline-block;
|
@@ -45,9 +51,9 @@ $icon-bar-item-padding: 1.25rem !default;
|
|
45
51
|
padding: $icon-bar-item-padding;
|
46
52
|
float: left;
|
47
53
|
|
48
|
-
i, img {
|
54
|
+
i, img {
|
49
55
|
display: block;
|
50
|
-
margin: 0 auto;
|
56
|
+
margin: 0 auto;
|
51
57
|
|
52
58
|
& + label {
|
53
59
|
margin-top: .0625rem;
|
@@ -67,8 +73,8 @@ $icon-bar-item-padding: 1.25rem !default;
|
|
67
73
|
|
68
74
|
&.label-right > * {
|
69
75
|
|
70
|
-
i, img {
|
71
|
-
margin: 0 .0625rem 0 0;
|
76
|
+
i, img {
|
77
|
+
margin: 0 .0625rem 0 0;
|
72
78
|
display: inline-block;
|
73
79
|
|
74
80
|
& + label {
|
@@ -132,7 +138,7 @@ $icon-bar-item-padding: 1.25rem !default;
|
|
132
138
|
font-size: $font-size;
|
133
139
|
padding: $padding;
|
134
140
|
|
135
|
-
i, img {
|
141
|
+
i, img {
|
136
142
|
|
137
143
|
& + label {
|
138
144
|
margin-top: .0625rem;
|
@@ -154,26 +160,52 @@ $icon-bar-item-padding: 1.25rem !default;
|
|
154
160
|
@mixin icon-bar-style(
|
155
161
|
$bar-bg:$icon-bar-bg,
|
156
162
|
$bar-font-color:$icon-bar-font-color,
|
163
|
+
$bar-font-color-hover:$icon-bar-font-color-hover,
|
157
164
|
$bar-hover-color:$icon-bar-hover-color,
|
158
165
|
$bar-icon-color:$icon-bar-icon-color,
|
166
|
+
$bar-icon-color-hover:$icon-bar-icon-color-hover,
|
159
167
|
$bar-active-color:$icon-bar-active-color,
|
160
|
-
$base-style:true
|
168
|
+
$base-style:true,
|
169
|
+
$disabled:false) {
|
161
170
|
|
162
171
|
@if $base-style {
|
163
|
-
|
172
|
+
|
164
173
|
background: $bar-bg;
|
165
174
|
|
166
175
|
& > * {
|
176
|
+
label { color: $bar-font-color; }
|
167
177
|
|
168
|
-
|
178
|
+
i { color: $bar-icon-color; }
|
179
|
+
}
|
169
180
|
|
170
|
-
|
181
|
+
& > a:hover {
|
171
182
|
|
172
|
-
|
173
|
-
|
174
|
-
}
|
183
|
+
background: $bar-hover-color;
|
184
|
+
|
185
|
+
label { color: $bar-font-color-hover; }
|
186
|
+
|
187
|
+
i { color: $bar-icon-color-hover; }
|
188
|
+
}
|
189
|
+
|
190
|
+
& > a.active {
|
191
|
+
|
192
|
+
background: $bar-active-color;
|
193
|
+
|
194
|
+
label { color: $bar-font-color-hover; }
|
195
|
+
|
196
|
+
i { color: $bar-icon-color-hover; }
|
175
197
|
}
|
176
198
|
}
|
199
|
+
@if $disabled {
|
200
|
+
.item.disabled {
|
201
|
+
opacity: $icon-bar-disabled-opacity;
|
202
|
+
cursor: $icon-bar-disabled-cursor;
|
203
|
+
>* {
|
204
|
+
opacity: $icon-bar-disabled-opacity;
|
205
|
+
cursor: $icon-bar-disabled-cursor;
|
206
|
+
}
|
207
|
+
}
|
208
|
+
}
|
177
209
|
|
178
210
|
}
|
179
211
|
|
@@ -185,22 +217,26 @@ $icon-bar-item-padding: 1.25rem !default;
|
|
185
217
|
// $bar-icon-color - maybe we could skip explaining them all? Okay this one does change icon color if you use an icon font
|
186
218
|
// $bar-active-color - the color of an active / hover state
|
187
219
|
// $base-style - Apply base styles? Default: true.
|
220
|
+
// $disabled - Allow disabled icons? Default: false.
|
188
221
|
|
189
222
|
@mixin icon-bar(
|
190
223
|
$bar-bg:$icon-bar-bg,
|
191
224
|
$bar-font-color:$icon-bar-font-color,
|
225
|
+
$bar-font-color-hover:$icon-bar-font-color-hover,
|
192
226
|
$bar-hover-color:$icon-bar-hover-color,
|
193
227
|
$bar-icon-color:$icon-bar-icon-color,
|
228
|
+
$bar-icon-color-hover:$icon-bar-icon-color-hover,
|
194
229
|
$bar-active-color:$icon-bar-active-color,
|
195
230
|
$padding: $icon-bar-item-padding,
|
196
231
|
$font-size: $icon-bar-font-size,
|
197
232
|
$icon-size: $icon-bar-icon-size,
|
198
233
|
$image-width: $icon-bar-image-width,
|
199
234
|
$image-height: $icon-bar-image-height,
|
200
|
-
$base-style:true
|
235
|
+
$base-style:true,
|
236
|
+
$disabled:false) {
|
201
237
|
@include icon-bar-base();
|
202
238
|
@include icon-bar-size($padding, $font-size, $icon-size, $image-width, $image-height);
|
203
|
-
@include icon-bar-style($bar-bg, $bar-font-color, $bar-hover-color, $bar-icon-color, $bar-active-color, $base-style);
|
239
|
+
@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);
|
204
240
|
}
|
205
241
|
|
206
242
|
@include exports("icon-bar") {
|
@@ -33,13 +33,13 @@ $label-font-family: $body-font-family !default;
|
|
33
33
|
white-space: nowrap;
|
34
34
|
display: inline-block;
|
35
35
|
position: relative;
|
36
|
-
margin-bottom:
|
36
|
+
margin-bottom: auto;
|
37
37
|
}
|
38
38
|
|
39
39
|
// @mixins
|
40
40
|
//
|
41
41
|
// We use this mixin to add label size styles.
|
42
|
-
// $padding - Used to determine label padding. Default: $label-padding || rem-calc(
|
42
|
+
// $padding - Used to determine label padding. Default: $label-padding || rem-calc(4 8 4) !default
|
43
43
|
// $text-size - Used to determine label text-size. Default: $text-size found in settings
|
44
44
|
@mixin label-size($padding:$label-padding, $text-size:$label-font-sizing) {
|
45
45
|
@if $padding { padding: $padding; }
|
@@ -117,11 +117,11 @@ $menu-slide: "transform 500ms ease" !default;
|
|
117
117
|
-ms-overflow-style: -ms-autohiding-scrollbar;
|
118
118
|
|
119
119
|
@if $position == left {
|
120
|
-
@include translate3d(-100
|
120
|
+
@include translate3d(-100%,0,0);
|
121
121
|
left: 0;
|
122
122
|
}
|
123
123
|
@if $position == right {
|
124
|
-
@include translate3d(100
|
124
|
+
@include translate3d(100%,0,0);
|
125
125
|
right: 0;
|
126
126
|
}
|
127
127
|
}
|
@@ -139,7 +139,8 @@ $menu-slide: "transform 500ms ease" !default;
|
|
139
139
|
// INNER WRAP
|
140
140
|
// Main content area that moves to reveal the off-canvas nav
|
141
141
|
@mixin inner-wrap {
|
142
|
-
@include kill-flicker;
|
142
|
+
// @include kill-flicker;
|
143
|
+
// removed for now till chrome fixes backface issue
|
143
144
|
@include wrap-base;
|
144
145
|
@include clearfix;
|
145
146
|
-webkit-transition: -webkit-#{$menu-slide};
|
@@ -200,7 +201,8 @@ $menu-slide: "transform 500ms ease" !default;
|
|
200
201
|
height: $tabbar-height;
|
201
202
|
top: 0;
|
202
203
|
@media #{$medium-up} {
|
203
|
-
&.left
|
204
|
+
&.left { text-align: left; }
|
205
|
+
&.right { text-align: right; }
|
204
206
|
}
|
205
207
|
|
206
208
|
// still need to make these non-presentational
|
@@ -483,14 +485,14 @@ $menu-slide: "transform 500ms ease" !default;
|
|
483
485
|
@if $include-html-off-canvas-classes {
|
484
486
|
.left-submenu {
|
485
487
|
@include off-canvas-submenu($position: left);
|
486
|
-
&.move-right {
|
488
|
+
&.move-right, &.offcanvas-overlap-right, &.offcanvas-overlap {
|
487
489
|
@include translate3d(0%,0,0);
|
488
490
|
}
|
489
491
|
}
|
490
492
|
|
491
493
|
.right-submenu {
|
492
494
|
@include off-canvas-submenu($position: right);
|
493
|
-
&.move-left {
|
495
|
+
&.move-left, &.offcanvas-overlap-left, &.offcanvas-overlap {
|
494
496
|
@include translate3d(0%,0,0);
|
495
497
|
}
|
496
498
|
}
|
@@ -116,7 +116,7 @@ $orbit-timer-hide-for-small: true !default;
|
|
116
116
|
}
|
117
117
|
}
|
118
118
|
|
119
|
-
|
119
|
+
|
120
120
|
.orbit-container {
|
121
121
|
overflow: hidden;
|
122
122
|
width: 100%;
|
@@ -147,10 +147,10 @@ $orbit-timer-hide-for-small: true !default;
|
|
147
147
|
|
148
148
|
&:first-child {
|
149
149
|
@if $text-direction == rtl {
|
150
|
-
margin-right: 0
|
150
|
+
margin-right: 0;
|
151
151
|
}
|
152
152
|
@else {
|
153
|
-
margin-left: 0
|
153
|
+
margin-left: 0;
|
154
154
|
}
|
155
155
|
}
|
156
156
|
|
@@ -194,7 +194,7 @@ $orbit-timer-hide-for-small: true !default;
|
|
194
194
|
height: 3px;
|
195
195
|
background-color: $orbit-timer-bg;
|
196
196
|
display: block;
|
197
|
-
width: 0
|
197
|
+
width: 0;
|
198
198
|
position: relative;
|
199
199
|
right: 20px;
|
200
200
|
top: 5px;
|
@@ -205,7 +205,7 @@ $orbit-timer-hide-for-small: true !default;
|
|
205
205
|
& > span {
|
206
206
|
display: none;
|
207
207
|
position: absolute;
|
208
|
-
top:
|
208
|
+
top: 0;
|
209
209
|
#{$opposite-direction}: 0;
|
210
210
|
width: 11px;
|
211
211
|
height: 14px;
|
@@ -213,26 +213,26 @@ $orbit-timer-hide-for-small: true !default;
|
|
213
213
|
border-top: none;
|
214
214
|
border-bottom: none;
|
215
215
|
}
|
216
|
-
|
216
|
+
|
217
217
|
// Pause button
|
218
218
|
&.paused {
|
219
219
|
& > span {
|
220
220
|
#{$opposite-direction}: -4px;
|
221
|
-
top:
|
221
|
+
top: 0;
|
222
222
|
width: 11px;
|
223
223
|
height: 14px;
|
224
224
|
border: inset 8px;
|
225
225
|
border-left-style: solid;
|
226
226
|
border-color: transparent;
|
227
227
|
border-left-color: $white;
|
228
|
-
&.dark {
|
228
|
+
&.dark {
|
229
229
|
border-left-color: $oil;
|
230
230
|
}
|
231
231
|
}
|
232
232
|
}
|
233
233
|
}
|
234
|
-
|
235
|
-
|
234
|
+
|
235
|
+
|
236
236
|
|
237
237
|
&:hover .orbit-timer > span { display: block; }
|
238
238
|
|
@@ -345,7 +345,7 @@ $orbit-timer-hide-for-small: true !default;
|
|
345
345
|
.orbit-slides-container {height: auto !important;}
|
346
346
|
.orbit-slides-container > * {
|
347
347
|
position: relative;
|
348
|
-
margin:0
|
348
|
+
margin:0 !important;
|
349
349
|
opacity:1 !important;
|
350
350
|
}
|
351
351
|
|
@@ -28,6 +28,7 @@ $panel-font-color-alt: $white !default;
|
|
28
28
|
|
29
29
|
$panel-header-adjust: true !default;
|
30
30
|
$callout-panel-link-color: $primary-color !default;
|
31
|
+
$callout-panel-link-color-hover: scale-color($callout-panel-link-color, $lightness: -14%) !default;
|
31
32
|
//
|
32
33
|
// @mixins
|
33
34
|
//
|
@@ -82,6 +83,11 @@ $callout-panel-link-color: $primary-color !default;
|
|
82
83
|
@include panel(scale-color($primary-color, $lightness: 94%));
|
83
84
|
a:not(.button) {
|
84
85
|
color: $callout-panel-link-color;
|
86
|
+
|
87
|
+
&:hover,
|
88
|
+
&:focus {
|
89
|
+
color: $callout-panel-link-color-hover;
|
90
|
+
}
|
85
91
|
}
|
86
92
|
}
|
87
93
|
|
@@ -3,6 +3,7 @@
|
|
3
3
|
// Licensed under MIT Open Source
|
4
4
|
|
5
5
|
@import "global";
|
6
|
+
@import "grid";
|
6
7
|
|
7
8
|
//
|
8
9
|
// @name _reveal.scss
|
@@ -25,8 +26,8 @@ $reveal-box-shadow: 0 0 10px rgba($black,.4) !default;
|
|
25
26
|
|
26
27
|
// We use these to style the reveal close button
|
27
28
|
$reveal-close-font-size: rem-calc(40) !default;
|
28
|
-
$reveal-close-top: rem-calc(
|
29
|
-
$reveal-close-side: rem-calc(
|
29
|
+
$reveal-close-top: rem-calc(10) !default;
|
30
|
+
$reveal-close-side: rem-calc(22) !default;
|
30
31
|
$reveal-close-color: $base !default;
|
31
32
|
$reveal-close-weight: $font-weight-bold !default;
|
32
33
|
|
@@ -48,7 +49,8 @@ $close-reveal-modal-class: "close-reveal-modal" !default;
|
|
48
49
|
|
49
50
|
// We use this to create the reveal background overlay styles
|
50
51
|
@mixin reveal-bg( $include-z-index-value: true ) {
|
51
|
-
position: fixed;
|
52
|
+
//position: fixed;
|
53
|
+
position: absolute; // allows modal background to extend beyond window position
|
52
54
|
top: 0;
|
53
55
|
bottom: 0;
|
54
56
|
left: 0;
|
@@ -190,6 +192,7 @@ $close-reveal-modal-class: "close-reveal-modal" !default;
|
|
190
192
|
height:100%;
|
191
193
|
height: 100vh;
|
192
194
|
min-height:100vh;
|
195
|
+
max-width: none !important;
|
193
196
|
margin-left: 0 !important;
|
194
197
|
}
|
195
198
|
|
@@ -63,8 +63,6 @@ $sub-nav-item-divider-margin: rem-calc(12) !default;
|
|
63
63
|
overflow: hidden;
|
64
64
|
margin: $sub-nav-list-margin;
|
65
65
|
padding-top: $sub-nav-list-padding-top;
|
66
|
-
margin-#{$opposite-direction}: 0;
|
67
|
-
margin-#{$default-float}: rem-calc(-12);
|
68
66
|
|
69
67
|
dt {
|
70
68
|
text-transform: uppercase;
|
@@ -76,7 +74,7 @@ $sub-nav-item-divider-margin: rem-calc(12) !default;
|
|
76
74
|
float: $default-float;
|
77
75
|
display: inline;
|
78
76
|
margin-#{$default-float}: rem-calc(16);
|
79
|
-
margin-bottom:
|
77
|
+
margin-bottom: 0;
|
80
78
|
font-family: $sub-nav-font-family;
|
81
79
|
font-weight: $sub-nav-font-weight;
|
82
80
|
font-size: $font-size;
|
@@ -43,12 +43,19 @@ $switch-active-color: $primary-color !default;
|
|
43
43
|
@mixin switch-base(
|
44
44
|
$transition-speed:$switch-paddle-transition-speed,
|
45
45
|
$transition-ease:$switch-paddle-transition-ease) {
|
46
|
-
|
46
|
+
|
47
|
+
padding: 0;
|
48
|
+
border: none;
|
49
|
+
position: relative;
|
50
|
+
outline: 0;
|
51
|
+
-webkit-user-select: none;
|
52
|
+
-moz-user-select: none;
|
53
|
+
user-select: none;
|
47
54
|
|
48
55
|
// Default label styles for type and transition
|
49
56
|
label {
|
50
57
|
display: block;
|
51
|
-
margin-bottom: $switch-height-med / 2;
|
58
|
+
margin-bottom: ($switch-height-med / 2);
|
52
59
|
position: relative;
|
53
60
|
color: transparent;
|
54
61
|
background: $switch-bg;
|
@@ -80,15 +87,20 @@ $switch-active-color: $primary-color !default;
|
|
80
87
|
content: "";
|
81
88
|
display: block;
|
82
89
|
background: $switch-paddle-bg;
|
83
|
-
position: absolute;
|
84
|
-
|
90
|
+
position: absolute;
|
91
|
+
top: .25rem;
|
92
|
+
left: .25rem;
|
93
|
+
width: $switch-height-med - 0.5rem;
|
94
|
+
height: $switch-height-med - 0.5rem;
|
85
95
|
|
86
96
|
-webkit-transition: left $transition-speed $transition-ease;
|
87
97
|
-moz-transition: left $transition-speed $transition-ease;
|
98
|
+
-o-transition: translate3d(0,0,0);
|
88
99
|
transition: left $transition-speed $transition-ease;
|
89
100
|
|
90
101
|
-webkit-transform: translate3d(0,0,0);
|
91
102
|
-moz-transform: translate3d(0,0,0);
|
103
|
+
-o-transform: translate3d(0,0,0);
|
92
104
|
transform: translate3d(0,0,0);
|
93
105
|
}
|
94
106
|
|
@@ -109,11 +121,13 @@ $switch-active-color: $primary-color !default;
|
|
109
121
|
@mixin switch-size($height: $switch-height-med) {
|
110
122
|
|
111
123
|
label {
|
112
|
-
width: $height * 2;
|
124
|
+
width: $height * 2;
|
125
|
+
height: $height;
|
113
126
|
}
|
114
127
|
|
115
128
|
label:after {
|
116
|
-
width: $height - 0.5rem;
|
129
|
+
width: $height - 0.5rem;
|
130
|
+
height: $height - 0.5rem;
|
117
131
|
}
|
118
132
|
|
119
133
|
input:checked + label:after {
|
@@ -131,6 +145,7 @@ $switch-active-color: $primary-color !default;
|
|
131
145
|
// $base-style - Apply base styles? Default: true.
|
132
146
|
@mixin switch-style(
|
133
147
|
$paddle-bg:$switch-paddle-bg,
|
148
|
+
$active-color:$switch-active-color,
|
134
149
|
$radius:false,
|
135
150
|
$base-style:true) {
|
136
151
|
|
@@ -146,7 +161,7 @@ $switch-active-color: $primary-color !default;
|
|
146
161
|
}
|
147
162
|
|
148
163
|
input:checked + label {
|
149
|
-
background: $
|
164
|
+
background: $active-color;
|
150
165
|
}
|
151
166
|
}
|
152
167
|
|
@@ -186,13 +201,10 @@ $switch-active-color: $primary-color !default;
|
|
186
201
|
$paddle-bg: $switch-paddle-bg,
|
187
202
|
$active-color: $switch-active-color,
|
188
203
|
$radius:false,
|
189
|
-
|
190
|
-
padding: 0;
|
191
|
-
border: none;
|
192
|
-
position: relative;
|
204
|
+
$base-style:true) {
|
193
205
|
@include switch-base($transition-speed, $transition-ease);
|
194
206
|
@include switch-size($height);
|
195
|
-
@include switch-style($paddle-bg, $radius, $base-style);
|
207
|
+
@include switch-style($paddle-bg, $active-color, $radius, $base-style);
|
196
208
|
}
|
197
209
|
|
198
210
|
@include exports("switch") {
|
@@ -210,7 +222,7 @@ $switch-active-color: $primary-color !default;
|
|
210
222
|
&.tiny { @include switch-size($switch-height-tny); }
|
211
223
|
|
212
224
|
// Add a radius to the switch
|
213
|
-
&.radius {
|
225
|
+
&.radius {
|
214
226
|
label { @include radius(4px); }
|
215
227
|
label:after { @include radius(3px); }
|
216
228
|
}
|