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 "global";
5
+ @import 'global';
6
6
 
7
7
  //
8
8
  // @variables
@@ -75,12 +75,12 @@ $price-cta-padding: rem-calc(20 20 0) !default;
75
75
  // We use this mixin to create the pricing table title styles
76
76
  @mixin pricing-table-title {
77
77
  background-color: $price-title-bg;
78
- padding: $price-title-padding;
79
- text-align: $price-title-align;
80
78
  color: $price-title-color;
81
- font-weight: $price-title-weight;
82
- font-size: $price-title-size;
83
79
  font-family: $price-title-font-family;
80
+ font-size: $price-title-size;
81
+ font-weight: $price-title-weight;
82
+ padding: $price-title-padding;
83
+ text-align: $price-title-align;
84
84
  }
85
85
 
86
86
  // @mixins
@@ -88,12 +88,12 @@ $price-cta-padding: rem-calc(20 20 0) !default;
88
88
  // We use this mixin to control the pricing table price styles
89
89
  @mixin pricing-table-price {
90
90
  background-color: $price-money-bg;
91
- padding: $price-money-padding;
92
- text-align: $price-money-align;
93
91
  color: $price-money-color;
94
- font-weight: $price-money-weight;
95
- font-size: $price-money-size;
96
92
  font-family: $price-money-font-family;
93
+ font-size: $price-money-size;
94
+ font-weight: $price-money-weight;
95
+ padding: $price-money-padding;
96
+ text-align: $price-money-align;
97
97
  }
98
98
 
99
99
  // @mixins
@@ -101,13 +101,13 @@ $price-cta-padding: rem-calc(20 20 0) !default;
101
101
  // We use this mixin to create the description styles for the pricing table
102
102
  @mixin pricing-table-description {
103
103
  background-color: $price-bg;
104
- padding: $price-desc-padding;
105
- text-align: $price-desc-align;
104
+ border-bottom: $price-desc-bottom-border;
106
105
  color: $price-desc-color;
107
106
  font-size: $price-desc-font-size;
108
107
  font-weight: $price-desc-weight;
109
108
  line-height: $price-desc-line-height;
110
- border-bottom: $price-desc-bottom-border;
109
+ padding: $price-desc-padding;
110
+ text-align: $price-desc-align;
111
111
  }
112
112
 
113
113
  // @mixins
@@ -115,12 +115,12 @@ $price-cta-padding: rem-calc(20 20 0) !default;
115
115
  // We use this mixin to style the bullet items in the pricing table
116
116
  @mixin pricing-table-bullet {
117
117
  background-color: $price-bg;
118
- padding: $price-item-padding;
119
- text-align: $price-item-align;
118
+ border-bottom: $price-item-bottom-border;
120
119
  color: $price-item-color;
121
120
  font-size: $price-item-font-size;
122
121
  font-weight: $price-item-weight;
123
- border-bottom: $price-item-bottom-border;
122
+ padding: $price-item-padding;
123
+ text-align: $price-item-align;
124
124
  }
125
125
 
126
126
  // @mixins
@@ -128,8 +128,8 @@ $price-cta-padding: rem-calc(20 20 0) !default;
128
128
  // We use this mixin to style the CTA area of the pricing tables
129
129
  @mixin pricing-table-cta {
130
130
  background-color: $price-cta-bg;
131
- text-align: $price-cta-align;
132
131
  padding: $price-cta-padding;
132
+ text-align: $price-cta-align;
133
133
  }
134
134
 
135
135
  @include exports("pricing-table") {
@@ -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
@@ -34,10 +34,10 @@ $progress-meter-alert-color: $alert-color !default;
34
34
  // We use this to set up the progress bar container
35
35
  @mixin progress-container {
36
36
  background-color: $progress-bar-color;
37
- height: $progress-bar-height;
38
37
  border: $progress-bar-border-size $progress-bar-border-style $progress-bar-border-color;
39
- padding: $progress-bar-pad;
38
+ height: $progress-bar-height;
40
39
  margin-bottom: $progress-bar-margin-bottom;
40
+ padding: $progress-bar-pad;
41
41
  }
42
42
 
43
43
  // @mixins
@@ -45,8 +45,8 @@ $progress-meter-alert-color: $alert-color !default;
45
45
  // $bg - Default: $progress-meter-color || $primary-color
46
46
  @mixin progress-meter($bg:$progress-meter-color) {
47
47
  background: $bg;
48
- height: 100%;
49
48
  display: block;
49
+ height: 100%;
50
50
  }
51
51
 
52
52
 
@@ -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 _range-slider.scss
@@ -44,7 +44,7 @@ $range-slider-handle-round: $global-rounded !default;
44
44
  $range-slider-handle-bg-hover-color: scale-color($primary-color, $lightness: -12%) !default;
45
45
  $range-slider-handle-cursor: pointer !default;
46
46
 
47
- $range-slider-disabled-opacity: 0.7 !default;
47
+ $range-slider-disabled-opacity: .7 !default;
48
48
  $range-slider-disabled-cursor: $cursor-disabled-value !default;
49
49
 
50
50
  //
@@ -52,19 +52,19 @@ $range-slider-disabled-cursor: $cursor-disabled-value !default;
52
52
  //
53
53
 
54
54
  @mixin range-slider-bar-base($vertical: false) {
55
- position: relative;
56
55
  border: $range-slider-bar-border-width $range-slider-bar-border-style $range-slider-bar-border-color;
57
56
  margin: rem-calc(20 0);
57
+ position: relative;
58
58
  -ms-touch-action: none;
59
59
  touch-action: none;
60
60
  @if $vertical == true {
61
61
  display: inline-block;
62
- width: $range-slider-vertical-bar-width;
63
62
  height: $range-slider-vertical-bar-height;
63
+ width: $range-slider-vertical-bar-width;
64
64
  } @else {
65
65
  display: block;
66
- width: $range-slider-bar-width;
67
66
  height: $range-slider-bar-height;
67
+ width: $range-slider-bar-width;
68
68
  }
69
69
  }
70
70
  @mixin range-slider-bar-style(
@@ -89,19 +89,20 @@ $range-slider-disabled-cursor: $cursor-disabled-value !default;
89
89
  }
90
90
 
91
91
  @mixin range-slider-handle-base() {
92
+ border: $range-slider-handle-border-width $range-slider-handle-border-style $range-slider-handle-border-color;
93
+ cursor: $range-slider-handle-cursor;
92
94
  display: inline-block;
95
+ height: $range-slider-handle-height;
93
96
  position: absolute;
94
- z-index: 1;
95
97
  top: $range-slider-handle-position-top;
96
98
  width: $range-slider-handle-width;
97
- height: $range-slider-handle-height;
98
- border: $range-slider-handle-border-width $range-slider-handle-border-style $range-slider-handle-border-color;
99
- cursor: $range-slider-handle-cursor;
99
+ z-index: 1;
100
100
 
101
101
  // This removes the 300ms touch delay on Windows 8
102
102
  -ms-touch-action: manipulation;
103
- touch-action: manipulation;
103
+ touch-action: manipulation;
104
104
  }
105
+
105
106
  @mixin range-slider-handle-style(
106
107
  $bg: true,
107
108
  $radius: false,
@@ -118,6 +119,7 @@ $range-slider-disabled-cursor: $cursor-disabled-value !default;
118
119
  background: $range-slider-handle-bg-hover-color;
119
120
  }
120
121
  }
122
+
121
123
  @mixin range-slider-handle() {
122
124
  @include range-slider-handle-base;
123
125
  @include range-slider-handle-style;
@@ -132,15 +134,18 @@ $range-slider-disabled-cursor: $cursor-disabled-value !default;
132
134
  &.vertical-range {
133
135
  @include range-slider-bar-base($vertical: true);
134
136
  .range-slider-handle {
135
- margin-top: 0;
137
+ bottom: -($range-slider-vertical-bar-height - $range-slider-handle-width);
136
138
  margin-#{$default-float}: -($range-slider-handle-width / 4);
139
+ margin-top: 0;
137
140
  position: absolute;
138
- bottom: -($range-slider-vertical-bar-height - $range-slider-handle-width);
139
141
  }
140
142
  .range-slider-active-segment {
141
- width: $range-slider-bar-height - rem-calc((strip-unit($range-slider-bar-border-width) * 2));
142
- height: auto;
143
+ border-bottom-left-radius: inherit;
144
+ border-bottom-right-radius: inherit;
145
+ border-top-left-radius: initial;
143
146
  bottom: 0;
147
+ height: auto;
148
+ width: $range-slider-bar-height - rem-calc((strip-unit($range-slider-bar-border-width) * 2));
144
149
  }
145
150
  }
146
151
  &.radius {
@@ -157,10 +162,12 @@ $range-slider-disabled-cursor: $cursor-disabled-value !default;
157
162
  }
158
163
  }
159
164
  .range-slider-active-segment {
165
+ background: $range-slider-active-segment-bg-color;
166
+ border-bottom-left-radius: inherit;
167
+ border-top-left-radius: inherit;
160
168
  display: inline-block;
161
- position: absolute;
162
169
  height: $range-slider-bar-height - rem-calc((strip-unit($range-slider-bar-border-width) * 2));
163
- background: $range-slider-active-segment-bg-color;
170
+ position: absolute;
164
171
  }
165
172
  .range-slider-handle {
166
173
  @include range-slider-handle-base;
@@ -2,8 +2,8 @@
2
2
  // foundation.zurb.com
3
3
  // Licensed under MIT Open Source
4
4
 
5
- @import "global";
6
- @import "grid";
5
+ @import 'global';
6
+ @import 'grid';
7
7
 
8
8
  //
9
9
  // @name _reveal.scss
@@ -21,7 +21,7 @@ $reveal-modal-bg: $white !default;
21
21
  $reveal-position-top: rem-calc(100) !default;
22
22
  $reveal-default-width: 80% !default;
23
23
  $reveal-max-width: $row-width !default;
24
- $reveal-modal-padding: rem-calc(20) !default;
24
+ $reveal-modal-padding: rem-calc(30) !default;
25
25
  $reveal-box-shadow: 0 0 10px rgba($black,.4) !default;
26
26
 
27
27
  // We use these to style the reveal close button
@@ -52,16 +52,16 @@ $z-index-base: 1005;
52
52
 
53
53
  // We use this to create the reveal background overlay styles
54
54
  @mixin reveal-bg( $include-z-index-value: true ) {
55
- position: fixed;
56
55
  // position: absolute; // allows modal background to extend beyond window position
57
- top: 0;
56
+ background: $reveal-overlay-bg-old; // Autoprefixer should be used to avoid such variables needed when Foundation for Sites can do so in the near future.
57
+ background: $reveal-overlay-bg;
58
58
  bottom: 0;
59
+ display: none;
59
60
  left: 0;
61
+ position: fixed;
60
62
  right: 0;
61
- background: $reveal-overlay-bg-old; // Autoprefixer should be used to avoid such variables needed when Foundation for Sites can do so in the near future.
62
- background: $reveal-overlay-bg;
63
+ top: 0;
63
64
  z-index: if( $include-z-index-value, $z-index-base - 1, auto );
64
- display: none;
65
65
  #{$default-float}: 0;
66
66
  }
67
67
 
@@ -72,13 +72,13 @@ $z-index-base: 1005;
72
72
  //
73
73
  @mixin reveal-modal-base( $base-style: true, $width:$reveal-default-width, $max-width:$reveal-max-width, $border-radius: $reveal-radius) {
74
74
  @if $base-style {
75
- visibility: hidden;
75
+ border-radius: $border-radius;
76
76
  display: none;
77
77
  position: absolute;
78
- z-index: $z-index-base;
79
- width: 100%;
80
78
  top:0;
81
- border-radius: $border-radius;
79
+ visibility: hidden;
80
+ width: 100%;
81
+ z-index: $z-index-base;
82
82
  #{$default-float}: 0;
83
83
 
84
84
  @media #{$small-only} {
@@ -89,18 +89,18 @@ $z-index-base: 1005;
89
89
  .column, .columns { min-width: 0; }
90
90
 
91
91
  // Get rid of margin from first and last element inside modal
92
- & > :first-child { margin-top: 0; }
92
+ > :first-child { margin-top: 0; }
93
93
 
94
- & > :last-child { margin-bottom: 0; }
94
+ > :last-child { margin-bottom: 0; }
95
95
  }
96
96
 
97
97
  @if $width {
98
98
  @media #{$medium-up} {
99
- width: $width;
100
- max-width: $max-width;
101
99
  left: 0;
102
- right: 0;
103
100
  margin: 0 auto;
101
+ max-width: $max-width;
102
+ right: 0;
103
+ width: $width;
104
104
  }
105
105
  }
106
106
  }
@@ -152,14 +152,14 @@ $z-index-base: 1005;
152
152
  //
153
153
  // $color - Default: $reveal-close-color || $base
154
154
  @mixin reveal-close($color:$reveal-close-color) {
155
+ color: $color;
156
+ cursor: $cursor-pointer-value;
155
157
  font-size: $reveal-close-font-size;
158
+ font-weight: $reveal-close-weight;
156
159
  line-height: 1;
157
160
  position: absolute;
158
161
  top: $reveal-close-top;
159
162
  #{$opposite-direction}: $reveal-close-side;
160
- color: $color;
161
- font-weight: $reveal-close-weight;
162
- cursor: $cursor-pointer-value;
163
163
  }
164
164
 
165
165
  @include exports("reveal") {
@@ -172,7 +172,7 @@ $z-index-base: 1005;
172
172
  @include reveal-modal-base;
173
173
  @include reveal-modal-style(
174
174
  $bg:$reveal-modal-bg,
175
- $padding:$reveal-modal-padding * 1.5,
175
+ $padding:$reveal-modal-padding,
176
176
  $border:true,
177
177
  $box-shadow:true,
178
178
  $radius:false,
@@ -189,15 +189,15 @@ $z-index-base: 1005;
189
189
  &.xlarge { @include reveal-modal-base(false, 95%); }
190
190
  &.full {
191
191
  @include reveal-modal-base(false, 100%);
192
- top:0;
193
- left:0;
194
- height:100%;
195
192
  height: 100vh;
196
- min-height:100vh;
197
- max-width: none !important;
193
+ height:100%;
194
+ left:0;
198
195
  margin-left: 0 !important;
196
+ max-width: none !important;
197
+ min-height:100vh;
198
+ top:0;
199
199
  }
200
-
200
+
201
201
  // Modals pushed to back
202
202
  &.toback {
203
203
  z-index: $z-index-base - 2;
@@ -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
@@ -22,7 +22,7 @@ $side-nav-list-margin: rem-calc(0 0 7 0) !default;
22
22
  $side-nav-link-color: $primary-color !default;
23
23
  $side-nav-link-color-active: scale-color($side-nav-link-color, $lightness: 30%) !default;
24
24
  $side-nav-link-color-hover: scale-color($side-nav-link-color, $lightness: 30%) !default;
25
- $side-nav-link-bg-hover: hsla(0, 0, 0, 0.025) !default;
25
+ $side-nav-link-bg-hover: hsla(0, 0, 0, .025) !default;
26
26
  $side-nav-link-margin: 0 !default;
27
27
  $side-nav-link-padding: rem-calc(7 14) !default;
28
28
  $side-nav-font-size: rem-calc(14) !default;
@@ -40,7 +40,7 @@ $side-nav-heading-text-transform: uppercase !default;
40
40
  // We use these to control border styles
41
41
  $side-nav-divider-size: 1px !default;
42
42
  $side-nav-divider-style: solid !default;
43
- $side-nav-divider-color: scale-color($white, $lightness: 10%) !default;
43
+ $side-nav-divider-color: scale-color($white, $lightness: -10%) !default;
44
44
 
45
45
 
46
46
  //
@@ -58,23 +58,24 @@ $side-nav-divider-color: scale-color($white, $lightness: 10%) !default;
58
58
  $divider-color:$side-nav-divider-color,
59
59
  $font-size:$side-nav-font-size,
60
60
  $link-color:$side-nav-link-color,
61
+ $link-color-active:$side-nav-link-color-active,
61
62
  $link-color-hover:$side-nav-link-color-hover,
62
63
  $link-bg-hover:$side-nav-link-bg-hover) {
63
64
  display: block;
65
+ font-family: $side-nav-font-family;
66
+ list-style-position: $side-nav-list-position;
67
+ list-style-type: $side-nav-list-type;
64
68
  margin: 0;
65
69
  padding: $side-nav-padding;
66
- list-style-type: $side-nav-list-type;
67
- list-style-position: $side-nav-list-position;
68
- font-family: $side-nav-font-family;
69
70
 
70
71
  li {
71
- margin: $side-nav-list-margin;
72
72
  font-size: $font-size;
73
73
  font-weight: $side-nav-font-weight;
74
+ margin: $side-nav-list-margin;
74
75
 
75
76
  a:not(.button) {
76
- display: block;
77
77
  color: $link-color;
78
+ display: block;
78
79
  margin: $side-nav-link-margin;
79
80
  padding: $side-nav-link-padding;
80
81
  &:hover,
@@ -82,19 +83,22 @@ $side-nav-divider-color: scale-color($white, $lightness: 10%) !default;
82
83
  background: $link-bg-hover;
83
84
  color: $link-color-hover;
84
85
  }
86
+ &:active {
87
+ color: $link-color-active;
88
+ }
85
89
  }
86
90
 
87
91
  &.active > a:first-child:not(.button) {
88
92
  color: $side-nav-link-color-active;
89
- font-weight: $side-nav-font-weight-active;
90
93
  font-family: $side-nav-font-family-active;
94
+ font-weight: $side-nav-font-weight-active;
91
95
  }
92
96
 
93
97
  &.divider {
94
98
  border-top: $side-nav-divider-size $side-nav-divider-style;
95
99
  height: 0;
96
- padding: 0;
97
100
  list-style: none;
101
+ padding: 0;
98
102
  border-top-color: $divider-color;
99
103
  }
100
104
 
@@ -111,6 +115,6 @@ $side-nav-divider-color: scale-color($white, $lightness: 10%) !default;
111
115
 
112
116
  @include exports("side-nav") {
113
117
  @if $include-html-nav-classes {
114
- .side-nav { @include side-nav; }
118
+ .side-nav {@include side-nav;}
115
119
  }
116
120
  }
@@ -2,9 +2,9 @@
2
2
  // foundation.zurb.com
3
3
  // Licensed under MIT Open Source
4
4
 
5
- @import "global";
6
- @import "buttons";
7
- @import "dropdown-buttons";
5
+ @import 'global';
6
+ @import 'buttons';
7
+ @import 'dropdown-buttons';
8
8
 
9
9
  //
10
10
  // @name _split-buttons.scss
@@ -22,6 +22,7 @@ $split-button-function-factor: 10% !default;
22
22
  $split-button-pip-color: $white !default;
23
23
  $split-button-pip-color-alt: $oil !default;
24
24
  $split-button-active-bg-tint: rgba(0,0,0,0.1) !default;
25
+ $split-button-span-border-color: rgba(255,255,255,0.5) !default;
25
26
 
26
27
  // We use these to control tiny split buttons
27
28
  $split-button-padding-tny: $button-pip-tny * 10 !default;
@@ -60,12 +61,12 @@ $split-button-pip-default-float-lrg: rem-calc(-6) !default;
60
61
  //
61
62
  // $padding - Type of padding to apply. Default: medium. Options: tiny, small, medium, large.
62
63
  // $pip-color - Color of the triangle. Default: $split-button-pip-color.
63
- // $span-border - Border color of button divider. Default: $primary-color.
64
+ // $span-border - Border color of button divider. Default: $split-button-span-border-color.
64
65
  // $base-style - Apply base style to split button. Default: true.
65
66
  @mixin split-button(
66
67
  $padding:medium,
67
68
  $pip-color:$split-button-pip-color,
68
- $span-border:$primary-color,
69
+ $span-border:$split-button-span-border-color,
69
70
  $base-style:true) {
70
71
 
71
72
  // With this, we can control whether or not the base styles come through.
@@ -90,7 +91,6 @@ $split-button-pip-default-float-lrg: rem-calc(-6) !default;
90
91
  display: block;
91
92
  border-style: inset;
92
93
  top: 50%;
93
-
94
94
  #{$default-float}: 50%;
95
95
  }
96
96
 
@@ -101,7 +101,7 @@ $split-button-pip-default-float-lrg: rem-calc(-6) !default;
101
101
  // Control the border color for the span area of the split button
102
102
  @if $span-border {
103
103
  span {
104
- border-#{$default-float}-color: rgba(255,255,255,0.5);
104
+ border-#{$default-float}-color: $span-border;
105
105
  }
106
106
  }
107
107
 
@@ -113,8 +113,8 @@ $split-button-pip-default-float-lrg: rem-calc(-6) !default;
113
113
  &:after {
114
114
  border-top-style: solid;
115
115
  border-width: $split-button-pip-size-tny;
116
- top: 48%;
117
116
  margin-#{$default-float}: $split-button-pip-default-float-tny;
117
+ top: 48%;
118
118
  }
119
119
  }
120
120
  }
@@ -127,8 +127,8 @@ $split-button-pip-default-float-lrg: rem-calc(-6) !default;
127
127
  &:after {
128
128
  border-top-style: solid;
129
129
  border-width: $split-button-pip-size-sml;
130
- top: 48%;
131
130
  margin-#{$default-float}: $split-button-pip-default-float-sml;
131
+ top: 48%;
132
132
  }
133
133
  }
134
134
  }
@@ -141,8 +141,8 @@ $split-button-pip-default-float-lrg: rem-calc(-6) !default;
141
141
  &:after {
142
142
  border-top-style: solid;
143
143
  border-width: $split-button-pip-size-med;
144
- top: 48%;
145
144
  margin-#{$default-float}: $split-button-pip-default-float-med;
145
+ top: 48%;
146
146
  }
147
147
  }
148
148
  }
@@ -155,8 +155,8 @@ $split-button-pip-default-float-lrg: rem-calc(-6) !default;
155
155
  &:after {
156
156
  border-top-style: solid;
157
157
  border-width: $split-button-pip-size-lrg;
158
- top: 48%;
159
158
  margin-#{$default-float}: $split-button-pip-default-float-lrg;
159
+ top: 48%;
160
160
  }
161
161
  }
162
162
  }
@@ -172,9 +172,9 @@ $split-button-pip-default-float-lrg: rem-calc(-6) !default;
172
172
 
173
173
  .split.button { @include split-button;
174
174
 
175
- &.secondary { @include split-button(false, $split-button-pip-color, $secondary-color, false); }
176
- &.alert { @include split-button(false, false, $alert-color, false); }
177
- &.success { @include split-button(false, false, $success-color, false); }
175
+ &.secondary { @include split-button(false, $split-button-pip-color, $split-button-span-border-color, false); }
176
+ &.alert { @include split-button(false, false, $split-button-span-border-color, false); }
177
+ &.success { @include split-button(false, false, $split-button-span-border-color, false); }
178
178
 
179
179
  &.tiny { @include split-button(tiny, false, false, false); }
180
180
  &.small { @include split-button(small, false, false, false); }
@@ -189,12 +189,12 @@ $split-button-pip-default-float-lrg: rem-calc(-6) !default;
189
189
  span:before{ border-style:none; }
190
190
  span:after{ border-style:none; }
191
191
  span>i{
192
- top: 50%;
193
192
  display: block;
194
- position: absolute;
195
193
  left: 50%;
196
194
  margin-left: -0.28889em;
197
195
  margin-top: -0.48889em;
196
+ position: absolute;
197
+ top: 50%;
198
198
  }
199
199
  }
200
200
  }