bootstrap-sass 3.3.0.1 → 3.4.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/.gitignore +1 -0
- data/.travis.yml +8 -14
- data/CHANGELOG.md +64 -0
- data/CONTRIBUTING.md +8 -1
- data/Gemfile +1 -4
- data/LICENSE +2 -1
- data/README.md +135 -114
- data/Rakefile +58 -12
- data/assets/fonts/bootstrap/glyphicons-halflings-regular.eot +0 -0
- data/assets/fonts/bootstrap/glyphicons-halflings-regular.svg +273 -214
- data/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf +0 -0
- data/assets/fonts/bootstrap/glyphicons-halflings-regular.woff +0 -0
- data/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2 +0 -0
- data/assets/javascripts/bootstrap/affix.js +11 -9
- data/assets/javascripts/bootstrap/alert.js +6 -5
- data/assets/javascripts/bootstrap/button.js +25 -16
- data/assets/javascripts/bootstrap/carousel.js +25 -18
- data/assets/javascripts/bootstrap/collapse.js +13 -12
- data/assets/javascripts/bootstrap/dropdown.js +51 -47
- data/assets/javascripts/bootstrap/modal.js +112 -35
- data/assets/javascripts/bootstrap/popover.js +31 -27
- data/assets/javascripts/bootstrap/scrollspy.js +19 -22
- data/assets/javascripts/bootstrap/tab.js +14 -12
- data/assets/javascripts/bootstrap/tooltip.js +255 -56
- data/assets/javascripts/bootstrap/transition.js +5 -5
- data/assets/javascripts/bootstrap-sprockets.js +2 -2
- data/assets/javascripts/bootstrap.js +1282 -962
- data/assets/javascripts/bootstrap.min.js +6 -0
- data/assets/stylesheets/_bootstrap-compass.scss +2 -0
- data/assets/stylesheets/_bootstrap-mincer.scss +4 -2
- data/assets/stylesheets/_bootstrap-sprockets.scss +2 -0
- data/assets/stylesheets/_bootstrap.scss +6 -0
- data/assets/stylesheets/bootstrap/_alerts.scss +8 -3
- data/assets/stylesheets/bootstrap/_badges.scss +16 -5
- data/assets/stylesheets/bootstrap/_breadcrumbs.scss +3 -1
- data/assets/stylesheets/bootstrap/_button-groups.scss +11 -14
- data/assets/stylesheets/bootstrap/_buttons.scss +18 -10
- data/assets/stylesheets/bootstrap/_carousel.scss +40 -36
- data/assets/stylesheets/bootstrap/_close.scss +2 -0
- data/assets/stylesheets/bootstrap/_code.scss +3 -3
- data/assets/stylesheets/bootstrap/_component-animations.scss +2 -2
- data/assets/stylesheets/bootstrap/_dropdowns.scss +24 -24
- data/assets/stylesheets/bootstrap/_forms.scss +149 -103
- data/assets/stylesheets/bootstrap/_glyphicons.scss +85 -12
- data/assets/stylesheets/bootstrap/_grid.scss +10 -0
- data/assets/stylesheets/bootstrap/_input-groups.scss +10 -5
- data/assets/stylesheets/bootstrap/_jumbotron.scss +11 -5
- data/assets/stylesheets/bootstrap/_labels.scss +1 -1
- data/assets/stylesheets/bootstrap/_list-group.scss +30 -34
- data/assets/stylesheets/bootstrap/_media.scss +19 -0
- data/assets/stylesheets/bootstrap/_mixins.scss +1 -0
- data/assets/stylesheets/bootstrap/_modals.scss +9 -8
- data/assets/stylesheets/bootstrap/_navbar.scss +77 -82
- data/assets/stylesheets/bootstrap/_navs.scss +4 -6
- data/assets/stylesheets/bootstrap/_normalize.scss +13 -13
- data/assets/stylesheets/bootstrap/_pager.scss +2 -2
- data/assets/stylesheets/bootstrap/_pagination.scss +15 -17
- data/assets/stylesheets/bootstrap/_panels.scss +16 -6
- data/assets/stylesheets/bootstrap/_popovers.scss +50 -58
- data/assets/stylesheets/bootstrap/_print.scss +90 -98
- data/assets/stylesheets/bootstrap/_progress-bars.scss +3 -3
- data/assets/stylesheets/bootstrap/_responsive-embed.scss +10 -10
- data/assets/stylesheets/bootstrap/_responsive-utilities.scss +11 -6
- data/assets/stylesheets/bootstrap/_scaffolding.scss +18 -7
- data/assets/stylesheets/bootstrap/_tables.scss +24 -24
- data/assets/stylesheets/bootstrap/_theme.scss +57 -22
- data/assets/stylesheets/bootstrap/_thumbnails.scss +1 -1
- data/assets/stylesheets/bootstrap/_tooltip.scss +49 -32
- data/assets/stylesheets/bootstrap/_type.scss +12 -12
- data/assets/stylesheets/bootstrap/_utilities.scss +0 -1
- data/assets/stylesheets/bootstrap/_variables.scss +27 -17
- data/assets/stylesheets/bootstrap/_wells.scss +2 -2
- data/assets/stylesheets/bootstrap/mixins/_alerts.scss +2 -1
- data/assets/stylesheets/bootstrap/mixins/_background-variant.scss +2 -1
- data/assets/stylesheets/bootstrap/mixins/_border-radius.scss +4 -4
- data/assets/stylesheets/bootstrap/mixins/_buttons.scss +20 -11
- data/assets/stylesheets/bootstrap/mixins/_center-block.scss +1 -1
- data/assets/stylesheets/bootstrap/mixins/_clearfix.scss +1 -1
- data/assets/stylesheets/bootstrap/mixins/_forms.scss +4 -4
- data/assets/stylesheets/bootstrap/mixins/_gradients.scss +6 -8
- data/assets/stylesheets/bootstrap/mixins/_grid-framework.scss +2 -2
- data/assets/stylesheets/bootstrap/mixins/_grid.scss +8 -8
- data/assets/stylesheets/bootstrap/mixins/_hide-text.scss +3 -3
- data/assets/stylesheets/bootstrap/mixins/_image.scss +5 -10
- data/assets/stylesheets/bootstrap/mixins/_list-group.scss +3 -2
- data/assets/stylesheets/bootstrap/mixins/_opacity.scss +2 -3
- data/assets/stylesheets/bootstrap/mixins/_pagination.scss +2 -1
- data/assets/stylesheets/bootstrap/mixins/_reset-text.scss +18 -0
- data/assets/stylesheets/bootstrap/mixins/_resize.scss +1 -1
- data/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss +1 -5
- data/assets/stylesheets/bootstrap/mixins/_tab-focus.scss +3 -3
- data/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss +2 -1
- data/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss +4 -4
- data/bootstrap-sass.gemspec +10 -9
- data/bower.json +6 -20
- data/composer.json +2 -2
- data/eyeglass-exports.js +7 -0
- data/lib/bootstrap-sass/engine.rb +6 -1
- data/lib/bootstrap-sass/version.rb +2 -2
- data/lib/bootstrap-sass.rb +32 -13
- data/package-lock.json +1611 -0
- data/package.json +21 -7
- data/sache.json +1 -1
- data/tasks/bower.rake +2 -5
- data/tasks/converter/fonts_conversion.rb +1 -1
- data/tasks/converter/js_conversion.rb +7 -5
- data/tasks/converter/less_conversion.rb +48 -37
- data/tasks/converter/network.rb +12 -7
- data/tasks/converter.rb +1 -1
- data/templates/project/_bootstrap-variables.sass +27 -18
- data/templates/project/styles.sass +3 -0
- data/test/compilation_test.rb +24 -12
- data/test/dummy_rails/app/assets/stylesheets/{application.css.sass → application.sass} +0 -0
- data/test/dummy_rails/app/views/pages/root.html.slim +43 -0
- data/test/dummy_rails/config/application.rb +2 -1
- data/test/dummy_rails/config/boot.rb +1 -1
- data/test/dummy_rails/config/environments/development.rb +0 -3
- data/test/dummy_rails/config/environments/production.rb +7 -1
- data/test/dummy_rails/config/environments/test.rb +9 -1
- data/test/dummy_sass_only/Gemfile +1 -1
- data/test/dummy_sass_only/compile.rb +14 -7
- data/test/dummy_sass_only/import_all.scss +2 -0
- data/test/gemfiles/default.gemfile +3 -0
- data/test/node_mincer_test.rb +2 -3
- data/test/node_sass_compile_test.sh +4 -3
- data/test/sass_test.rb +10 -7
- data/test/sprockets_rails_test.rb +12 -8
- data/test/support/dummy_rails_integration.rb +1 -1
- data/test/support/reporting.rb +10 -0
- data/test/test_helper.rb +3 -2
- metadata +56 -46
- data/test/compass_test.rb +0 -9
- data/test/dummy_rails/log/development.log +0 -0
- data/test/dummy_sass_only/import_all.sass +0 -2
- data/test/gemfiles/sass_3_2.gemfile +0 -6
- data/test/gemfiles/sass_3_3.gemfile +0 -6
- data/test/gemfiles/sass_3_4.gemfile +0 -7
- data/test/gemfiles/sass_head.gemfile +0 -6
@@ -1,3 +1,8 @@
|
|
1
|
+
/*!
|
2
|
+
* Bootstrap v3.4.1 (https://getbootstrap.com/)
|
3
|
+
* Copyright 2011-2019 Twitter, Inc.
|
4
|
+
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
5
|
+
*/
|
1
6
|
|
2
7
|
//
|
3
8
|
// Load core variables and mixins
|
@@ -18,14 +23,20 @@
|
|
18
23
|
.btn-info,
|
19
24
|
.btn-warning,
|
20
25
|
.btn-danger {
|
21
|
-
text-shadow: 0 -1px 0 rgba(0,0,0
|
22
|
-
$shadow: inset 0 1px 0 rgba(255,255,255
|
26
|
+
text-shadow: 0 -1px 0 rgba(0, 0, 0, .2);
|
27
|
+
$shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
|
23
28
|
@include box-shadow($shadow);
|
24
29
|
|
25
30
|
// Reset the shadow
|
26
31
|
&:active,
|
27
32
|
&.active {
|
28
|
-
@include box-shadow(inset 0 3px 5px rgba(0,0,0
|
33
|
+
@include box-shadow(inset 0 3px 5px rgba(0, 0, 0, .125));
|
34
|
+
}
|
35
|
+
|
36
|
+
&.disabled,
|
37
|
+
&[disabled],
|
38
|
+
fieldset[disabled] & {
|
39
|
+
@include box-shadow(none);
|
29
40
|
}
|
30
41
|
|
31
42
|
.badge {
|
@@ -36,7 +47,7 @@
|
|
36
47
|
// Mixin for generating new styles
|
37
48
|
@mixin btn-styles($btn-color: #555) {
|
38
49
|
@include gradient-vertical($start-color: $btn-color, $end-color: darken($btn-color, 12%));
|
39
|
-
@include reset-filter; // Disable gradients for IE9 because filter bleeds through rounded corners
|
50
|
+
@include reset-filter; // Disable gradients for IE9 because filter bleeds through rounded corners; see https://github.com/twbs/bootstrap/issues/10620
|
40
51
|
background-repeat: repeat-x;
|
41
52
|
border-color: darken($btn-color, 14%);
|
42
53
|
|
@@ -52,10 +63,18 @@
|
|
52
63
|
border-color: darken($btn-color, 14%);
|
53
64
|
}
|
54
65
|
|
55
|
-
|
56
|
-
&[disabled]
|
57
|
-
|
58
|
-
|
66
|
+
&.disabled,
|
67
|
+
&[disabled],
|
68
|
+
fieldset[disabled] & {
|
69
|
+
&,
|
70
|
+
&:hover,
|
71
|
+
&:focus,
|
72
|
+
&.focus,
|
73
|
+
&:active,
|
74
|
+
&.active {
|
75
|
+
background-color: darken($btn-color, 12%);
|
76
|
+
background-image: none;
|
77
|
+
}
|
59
78
|
}
|
60
79
|
}
|
61
80
|
|
@@ -69,7 +88,11 @@
|
|
69
88
|
}
|
70
89
|
|
71
90
|
// Apply the mixin to the buttons
|
72
|
-
.btn-default {
|
91
|
+
.btn-default {
|
92
|
+
@include btn-styles($btn-default-bg);
|
93
|
+
text-shadow: 0 1px 0 #fff;
|
94
|
+
border-color: #ccc;
|
95
|
+
}
|
73
96
|
.btn-primary { @include btn-styles($btn-primary-bg); }
|
74
97
|
.btn-success { @include btn-styles($btn-success-bg); }
|
75
98
|
.btn-info { @include btn-styles($btn-info-bg); }
|
@@ -83,7 +106,7 @@
|
|
83
106
|
|
84
107
|
.thumbnail,
|
85
108
|
.img-thumbnail {
|
86
|
-
@include box-shadow(0 1px 2px rgba(0,0,0
|
109
|
+
@include box-shadow(0 1px 2px rgba(0, 0, 0, .075));
|
87
110
|
}
|
88
111
|
|
89
112
|
|
@@ -113,34 +136,34 @@
|
|
113
136
|
@include gradient-vertical($start-color: lighten($navbar-default-bg, 10%), $end-color: $navbar-default-bg);
|
114
137
|
@include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
|
115
138
|
border-radius: $navbar-border-radius;
|
116
|
-
$shadow: inset 0 1px 0 rgba(255,255,255
|
139
|
+
$shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
|
117
140
|
@include box-shadow($shadow);
|
118
141
|
|
119
142
|
.navbar-nav > .open > a,
|
120
143
|
.navbar-nav > .active > a {
|
121
144
|
@include gradient-vertical($start-color: darken($navbar-default-link-active-bg, 5%), $end-color: darken($navbar-default-link-active-bg, 2%));
|
122
|
-
@include box-shadow(inset 0 3px 9px rgba(0,0,0
|
145
|
+
@include box-shadow(inset 0 3px 9px rgba(0, 0, 0, .075));
|
123
146
|
}
|
124
147
|
}
|
125
148
|
.navbar-brand,
|
126
149
|
.navbar-nav > li > a {
|
127
|
-
text-shadow: 0 1px 0 rgba(255,255,255
|
150
|
+
text-shadow: 0 1px 0 rgba(255, 255, 255, .25);
|
128
151
|
}
|
129
152
|
|
130
153
|
// Inverted navbar
|
131
154
|
.navbar-inverse {
|
132
155
|
@include gradient-vertical($start-color: lighten($navbar-inverse-bg, 10%), $end-color: $navbar-inverse-bg);
|
133
|
-
@include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
|
134
|
-
|
156
|
+
@include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered; see https://github.com/twbs/bootstrap/issues/10257
|
157
|
+
border-radius: $navbar-border-radius;
|
135
158
|
.navbar-nav > .open > a,
|
136
159
|
.navbar-nav > .active > a {
|
137
160
|
@include gradient-vertical($start-color: $navbar-inverse-link-active-bg, $end-color: lighten($navbar-inverse-link-active-bg, 2.5%));
|
138
|
-
@include box-shadow(inset 0 3px 9px rgba(0,0,0
|
161
|
+
@include box-shadow(inset 0 3px 9px rgba(0, 0, 0, .25));
|
139
162
|
}
|
140
163
|
|
141
164
|
.navbar-brand,
|
142
165
|
.navbar-nav > li > a {
|
143
|
-
text-shadow: 0 -1px 0 rgba(0,0,0
|
166
|
+
text-shadow: 0 -1px 0 rgba(0, 0, 0, .25);
|
144
167
|
}
|
145
168
|
}
|
146
169
|
|
@@ -151,6 +174,18 @@
|
|
151
174
|
border-radius: 0;
|
152
175
|
}
|
153
176
|
|
177
|
+
// Fix active state of dropdown items in collapsed mode
|
178
|
+
@media (max-width: $grid-float-breakpoint-max) {
|
179
|
+
.navbar .navbar-nav .open .dropdown-menu > .active > a {
|
180
|
+
&,
|
181
|
+
&:hover,
|
182
|
+
&:focus {
|
183
|
+
color: #fff;
|
184
|
+
@include gradient-vertical($start-color: $dropdown-link-active-bg, $end-color: darken($dropdown-link-active-bg, 5%));
|
185
|
+
}
|
186
|
+
}
|
187
|
+
}
|
188
|
+
|
154
189
|
|
155
190
|
//
|
156
191
|
// Alerts
|
@@ -158,8 +193,8 @@
|
|
158
193
|
|
159
194
|
// Common styles
|
160
195
|
.alert {
|
161
|
-
text-shadow: 0 1px 0 rgba(255,255,255
|
162
|
-
$shadow: inset 0 1px 0 rgba(255,255,255
|
196
|
+
text-shadow: 0 1px 0 rgba(255, 255, 255, .2);
|
197
|
+
$shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
|
163
198
|
@include box-shadow($shadow);
|
164
199
|
}
|
165
200
|
|
@@ -210,7 +245,7 @@
|
|
210
245
|
|
211
246
|
.list-group {
|
212
247
|
border-radius: $border-radius-base;
|
213
|
-
@include box-shadow(0 1px 2px rgba(0,0,0
|
248
|
+
@include box-shadow(0 1px 2px rgba(0, 0, 0, .075));
|
214
249
|
}
|
215
250
|
.list-group-item.active,
|
216
251
|
.list-group-item.active:hover,
|
@@ -231,7 +266,7 @@
|
|
231
266
|
|
232
267
|
// Common styles
|
233
268
|
.panel {
|
234
|
-
@include box-shadow(0 1px 2px rgba(0,0,0
|
269
|
+
@include box-shadow(0 1px 2px rgba(0, 0, 0, .05));
|
235
270
|
}
|
236
271
|
|
237
272
|
// Mixin for generating new styles
|
@@ -255,6 +290,6 @@
|
|
255
290
|
.well {
|
256
291
|
@include gradient-vertical($start-color: darken($well-bg, 5%), $end-color: $well-bg);
|
257
292
|
border-color: darken($well-bg, 10%);
|
258
|
-
$shadow: inset 0 1px 3px rgba(0,0,0
|
293
|
+
$shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
|
259
294
|
@include box-shadow($shadow);
|
260
295
|
}
|
@@ -8,38 +8,32 @@
|
|
8
8
|
position: absolute;
|
9
9
|
z-index: $zindex-tooltip;
|
10
10
|
display: block;
|
11
|
-
|
11
|
+
// Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element.
|
12
|
+
// So reset our font and text properties to avoid inheriting weird values.
|
13
|
+
@include reset-text;
|
12
14
|
font-size: $font-size-small;
|
13
|
-
line-height: 1.4;
|
14
|
-
@include opacity(0);
|
15
15
|
|
16
|
-
|
17
|
-
&.top { margin-top: -3px; padding: $tooltip-arrow-width 0; }
|
18
|
-
&.right { margin-left: 3px; padding: 0 $tooltip-arrow-width; }
|
19
|
-
&.bottom { margin-top: 3px; padding: $tooltip-arrow-width 0; }
|
20
|
-
&.left { margin-left: -3px; padding: 0 $tooltip-arrow-width; }
|
21
|
-
}
|
16
|
+
@include opacity(0);
|
22
17
|
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
18
|
+
&.in { @include opacity($tooltip-opacity); }
|
19
|
+
&.top {
|
20
|
+
padding: $tooltip-arrow-width 0;
|
21
|
+
margin-top: -3px;
|
22
|
+
}
|
23
|
+
&.right {
|
24
|
+
padding: 0 $tooltip-arrow-width;
|
25
|
+
margin-left: 3px;
|
26
|
+
}
|
27
|
+
&.bottom {
|
28
|
+
padding: $tooltip-arrow-width 0;
|
29
|
+
margin-top: 3px;
|
30
|
+
}
|
31
|
+
&.left {
|
32
|
+
padding: 0 $tooltip-arrow-width;
|
33
|
+
margin-left: -3px;
|
34
|
+
}
|
33
35
|
|
34
|
-
//
|
35
|
-
.tooltip-arrow {
|
36
|
-
position: absolute;
|
37
|
-
width: 0;
|
38
|
-
height: 0;
|
39
|
-
border-color: transparent;
|
40
|
-
border-style: solid;
|
41
|
-
}
|
42
|
-
.tooltip {
|
36
|
+
// Note: Deprecated .top-left, .top-right, .bottom-left, and .bottom-right as of v3.3.1
|
43
37
|
&.top .tooltip-arrow {
|
44
38
|
bottom: 0;
|
45
39
|
left: 50%;
|
@@ -48,14 +42,16 @@
|
|
48
42
|
border-top-color: $tooltip-arrow-color;
|
49
43
|
}
|
50
44
|
&.top-left .tooltip-arrow {
|
45
|
+
right: $tooltip-arrow-width;
|
51
46
|
bottom: 0;
|
52
|
-
|
47
|
+
margin-bottom: -$tooltip-arrow-width;
|
53
48
|
border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
|
54
49
|
border-top-color: $tooltip-arrow-color;
|
55
50
|
}
|
56
51
|
&.top-right .tooltip-arrow {
|
57
52
|
bottom: 0;
|
58
|
-
|
53
|
+
left: $tooltip-arrow-width;
|
54
|
+
margin-bottom: -$tooltip-arrow-width;
|
59
55
|
border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
|
60
56
|
border-top-color: $tooltip-arrow-color;
|
61
57
|
}
|
@@ -82,14 +78,35 @@
|
|
82
78
|
}
|
83
79
|
&.bottom-left .tooltip-arrow {
|
84
80
|
top: 0;
|
85
|
-
|
81
|
+
right: $tooltip-arrow-width;
|
82
|
+
margin-top: -$tooltip-arrow-width;
|
86
83
|
border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
|
87
84
|
border-bottom-color: $tooltip-arrow-color;
|
88
85
|
}
|
89
86
|
&.bottom-right .tooltip-arrow {
|
90
87
|
top: 0;
|
91
|
-
|
88
|
+
left: $tooltip-arrow-width;
|
89
|
+
margin-top: -$tooltip-arrow-width;
|
92
90
|
border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
|
93
91
|
border-bottom-color: $tooltip-arrow-color;
|
94
92
|
}
|
95
93
|
}
|
94
|
+
|
95
|
+
// Wrapper for the tooltip content
|
96
|
+
.tooltip-inner {
|
97
|
+
max-width: $tooltip-max-width;
|
98
|
+
padding: 3px 8px;
|
99
|
+
color: $tooltip-color;
|
100
|
+
text-align: center;
|
101
|
+
background-color: $tooltip-bg;
|
102
|
+
border-radius: $border-radius-base;
|
103
|
+
}
|
104
|
+
|
105
|
+
// Arrows
|
106
|
+
.tooltip-arrow {
|
107
|
+
position: absolute;
|
108
|
+
width: 0;
|
109
|
+
height: 0;
|
110
|
+
border-color: transparent;
|
111
|
+
border-style: solid;
|
112
|
+
}
|
@@ -15,7 +15,7 @@ h1, h2, h3, h4, h5, h6,
|
|
15
15
|
|
16
16
|
small,
|
17
17
|
.small {
|
18
|
-
font-weight:
|
18
|
+
font-weight: 400;
|
19
19
|
line-height: 1;
|
20
20
|
color: $headings-small-color;
|
21
21
|
}
|
@@ -82,8 +82,8 @@ small,
|
|
82
82
|
|
83
83
|
mark,
|
84
84
|
.mark {
|
85
|
-
background-color: $state-warning-bg;
|
86
85
|
padding: .2em;
|
86
|
+
background-color: $state-warning-bg;
|
87
87
|
}
|
88
88
|
|
89
89
|
// Alignment
|
@@ -176,8 +176,8 @@ ol {
|
|
176
176
|
|
177
177
|
> li {
|
178
178
|
display: inline-block;
|
179
|
-
padding-left: 5px;
|
180
179
|
padding-right: 5px;
|
180
|
+
padding-left: 5px;
|
181
181
|
}
|
182
182
|
}
|
183
183
|
|
@@ -191,7 +191,7 @@ dd {
|
|
191
191
|
line-height: $line-height-base;
|
192
192
|
}
|
193
193
|
dt {
|
194
|
-
font-weight:
|
194
|
+
font-weight: 700;
|
195
195
|
}
|
196
196
|
dd {
|
197
197
|
margin-left: 0; // Undo browser default
|
@@ -207,7 +207,7 @@ dd {
|
|
207
207
|
@include clearfix; // Clear the floated `dt` if an empty `dd` is present
|
208
208
|
}
|
209
209
|
|
210
|
-
@media (min-width: $
|
210
|
+
@media (min-width: $dl-horizontal-breakpoint) {
|
211
211
|
dt {
|
212
212
|
float: left;
|
213
213
|
width: ($dl-horizontal-offset - 20);
|
@@ -226,15 +226,15 @@ dd {
|
|
226
226
|
// -------------------------
|
227
227
|
|
228
228
|
// Abbreviations and acronyms
|
229
|
-
abbr[title],
|
230
229
|
// Add data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257
|
230
|
+
abbr[title],
|
231
231
|
abbr[data-original-title] {
|
232
232
|
cursor: help;
|
233
|
-
border-bottom: 1px dotted $abbr-border-color;
|
234
233
|
}
|
234
|
+
|
235
235
|
.initialism {
|
236
236
|
font-size: 90%;
|
237
|
-
text-
|
237
|
+
@extend .text-uppercase;
|
238
238
|
}
|
239
239
|
|
240
240
|
// Blockquotes
|
@@ -263,7 +263,7 @@ blockquote {
|
|
263
263
|
color: $blockquote-small-color;
|
264
264
|
|
265
265
|
&:before {
|
266
|
-
content:
|
266
|
+
content: "\2014 \00A0"; // em dash, nbsp
|
267
267
|
}
|
268
268
|
}
|
269
269
|
}
|
@@ -275,17 +275,17 @@ blockquote {
|
|
275
275
|
blockquote.pull-right {
|
276
276
|
padding-right: 15px;
|
277
277
|
padding-left: 0;
|
278
|
+
text-align: right;
|
278
279
|
border-right: 5px solid $blockquote-border-color;
|
279
280
|
border-left: 0;
|
280
|
-
text-align: right;
|
281
281
|
|
282
282
|
// Account for citation
|
283
283
|
footer,
|
284
284
|
small,
|
285
285
|
.small {
|
286
|
-
&:before { content:
|
286
|
+
&:before { content: ""; }
|
287
287
|
&:after {
|
288
|
-
content:
|
288
|
+
content: "\00A0 \2014"; // nbsp, em dash
|
289
289
|
}
|
290
290
|
}
|
291
291
|
}
|
@@ -1,8 +1,4 @@
|
|
1
|
-
|
2
|
-
// When there no function is defined, `fn('')` is parsed as string that equals the right hand side
|
3
|
-
// NB: in Sass 3.3 there is a native function: function-exists(twbs-font-path)
|
4
|
-
$bootstrap-sass-asset-helper: (twbs-font-path("") != unquote('twbs-font-path("")')) !default;
|
5
|
-
|
1
|
+
$bootstrap-sass-asset-helper: false !default;
|
6
2
|
//
|
7
3
|
// Variables
|
8
4
|
// --------------------------------------------------
|
@@ -19,7 +15,7 @@ $gray: lighten($gray-base, 33.5%) !default; // #555
|
|
19
15
|
$gray-light: lighten($gray-base, 46.7%) !default; // #777
|
20
16
|
$gray-lighter: lighten($gray-base, 93.5%) !default; // #eee
|
21
17
|
|
22
|
-
$brand-primary: #428bca !default;
|
18
|
+
$brand-primary: darken(#428bca, 6.5%) !default; // #337ab7
|
23
19
|
$brand-success: #5cb85c !default;
|
24
20
|
$brand-info: #5bc0de !default;
|
25
21
|
$brand-warning: #f0ad4e !default;
|
@@ -55,14 +51,14 @@ $font-family-base: $font-family-sans-serif !default;
|
|
55
51
|
|
56
52
|
$font-size-base: 14px !default;
|
57
53
|
$font-size-large: ceil(($font-size-base * 1.25)) !default; // ~18px
|
58
|
-
$font-size-small: ceil(($font-size-base *
|
54
|
+
$font-size-small: ceil(($font-size-base * .85)) !default; // ~12px
|
59
55
|
|
60
56
|
$font-size-h1: floor(($font-size-base * 2.6)) !default; // ~36px
|
61
57
|
$font-size-h2: floor(($font-size-base * 2.15)) !default; // ~30px
|
62
58
|
$font-size-h3: ceil(($font-size-base * 1.7)) !default; // ~24px
|
63
59
|
$font-size-h4: ceil(($font-size-base * 1.25)) !default; // ~18px
|
64
60
|
$font-size-h5: $font-size-base !default;
|
65
|
-
$font-size-h6: ceil(($font-size-base *
|
61
|
+
$font-size-h6: ceil(($font-size-base * .85)) !default; // ~12px
|
66
62
|
|
67
63
|
//** Unit-less `line-height` for use in components like buttons.
|
68
64
|
$line-height-base: 1.428571429 !default; // 20/14
|
@@ -82,7 +78,8 @@ $headings-color: inherit !default;
|
|
82
78
|
|
83
79
|
//** Load fonts from this directory.
|
84
80
|
|
85
|
-
// [converter]
|
81
|
+
// [converter] If $bootstrap-sass-asset-helper if used, provide path relative to the assets load path.
|
82
|
+
// [converter] This is because some asset helpers, such as Sprockets, do not work with file-relative paths.
|
86
83
|
$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
|
87
84
|
|
88
85
|
//** File name for all font files.
|
@@ -107,7 +104,7 @@ $padding-small-horizontal: 10px !default;
|
|
107
104
|
$padding-xs-vertical: 1px !default;
|
108
105
|
$padding-xs-horizontal: 5px !default;
|
109
106
|
|
110
|
-
$line-height-large: 1.
|
107
|
+
$line-height-large: 1.3333333 !default; // extra decimals for Win 8.1 Chrome
|
111
108
|
$line-height-small: 1.5 !default;
|
112
109
|
|
113
110
|
$border-radius-base: 4px !default;
|
@@ -119,7 +116,7 @@ $component-active-color: #fff !default;
|
|
119
116
|
//** Global background color for active items (e.g., navs or dropdowns).
|
120
117
|
$component-active-bg: $brand-primary !default;
|
121
118
|
|
122
|
-
//** Width of the `border` for generating carets that
|
119
|
+
//** Width of the `border` for generating carets that indicate dropdowns.
|
123
120
|
$caret-width-base: 4px !default;
|
124
121
|
//** Carets increase slightly in size for larger components.
|
125
122
|
$caret-width-large: 5px !default;
|
@@ -178,6 +175,11 @@ $btn-danger-border: darken($btn-danger-bg, 5%) !default;
|
|
178
175
|
|
179
176
|
$btn-link-disabled-color: $gray-light !default;
|
180
177
|
|
178
|
+
// Allows for customizing button radius independently from global border radius
|
179
|
+
$btn-border-radius-base: $border-radius-base !default;
|
180
|
+
$btn-border-radius-large: $border-radius-large !default;
|
181
|
+
$btn-border-radius-small: $border-radius-small !default;
|
182
|
+
|
181
183
|
|
182
184
|
//== Forms
|
183
185
|
//
|
@@ -195,6 +197,7 @@ $input-border: #ccc !default;
|
|
195
197
|
|
196
198
|
// TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
|
197
199
|
//** Default `.form-control` border radius
|
200
|
+
// This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
|
198
201
|
$input-border-radius: $border-radius-base !default;
|
199
202
|
//** Large `.form-control` border radius
|
200
203
|
$input-border-radius-large: $border-radius-large !default;
|
@@ -214,6 +217,9 @@ $input-height-large: (ceil($font-size-large * $line-height-large) +
|
|
214
217
|
//** Small `.form-control` height
|
215
218
|
$input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;
|
216
219
|
|
220
|
+
//** `.form-group` margin
|
221
|
+
$form-group-margin-bottom: 15px !default;
|
222
|
+
|
217
223
|
$legend-color: $gray-dark !default;
|
218
224
|
$legend-border-color: #e5e5e5 !default;
|
219
225
|
|
@@ -233,7 +239,7 @@ $cursor-disabled: not-allowed !default;
|
|
233
239
|
//** Background for the dropdown menu.
|
234
240
|
$dropdown-bg: #fff !default;
|
235
241
|
//** Dropdown menu `border-color`.
|
236
|
-
$dropdown-border: rgba(0,0,0
|
242
|
+
$dropdown-border: rgba(0, 0, 0, .15) !default;
|
237
243
|
//** Dropdown menu `border-color` **for IE8**.
|
238
244
|
$dropdown-fallback-border: #ccc !default;
|
239
245
|
//** Divider color for between dropdown items.
|
@@ -273,7 +279,8 @@ $zindex-dropdown: 1000 !default;
|
|
273
279
|
$zindex-popover: 1060 !default;
|
274
280
|
$zindex-tooltip: 1070 !default;
|
275
281
|
$zindex-navbar-fixed: 1030 !default;
|
276
|
-
$zindex-modal:
|
282
|
+
$zindex-modal-background: 1040 !default;
|
283
|
+
$zindex-modal: 1050 !default;
|
277
284
|
|
278
285
|
|
279
286
|
//== Media queries breakpoints
|
@@ -386,7 +393,7 @@ $navbar-default-toggle-icon-bar-bg: #888 !default;
|
|
386
393
|
$navbar-default-toggle-border-color: #ddd !default;
|
387
394
|
|
388
395
|
|
389
|
-
|
396
|
+
//=== Inverted navbar
|
390
397
|
// Reset inverted navbar basics
|
391
398
|
$navbar-inverse-color: lighten($gray-light, 15%) !default;
|
392
399
|
$navbar-inverse-bg: #222 !default;
|
@@ -487,6 +494,7 @@ $jumbotron-color: inherit !default;
|
|
487
494
|
$jumbotron-bg: $gray-lighter !default;
|
488
495
|
$jumbotron-heading-color: inherit !default;
|
489
496
|
$jumbotron-font-size: ceil(($font-size-base * 1.5)) !default;
|
497
|
+
$jumbotron-heading-font-size: ceil(($font-size-base * 4.5)) !default;
|
490
498
|
|
491
499
|
|
492
500
|
//== Form states and alerts
|
@@ -537,7 +545,7 @@ $popover-bg: #fff !default;
|
|
537
545
|
//** Popover maximum width
|
538
546
|
$popover-max-width: 276px !default;
|
539
547
|
//** Popover border color
|
540
|
-
$popover-border-color: rgba(0,0,0
|
548
|
+
$popover-border-color: rgba(0, 0, 0, .2) !default;
|
541
549
|
//** Popover fallback border color
|
542
550
|
$popover-fallback-border-color: #ccc !default;
|
543
551
|
|
@@ -595,7 +603,7 @@ $modal-title-line-height: $line-height-base !default;
|
|
595
603
|
//** Background color of modal content area
|
596
604
|
$modal-content-bg: #fff !default;
|
597
605
|
//** Modal content border color
|
598
|
-
$modal-content-border-color: rgba(0,0,0
|
606
|
+
$modal-content-border-color: rgba(0, 0, 0, .2) !default;
|
599
607
|
//** Modal content border color **for IE8**
|
600
608
|
$modal-content-fallback-border-color: #999 !default;
|
601
609
|
|
@@ -800,7 +808,7 @@ $breadcrumb-separator: "/" !default;
|
|
800
808
|
//
|
801
809
|
//##
|
802
810
|
|
803
|
-
$carousel-text-shadow: 0 1px 2px rgba(0,0,0
|
811
|
+
$carousel-text-shadow: 0 1px 2px rgba(0, 0, 0, .6) !default;
|
804
812
|
|
805
813
|
$carousel-control-color: #fff !default;
|
806
814
|
$carousel-control-width: 15% !default;
|
@@ -860,5 +868,7 @@ $blockquote-border-color: $gray-lighter !default;
|
|
860
868
|
$page-header-border-color: $gray-lighter !default;
|
861
869
|
//** Width of horizontal description list titles
|
862
870
|
$dl-horizontal-offset: $component-offset-horizontal !default;
|
871
|
+
//** Point at which .dl-horizontal becomes horizontal
|
872
|
+
$dl-horizontal-breakpoint: $grid-float-breakpoint !default;
|
863
873
|
//** Horizontal line color.
|
864
874
|
$hr-border: $gray-lighter !default;
|
@@ -11,10 +11,10 @@
|
|
11
11
|
background-color: $well-bg;
|
12
12
|
border: 1px solid $well-border;
|
13
13
|
border-radius: $border-radius-base;
|
14
|
-
@include box-shadow(inset 0 1px 1px rgba(0,0,0
|
14
|
+
@include box-shadow(inset 0 1px 1px rgba(0, 0, 0, .05));
|
15
15
|
blockquote {
|
16
16
|
border-color: #ddd;
|
17
|
-
border-color: rgba(0,0,0
|
17
|
+
border-color: rgba(0, 0, 0, .15);
|
18
18
|
}
|
19
19
|
}
|
20
20
|
|
@@ -1,13 +1,14 @@
|
|
1
1
|
// Alerts
|
2
2
|
|
3
3
|
@mixin alert-variant($background, $border, $text-color) {
|
4
|
+
color: $text-color;
|
4
5
|
background-color: $background;
|
5
6
|
border-color: $border;
|
6
|
-
color: $text-color;
|
7
7
|
|
8
8
|
hr {
|
9
9
|
border-top-color: darken($border, 5%);
|
10
10
|
}
|
11
|
+
|
11
12
|
.alert-link {
|
12
13
|
color: darken($text-color, 10%);
|
13
14
|
}
|
@@ -1,18 +1,18 @@
|
|
1
1
|
// Single side border-radius
|
2
2
|
|
3
3
|
@mixin border-top-radius($radius) {
|
4
|
+
border-top-left-radius: $radius;
|
4
5
|
border-top-right-radius: $radius;
|
5
|
-
border-top-left-radius: $radius;
|
6
6
|
}
|
7
7
|
@mixin border-right-radius($radius) {
|
8
|
+
border-top-right-radius: $radius;
|
8
9
|
border-bottom-right-radius: $radius;
|
9
|
-
border-top-right-radius: $radius;
|
10
10
|
}
|
11
11
|
@mixin border-bottom-radius($radius) {
|
12
12
|
border-bottom-right-radius: $radius;
|
13
|
-
|
13
|
+
border-bottom-left-radius: $radius;
|
14
14
|
}
|
15
15
|
@mixin border-left-radius($radius) {
|
16
|
+
border-top-left-radius: $radius;
|
16
17
|
border-bottom-left-radius: $radius;
|
17
|
-
border-top-left-radius: $radius;
|
18
18
|
}
|