foundation-rails 5.4.5.0 → 5.5.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- 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
@@ -4,7 +4,7 @@
|
|
4
4
|
Foundation.libs.tab = {
|
5
5
|
name : 'tab',
|
6
6
|
|
7
|
-
version : '5.
|
7
|
+
version : '5.5.0',
|
8
8
|
|
9
9
|
settings : {
|
10
10
|
active_class: 'active',
|
@@ -82,7 +82,7 @@
|
|
82
82
|
// Check whether the location hash references a tab content div or
|
83
83
|
// another element on the page (inside or outside the tab content div)
|
84
84
|
var hash_element = S(hash);
|
85
|
-
if (hash_element.hasClass('content') && hash_element.parent().hasClass('
|
85
|
+
if (hash_element.hasClass('content') && hash_element.parent().hasClass('tabs-content')) {
|
86
86
|
// Tab content div
|
87
87
|
self.toggle_active_tab($('[' + self.attr_name() + '] > * > a[href=' + hash + ']').parent());
|
88
88
|
} else {
|
@@ -95,7 +95,7 @@
|
|
95
95
|
}
|
96
96
|
} else {
|
97
97
|
// Reference the default tab hashes which were initialized in the init function
|
98
|
-
for (var ind
|
98
|
+
for (var ind = 0; ind < self.default_tab_hashes.length; ind++) {
|
99
99
|
self.toggle_active_tab($('[' + self.attr_name() + '] > * > a[href=' + self.default_tab_hashes[ind] + ']').parent());
|
100
100
|
}
|
101
101
|
}
|
@@ -113,7 +113,7 @@
|
|
113
113
|
siblings = tab.siblings(),
|
114
114
|
settings = tabs.data(this.attr_name(true) + '-init'),
|
115
115
|
interpret_keyup_action = function(e) {
|
116
|
-
// Light modification of Heydon Pickering's Practical ARIA Examples: http://heydonworks.com/practical_aria_examples/js/a11y.js
|
116
|
+
// Light modification of Heydon Pickering's Practical ARIA Examples: http://heydonworks.com/practical_aria_examples/js/a11y.js
|
117
117
|
|
118
118
|
// define current, previous and next (possible) tabs
|
119
119
|
|
@@ -190,16 +190,16 @@
|
|
190
190
|
// window (notably in Chrome).
|
191
191
|
// Clean up multiple attr instances to done once
|
192
192
|
tab.addClass(settings.active_class).triggerHandler('opened');
|
193
|
-
tab_link.attr({
|
193
|
+
tab_link.attr({'aria-selected': 'true', tabindex: 0});
|
194
194
|
siblings.removeClass(settings.active_class)
|
195
|
-
siblings.find('a').attr({
|
196
|
-
target.siblings().removeClass(settings.active_class).attr({
|
195
|
+
siblings.find('a').attr({'aria-selected': 'false', tabindex: -1});
|
196
|
+
target.siblings().removeClass(settings.active_class).attr({'aria-hidden': 'true', tabindex: -1});
|
197
|
+
target.addClass(settings.active_class).attr('aria-hidden', 'false').removeAttr('tabindex');
|
197
198
|
settings.callback(tab);
|
198
|
-
target.children().attr('tab-index', 0);
|
199
199
|
target.triggerHandler('toggled', [tab]);
|
200
200
|
tabs.triggerHandler('toggled', [target]);
|
201
201
|
|
202
|
-
tab_link.on('keydown', interpret_keyup_action );
|
202
|
+
tab_link.off('keydown').on('keydown', interpret_keyup_action );
|
203
203
|
},
|
204
204
|
|
205
205
|
data_attr: function (str) {
|
@@ -4,7 +4,7 @@
|
|
4
4
|
Foundation.libs.topbar = {
|
5
5
|
name : 'topbar',
|
6
6
|
|
7
|
-
version: '5.
|
7
|
+
version: '5.5.0',
|
8
8
|
|
9
9
|
settings : {
|
10
10
|
index : 0,
|
@@ -229,11 +229,11 @@
|
|
229
229
|
}
|
230
230
|
});
|
231
231
|
|
232
|
-
S(window).off(
|
232
|
+
S(window).off('.topbar').on('resize.fndtn.topbar', self.throttle(function() {
|
233
233
|
self.resize.call(self);
|
234
|
-
}, 50)).trigger(
|
234
|
+
}, 50)).trigger('resize').trigger('resize.fndtn.topbar').load(function(){
|
235
235
|
// Ensure that the offset is calculated after all of the pages resources have loaded
|
236
|
-
S(this).trigger(
|
236
|
+
S(this).trigger('resize.fndtn.topbar');
|
237
237
|
});
|
238
238
|
|
239
239
|
S('body').off('.topbar').on('click.fndtn.topbar', function (e) {
|
@@ -365,7 +365,7 @@
|
|
365
365
|
if (!$dropdown.find('.title.back').length) {
|
366
366
|
|
367
367
|
if (settings.mobile_show_parent_link == true && url) {
|
368
|
-
$titleLi = $('<li class="title back js-generated"><h5><a href="javascript:void(0)"></a></h5></li><li class="parent-link show-for-small"><a class="parent-link js-generated" href="' + url + '">' + $link.html() +'</a></li>');
|
368
|
+
$titleLi = $('<li class="title back js-generated"><h5><a href="javascript:void(0)"></a></h5></li><li class="parent-link show-for-small-only"><a class="parent-link js-generated" href="' + url + '">' + $link.html() +'</a></li>');
|
369
369
|
} else {
|
370
370
|
$titleLi = $('<li class="title back js-generated"><h5><a href="javascript:void(0)"></a></h5>');
|
371
371
|
}
|
@@ -6,11 +6,15 @@
|
|
6
6
|
$rem-base: 16px !default;
|
7
7
|
|
8
8
|
// IMPORT ONCE
|
9
|
-
// We use this to prevent styles from being loaded multiple times for compenents that rely on other components.
|
9
|
+
// We use this to prevent styles from being loaded multiple times for compenents that rely on other components.
|
10
10
|
$modules: () !default;
|
11
11
|
@mixin exports($name) {
|
12
|
-
|
13
|
-
|
12
|
+
// Import from global scope
|
13
|
+
$modules: $modules !global;
|
14
|
+
// Check if a module is already on the list
|
15
|
+
$module_index: index($modules, $name);
|
16
|
+
@if (($module_index == null) or ($module_index == false)) {
|
17
|
+
$modules: append($modules, $name) !global;
|
14
18
|
@content;
|
15
19
|
}
|
16
20
|
}
|
@@ -21,7 +25,7 @@ $modules: () !default;
|
|
21
25
|
|
22
26
|
|
23
27
|
// RANGES
|
24
|
-
// We use these functions to define ranges for various things, like media queries.
|
28
|
+
// We use these functions to define ranges for various things, like media queries.
|
25
29
|
@function lower-bound($range){
|
26
30
|
@if length($range) <= 0 {
|
27
31
|
@return 0;
|
@@ -42,6 +46,47 @@ $modules: () !default;
|
|
42
46
|
@return $num / ($num * 0 + 1);
|
43
47
|
}
|
44
48
|
|
49
|
+
// TEXT INPUT TYPES
|
50
|
+
|
51
|
+
@function text-inputs( $types: all, $selector: input ) {
|
52
|
+
|
53
|
+
$return: ();
|
54
|
+
|
55
|
+
$all-text-input-types:
|
56
|
+
text
|
57
|
+
password
|
58
|
+
date
|
59
|
+
datetime
|
60
|
+
datetime-local
|
61
|
+
month
|
62
|
+
week
|
63
|
+
email
|
64
|
+
number
|
65
|
+
search
|
66
|
+
tel
|
67
|
+
time
|
68
|
+
url
|
69
|
+
color
|
70
|
+
textarea;
|
71
|
+
|
72
|
+
@if $types == all { $types: $all-text-input-types; }
|
73
|
+
|
74
|
+
@each $type in $types {
|
75
|
+
@if $type == textarea {
|
76
|
+
@if $selector == input {
|
77
|
+
$return: append($return, unquote('#{$type}'), comma)
|
78
|
+
} @else {
|
79
|
+
$return: append($return, unquote('#{$type}#{$selector}'), comma)
|
80
|
+
}
|
81
|
+
} @else {
|
82
|
+
$return: append($return, unquote('#{$selector}[type="#{$type}"]'), comma)
|
83
|
+
}
|
84
|
+
}
|
85
|
+
|
86
|
+
@return $return;
|
87
|
+
|
88
|
+
}
|
89
|
+
|
45
90
|
// CONVERT TO REM
|
46
91
|
@function convert-to-rem($value, $base-value: $rem-base) {
|
47
92
|
$value: strip-unit($value) / strip-unit($base-value) * 1rem;
|
@@ -57,23 +102,23 @@ $modules: () !default;
|
|
57
102
|
@return '[data-' + $attr + ']';
|
58
103
|
}
|
59
104
|
|
60
|
-
// REM CALC
|
105
|
+
// REM CALC
|
61
106
|
|
62
107
|
// New Syntax, allows to optionally calculate on a different base value to counter compounding effect of rem's.
|
63
108
|
// Call with 1, 2, 3 or 4 parameters, 'px' is not required but supported:
|
64
|
-
//
|
109
|
+
//
|
65
110
|
// rem-calc(10 20 30px 40);
|
66
|
-
//
|
111
|
+
//
|
67
112
|
// Space delimited, if you want to delimit using comma's, wrap it in another pair of brackets
|
68
|
-
//
|
113
|
+
//
|
69
114
|
// rem-calc((10, 20, 30, 40px));
|
70
|
-
//
|
115
|
+
//
|
71
116
|
// Optionally call with a different base (eg: 8px) to calculate rem.
|
72
|
-
//
|
117
|
+
//
|
73
118
|
// rem-calc(16px 32px 48px, 8px);
|
74
|
-
//
|
119
|
+
//
|
75
120
|
// If you require to comma separate your list
|
76
|
-
//
|
121
|
+
//
|
77
122
|
// rem-calc((16px, 32px, 48), 8px);
|
78
123
|
|
79
124
|
@function rem-calc($values, $base-value: $rem-base) {
|
@@ -95,14 +95,6 @@ $include-html-global-classes: $include-html-classes;
|
|
95
95
|
// $font-weight-normal: normal !default;
|
96
96
|
// $font-weight-bold: bold !default;
|
97
97
|
|
98
|
-
// We use these as default colors throughout
|
99
|
-
// $primary-color: #008CBA;
|
100
|
-
// $secondary-color: #e7e7e7;
|
101
|
-
// $alert-color: #f04124;
|
102
|
-
// $success-color: #43AC6A;
|
103
|
-
// $warning-color: #f08a24;
|
104
|
-
// $info-color: #a0d3e8;
|
105
|
-
|
106
98
|
// $white : #FFFFFF;
|
107
99
|
// $ghost : #FAFAFA;
|
108
100
|
// $snow : #F9F9F9;
|
@@ -123,6 +115,14 @@ $include-html-global-classes: $include-html-classes;
|
|
123
115
|
// $jet : #222222;
|
124
116
|
// $black : #000000;
|
125
117
|
|
118
|
+
// We use these as default colors throughout
|
119
|
+
// $primary-color: #008CBA;
|
120
|
+
// $secondary-color: #e7e7e7;
|
121
|
+
// $alert-color: #f04124;
|
122
|
+
// $success-color: #43AC6A;
|
123
|
+
// $warning-color: #f08a24;
|
124
|
+
// $info-color: #a0d3e8;
|
125
|
+
|
126
126
|
// We use these to control various global styles
|
127
127
|
// $body-bg: $white;
|
128
128
|
// $body-font-color: $jet;
|
@@ -318,14 +318,14 @@ $include-html-global-classes: $include-html-classes;
|
|
318
318
|
// $include-html-accordion-classes: $include-html-classes;
|
319
319
|
|
320
320
|
// $accordion-navigation-padding: rem-calc(16);
|
321
|
-
// $accordion-navigation-bg-color: $silver
|
321
|
+
// $accordion-navigation-bg-color: $silver;
|
322
322
|
// $accordion-navigation-hover-bg-color: scale-color($accordion-navigation-bg-color, $lightness: -5%);
|
323
323
|
// $accordion-navigation-active-bg-color: scale-color($accordion-navigation-bg-color, $lightness: -3%);
|
324
324
|
// $accordion-navigation-font-color: $jet;
|
325
325
|
// $accordion-navigation-font-size: rem-calc(16);
|
326
326
|
// $accordion-navigation-font-family: $body-font-family;
|
327
327
|
|
328
|
-
// $accordion-content-padding: $column-gutter/2;
|
328
|
+
// $accordion-content-padding: ($column-gutter/2);
|
329
329
|
// $accordion-content-active-bg-color: $white;
|
330
330
|
|
331
331
|
// 02. Alert Boxes
|
@@ -545,7 +545,7 @@ $include-html-global-classes: $include-html-classes;
|
|
545
545
|
// $f-dropdown-font-size: rem-calc(14);
|
546
546
|
// $f-dropdown-list-padding: rem-calc(5, 10);
|
547
547
|
// $f-dropdown-line-height: rem-calc(18);
|
548
|
-
// $f-dropdown-list-hover-bg: $smoke
|
548
|
+
// $f-dropdown-list-hover-bg: $smoke;
|
549
549
|
// $dropdown-mobile-default-float: 0;
|
550
550
|
|
551
551
|
// We use this to control the styles for when the dropdown has custom content.
|
@@ -573,25 +573,25 @@ $include-html-global-classes: $include-html-classes;
|
|
573
573
|
// $dropdown-button-padding-tny: $button-pip-tny * 7;
|
574
574
|
// $dropdown-button-pip-size-tny: $button-pip-tny;
|
575
575
|
// $dropdown-button-pip-opposite-tny: $button-pip-tny * 3;
|
576
|
-
// $dropdown-button-pip-top-tny: -$button-pip-tny / 2 + rem-calc(1);
|
576
|
+
// $dropdown-button-pip-top-tny: (-$button-pip-tny / 2) + rem-calc(1);
|
577
577
|
|
578
578
|
// We use these to style small dropdown buttons
|
579
579
|
// $dropdown-button-padding-sml: $button-pip-sml * 7;
|
580
580
|
// $dropdown-button-pip-size-sml: $button-pip-sml;
|
581
581
|
// $dropdown-button-pip-opposite-sml: $button-pip-sml * 3;
|
582
|
-
// $dropdown-button-pip-top-sml: -$button-pip-sml / 2 + rem-calc(1);
|
582
|
+
// $dropdown-button-pip-top-sml: (-$button-pip-sml / 2) + rem-calc(1);
|
583
583
|
|
584
584
|
// We use these to style medium dropdown buttons
|
585
585
|
// $dropdown-button-padding-med: $button-pip-med * 6 + rem-calc(3);
|
586
586
|
// $dropdown-button-pip-size-med: $button-pip-med - rem-calc(3);
|
587
587
|
// $dropdown-button-pip-opposite-med: $button-pip-med * 2.5;
|
588
|
-
// $dropdown-button-pip-top-med: -$button-pip-med / 2 + rem-calc(2);
|
588
|
+
// $dropdown-button-pip-top-med: (-$button-pip-med / 2) + rem-calc(2);
|
589
589
|
|
590
590
|
// We use these to style large dropdown buttons
|
591
591
|
// $dropdown-button-padding-lrg: $button-pip-lrg * 5 + rem-calc(3);
|
592
592
|
// $dropdown-button-pip-size-lrg: $button-pip-lrg - rem-calc(6);
|
593
593
|
// $dropdown-button-pip-opposite-lrg: $button-pip-lrg * 2.5;
|
594
|
-
// $dropdown-button-pip-top-lrg: -$button-pip-lrg / 2 + rem-calc(3);
|
594
|
+
// $dropdown-button-pip-top-lrg: (-$button-pip-lrg / 2) + rem-calc(3);
|
595
595
|
|
596
596
|
// 10. Flex Video
|
597
597
|
// - - - - - - - - - - - - - - - - - - - - - - - - -
|
@@ -667,6 +667,7 @@ $include-html-global-classes: $include-html-classes;
|
|
667
667
|
// $input-error-message-font-weight: $font-weight-normal;
|
668
668
|
// $input-error-message-font-style: italic;
|
669
669
|
// $input-error-message-font-color: $white;
|
670
|
+
// $input-error-message-bg-color: $alert-color;
|
670
671
|
// $input-error-message-font-color-alt: $oil;
|
671
672
|
|
672
673
|
// We use this to style the glowing effect of inputs when focused
|
@@ -685,9 +686,11 @@ $include-html-global-classes: $include-html-classes;
|
|
685
686
|
// $include-html-icon-bar-classes: $include-html-classes;
|
686
687
|
// $icon-bar-bg: $oil;
|
687
688
|
// $icon-bar-font-color: $white;
|
689
|
+
// $icon-bar-font-color-hover: $icon-bar-font-color;
|
688
690
|
// $icon-bar-font-size: 1rem;
|
689
691
|
// $icon-bar-hover-color: $primary-color;
|
690
692
|
// $icon-bar-icon-color: $white;
|
693
|
+
// $icon-bar-icon-color-hover: $icon-bar-icon-color;
|
691
694
|
// $icon-bar-icon-size: 1.875rem;
|
692
695
|
// $icon-bar-image-width: 1.875rem;
|
693
696
|
// $icon-bar-image-height: 1.875rem;
|
@@ -991,7 +994,7 @@ $include-html-global-classes: $include-html-classes;
|
|
991
994
|
// $price-title-font-family: $body-font-family;
|
992
995
|
|
993
996
|
// We use these to control the price styles
|
994
|
-
// $price-money-bg: $vapor
|
997
|
+
// $price-money-bg: $vapor;
|
995
998
|
// $price-money-padding: rem-calc(15 20);
|
996
999
|
// $price-money-align: center;
|
997
1000
|
// $price-money-color: $oil;
|
@@ -1268,7 +1271,7 @@ $include-html-global-classes: $include-html-classes;
|
|
1268
1271
|
|
1269
1272
|
// These control the background color for the table and even rows
|
1270
1273
|
// $table-bg: $white;
|
1271
|
-
// $table-even-row-bg: $snow
|
1274
|
+
// $table-even-row-bg: $snow;
|
1272
1275
|
|
1273
1276
|
// These control the table cell border style
|
1274
1277
|
// $table-border-style: solid;
|
@@ -1308,7 +1311,7 @@ $include-html-global-classes: $include-html-classes;
|
|
1308
1311
|
// $tabs-navigation-font-family: $body-font-family;
|
1309
1312
|
|
1310
1313
|
// $tabs-content-margin-bottom: rem-calc(24);
|
1311
|
-
// $tabs-content-padding: $column-gutter/2;
|
1314
|
+
// $tabs-content-padding: ($column-gutter/2);
|
1312
1315
|
|
1313
1316
|
// $tabs-vertical-navigation-margin-bottom: 1.25rem;
|
1314
1317
|
|
@@ -1365,7 +1368,7 @@ $include-html-global-classes: $include-html-classes;
|
|
1365
1368
|
// $topbar-bg: $topbar-bg-color;
|
1366
1369
|
|
1367
1370
|
// Height and margin
|
1368
|
-
// $topbar-height:
|
1371
|
+
// $topbar-height: rem-calc(45);
|
1369
1372
|
// $topbar-margin-bottom: 0;
|
1370
1373
|
|
1371
1374
|
// Controlling the styles for the title in the top bar
|
@@ -1376,6 +1379,7 @@ $include-html-global-classes: $include-html-classes;
|
|
1376
1379
|
// $topbar-dropdown-bg: $oil;
|
1377
1380
|
// $topbar-dropdown-link-color: $white;
|
1378
1381
|
// $topbar-dropdown-link-bg: $oil;
|
1382
|
+
// $topbar-dropdown-link-bg-hover: $oil;
|
1379
1383
|
// $topbar-dropdown-link-weight: $font-weight-normal;
|
1380
1384
|
// $topbar-dropdown-toggle-size: 5px;
|
1381
1385
|
// $topbar-dropdown-toggle-color: $white;
|
@@ -1391,12 +1395,12 @@ $include-html-global-classes: $include-html-classes;
|
|
1391
1395
|
// $topbar-link-hover-lightness: -10%; // Darken by 10%
|
1392
1396
|
// $topbar-link-bg: $topbar-bg;
|
1393
1397
|
// $topbar-link-bg-color-hover: $charcoal;
|
1394
|
-
// $topbar-link-bg-hover:
|
1398
|
+
// $topbar-link-bg-hover: $oil;
|
1395
1399
|
// $topbar-link-bg-active: $primary-color;
|
1396
1400
|
// $topbar-link-bg-active-hover: scale-color($primary-color, $lightness: -14%);
|
1397
1401
|
// $topbar-link-font-family: $body-font-family;
|
1398
1402
|
// $topbar-link-text-transform: none;
|
1399
|
-
// $topbar-link-padding: $topbar-height / 3;
|
1403
|
+
// $topbar-link-padding: ($topbar-height / 3);
|
1400
1404
|
// $topbar-back-link-size: $h5-font-size;
|
1401
1405
|
// $topbar-link-dropdown-padding: 20px;
|
1402
1406
|
|
@@ -18,7 +18,7 @@ $accordion-navigation-font-color: $jet !default;
|
|
18
18
|
$accordion-navigation-font-size: rem-calc(16) !default;
|
19
19
|
$accordion-navigation-font-family: $body-font-family !default;
|
20
20
|
|
21
|
-
$accordion-content-padding: $column-gutter/2 !default;
|
21
|
+
$accordion-content-padding: ($column-gutter/2) !default;
|
22
22
|
$accordion-content-active-bg-color: $white !default;
|
23
23
|
|
24
24
|
|
@@ -38,6 +38,7 @@ $alert-close-font-size: rem-calc(22) !default;
|
|
38
38
|
$alert-close-opacity: 0.3 !default;
|
39
39
|
$alert-close-opacity-hover: 0.5 !default;
|
40
40
|
$alert-close-padding: 9px 6px 4px !default;
|
41
|
+
$alert-close-background: inherit !default;
|
41
42
|
|
42
43
|
// We use this to control border radius
|
43
44
|
$alert-radius: $global-radius !default;
|
@@ -91,6 +92,7 @@ $alert-transition-ease: ease-out !default;
|
|
91
92
|
#{$opposite-direction}: $alert-close-position;
|
92
93
|
color: $alert-close-color;
|
93
94
|
opacity: $alert-close-opacity;
|
95
|
+
background: $alert-close-background;
|
94
96
|
&:hover,
|
95
97
|
&:focus { opacity: $alert-close-opacity-hover; }
|
96
98
|
}
|
@@ -57,7 +57,6 @@ $button-group-border-width: 1px !default;
|
|
57
57
|
}
|
58
58
|
@else {
|
59
59
|
margin: 0 -2px;
|
60
|
-
float: $default-float;
|
61
60
|
display: inline-block;
|
62
61
|
}
|
63
62
|
|
@@ -67,7 +66,7 @@ $button-group-border-width: 1px !default;
|
|
67
66
|
> button, .button {
|
68
67
|
border-top: $button-group-border-width solid;
|
69
68
|
border-color: rgba(255, 255, 255, 0.5);
|
70
|
-
border-left-width:
|
69
|
+
border-left-width: 0;
|
71
70
|
margin:0;
|
72
71
|
display: block;
|
73
72
|
}
|
@@ -34,7 +34,7 @@ $button-font-align: center !default;
|
|
34
34
|
$button-function-factor: -20% !default;
|
35
35
|
|
36
36
|
// We use these to control button border styles.
|
37
|
-
$button-border-width:
|
37
|
+
$button-border-width: 0 !default;
|
38
38
|
$button-border-style: solid !default;
|
39
39
|
$button-bg-color: $primary-color !default;
|
40
40
|
$button-bg-hover: scale-color($button-bg-color, $lightness: $button-function-factor) !default;
|
@@ -80,7 +80,7 @@ $button-disabled-cursor: $cursor-default-value !default;
|
|
80
80
|
text-decoration: none;
|
81
81
|
text-align: $button-font-align;
|
82
82
|
-webkit-appearance: none;
|
83
|
-
|
83
|
+
border-radius:0;
|
84
84
|
}
|
85
85
|
@if $display { display: $display; }
|
86
86
|
}
|
@@ -133,7 +133,7 @@ $button-disabled-cursor: $cursor-default-value !default;
|
|
133
133
|
//
|
134
134
|
// We use this mixin to add button color styles
|
135
135
|
//
|
136
|
-
// $bg -
|
136
|
+
// $bg - Background color. We can set $bg:false for a transparent background. Default: $primary-color.
|
137
137
|
// $radius - If true, set to button radius which is $global-radius || explicitly set radius amount in px (ex. $radius:10px). Default: true
|
138
138
|
// $disabled - We can set $disabled:true to create a disabled transparent button. Default: false
|
139
139
|
// $bg-hover - Button Hover Background Color. Default: $button-bg-hover
|
@@ -194,12 +194,11 @@ $button-disabled-cursor: $cursor-default-value !default;
|
|
194
194
|
// $radius - If true, set to button radius which is $global-radius || explicitly set radius amount in px (ex. $radius:10px). Default:false.
|
195
195
|
// $full-width - We can set $full-width:true to remove side padding extend width. Default:false.
|
196
196
|
// $disabled - We can set $disabled:true to create a disabled transparent button. Default:false.
|
197
|
-
// $is-input - <input>'s and <button>'s take on strange padding. We added this to help fix that. Default:false.
|
198
197
|
// $is-prefix - Not used? Default:false.
|
199
198
|
// $bg-hover - Button Hover Color - Default null - see button-style mixin
|
200
199
|
// $border-color - Button Border Color - Default null - see button-style mixin
|
201
200
|
// $transition - We can control whether or not to include the background-color transition property - Default:true.
|
202
|
-
@mixin button($padding:$button-med, $bg:$button-bg-color, $radius:false, $full-width:false, $disabled:false, $is-
|
201
|
+
@mixin button($padding:$button-med, $bg:$button-bg-color, $radius:false, $full-width:false, $disabled:false, $is-prefix:false, $bg-hover:null, $border-color:null, $transition: true) {
|
203
202
|
@include button-base;
|
204
203
|
@include button-size($padding, $full-width);
|
205
204
|
@include button-style($bg, $radius, $disabled, $bg-hover, $border-color);
|