bootstrap 4.2.1 → 4.5.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +15 -1
- data/CHANGELOG.md +2 -14
- data/README.md +1 -1
- data/assets/javascripts/bootstrap-sprockets.js +7 -7
- data/assets/javascripts/bootstrap.js +1054 -893
- data/assets/javascripts/bootstrap.min.js +4 -4
- data/assets/javascripts/bootstrap/alert.js +35 -57
- data/assets/javascripts/bootstrap/button.js +95 -69
- data/assets/javascripts/bootstrap/carousel.js +109 -165
- data/assets/javascripts/bootstrap/collapse.js +58 -114
- data/assets/javascripts/bootstrap/dropdown.js +138 -191
- data/assets/javascripts/bootstrap/modal.js +170 -176
- data/assets/javascripts/bootstrap/popover.js +31 -87
- data/assets/javascripts/bootstrap/scrollspy.js +54 -114
- data/assets/javascripts/bootstrap/tab.js +62 -81
- data/assets/javascripts/bootstrap/toast.js +80 -117
- data/assets/javascripts/bootstrap/tooltip.js +269 -157
- data/assets/javascripts/bootstrap/util.js +34 -9
- data/assets/stylesheets/_bootstrap-grid.scss +4 -4
- data/assets/stylesheets/_bootstrap-reboot.scss +4 -4
- data/assets/stylesheets/_bootstrap.scss +4 -4
- data/assets/stylesheets/bootstrap/_badge.scss +3 -2
- data/assets/stylesheets/bootstrap/_breadcrumb.scss +4 -1
- data/assets/stylesheets/bootstrap/_button-group.scss +1 -1
- data/assets/stylesheets/bootstrap/_buttons.scss +13 -11
- data/assets/stylesheets/bootstrap/_card.scss +49 -73
- data/assets/stylesheets/bootstrap/_carousel.scss +7 -8
- data/assets/stylesheets/bootstrap/_close.scss +3 -7
- data/assets/stylesheets/bootstrap/_code.scss +6 -6
- data/assets/stylesheets/bootstrap/_custom-forms.scss +40 -24
- data/assets/stylesheets/bootstrap/_dropdown.scss +24 -23
- data/assets/stylesheets/bootstrap/_forms.scss +38 -25
- data/assets/stylesheets/bootstrap/_functions.scss +62 -7
- data/assets/stylesheets/bootstrap/_grid.scss +32 -11
- data/assets/stylesheets/bootstrap/_images.scss +3 -3
- data/assets/stylesheets/bootstrap/_input-group.scss +4 -5
- data/assets/stylesheets/bootstrap/_jumbotron.scss +1 -0
- data/assets/stylesheets/bootstrap/_list-group.scss +62 -29
- data/assets/stylesheets/bootstrap/_mixins.scss +9 -3
- data/assets/stylesheets/bootstrap/_modal.scss +65 -11
- data/assets/stylesheets/bootstrap/_nav.scss +6 -3
- data/assets/stylesheets/bootstrap/_navbar.scss +48 -23
- data/assets/stylesheets/bootstrap/_pagination.scss +3 -7
- data/assets/stylesheets/bootstrap/_popover.scss +54 -67
- data/assets/stylesheets/bootstrap/_print.scss +3 -3
- data/assets/stylesheets/bootstrap/_progress.scss +19 -6
- data/assets/stylesheets/bootstrap/_reboot.scss +51 -33
- data/assets/stylesheets/bootstrap/_root.scss +1 -0
- data/assets/stylesheets/bootstrap/_spinners.scss +3 -0
- data/assets/stylesheets/bootstrap/_tables.scss +6 -8
- data/assets/stylesheets/bootstrap/_toasts.scss +7 -4
- data/assets/stylesheets/bootstrap/_tooltip.scss +1 -1
- data/assets/stylesheets/bootstrap/_transitions.scss +0 -2
- data/assets/stylesheets/bootstrap/_type.scss +17 -17
- data/assets/stylesheets/bootstrap/_utilities.scss +2 -0
- data/assets/stylesheets/bootstrap/_variables.scss +168 -119
- data/assets/stylesheets/bootstrap/mixins/_background-variant.scss +5 -3
- data/assets/stylesheets/bootstrap/mixins/_badge.scss +7 -1
- data/assets/stylesheets/bootstrap/mixins/_border-radius.scss +51 -10
- data/assets/stylesheets/bootstrap/mixins/_box-shadow.scss +16 -1
- data/assets/stylesheets/bootstrap/mixins/_buttons.scss +14 -15
- data/assets/stylesheets/bootstrap/mixins/_caret.scss +12 -12
- data/assets/stylesheets/bootstrap/mixins/_deprecate.scss +10 -0
- data/assets/stylesheets/bootstrap/mixins/_float.scss +6 -3
- data/assets/stylesheets/bootstrap/mixins/_forms.scss +40 -60
- data/assets/stylesheets/bootstrap/mixins/_grid-framework.scss +29 -15
- data/assets/stylesheets/bootstrap/mixins/_grid.scss +25 -7
- data/assets/stylesheets/bootstrap/mixins/_hover.scss +4 -4
- data/assets/stylesheets/bootstrap/mixins/_image.scss +3 -3
- data/assets/stylesheets/bootstrap/mixins/_list-group.scss +1 -1
- data/assets/stylesheets/bootstrap/mixins/_lists.scss +1 -1
- data/assets/stylesheets/bootstrap/mixins/_nav-divider.scss +2 -1
- data/assets/stylesheets/bootstrap/mixins/_pagination.scss +1 -1
- data/assets/stylesheets/bootstrap/mixins/_reset-text.scss +2 -2
- data/assets/stylesheets/bootstrap/mixins/_screen-reader.scss +3 -2
- data/assets/stylesheets/bootstrap/mixins/_size.scss +1 -0
- data/assets/stylesheets/bootstrap/mixins/_table-row.scss +1 -1
- data/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss +7 -4
- data/assets/stylesheets/bootstrap/mixins/_text-hide.scss +1 -3
- data/assets/stylesheets/bootstrap/mixins/_transition.scss +17 -7
- data/assets/stylesheets/bootstrap/mixins/_visibility.scss +1 -0
- data/assets/stylesheets/bootstrap/utilities/_background.scss +2 -2
- data/assets/stylesheets/bootstrap/utilities/_borders.scss +13 -1
- data/assets/stylesheets/bootstrap/utilities/_display.scss +6 -18
- data/assets/stylesheets/bootstrap/utilities/_float.scss +5 -3
- data/assets/stylesheets/bootstrap/utilities/_interactions.scss +5 -0
- data/assets/stylesheets/bootstrap/utilities/_stretched-link.scss +19 -0
- data/assets/stylesheets/bootstrap/utilities/_text.scss +8 -3
- data/assets/stylesheets/bootstrap/utilities/_visibility.scss +4 -2
- data/assets/stylesheets/bootstrap/vendor/_rfs.scss +204 -0
- data/bootstrap.gemspec +1 -1
- data/lib/bootstrap/version.rb +2 -2
- data/tasks/updater/js.rb +1 -1
- data/tasks/updater/network.rb +2 -2
- data/test/dummy_rails/app/assets/config/manifest.js +3 -0
- data/test/dummy_rails/app/assets/stylesheets/.browserslistrc +1 -0
- data/test/gemfiles/rails_6_0.gemfile +7 -0
- data/test/support/dummy_rails_integration.rb +3 -1
- data/test/test_helper.rb +18 -13
- metadata +14 -5
@@ -1,13 +1,17 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
1
|
+
// Disable animation if transitions are disabled
|
2
|
+
@if $enable-transitions {
|
3
|
+
@keyframes progress-bar-stripes {
|
4
|
+
from { background-position: $progress-height 0; }
|
5
|
+
to { background-position: 0 0; }
|
6
|
+
}
|
4
7
|
}
|
5
8
|
|
6
9
|
.progress {
|
7
10
|
display: flex;
|
8
11
|
height: $progress-height;
|
9
12
|
overflow: hidden; // force rounded corners by cropping it
|
10
|
-
|
13
|
+
line-height: 0;
|
14
|
+
@include font-size($progress-font-size);
|
11
15
|
background-color: $progress-bg;
|
12
16
|
@include border-radius($progress-border-radius);
|
13
17
|
@include box-shadow($progress-box-shadow);
|
@@ -17,6 +21,7 @@
|
|
17
21
|
display: flex;
|
18
22
|
flex-direction: column;
|
19
23
|
justify-content: center;
|
24
|
+
overflow: hidden;
|
20
25
|
color: $progress-bar-color;
|
21
26
|
text-align: center;
|
22
27
|
white-space: nowrap;
|
@@ -29,6 +34,14 @@
|
|
29
34
|
background-size: $progress-height $progress-height;
|
30
35
|
}
|
31
36
|
|
32
|
-
|
33
|
-
|
37
|
+
@if $enable-transitions {
|
38
|
+
.progress-bar-animated {
|
39
|
+
animation: progress-bar-stripes $progress-bar-animation-timing;
|
40
|
+
|
41
|
+
@if $enable-prefers-reduced-motion-media-query {
|
42
|
+
@media (prefers-reduced-motion: reduce) {
|
43
|
+
animation: none;
|
44
|
+
}
|
45
|
+
}
|
46
|
+
}
|
34
47
|
}
|
@@ -46,7 +46,7 @@ article, aside, figcaption, figure, footer, header, hgroup, main, nav, section {
|
|
46
46
|
body {
|
47
47
|
margin: 0; // 1
|
48
48
|
font-family: $font-family-base;
|
49
|
-
font-size
|
49
|
+
@include font-size($font-size-base);
|
50
50
|
font-weight: $font-weight-base;
|
51
51
|
line-height: $line-height-base;
|
52
52
|
color: $body-color;
|
@@ -54,12 +54,16 @@ body {
|
|
54
54
|
background-color: $body-bg; // 2
|
55
55
|
}
|
56
56
|
|
57
|
-
//
|
58
|
-
//
|
59
|
-
//
|
57
|
+
// Future-proof rule: in browsers that support :focus-visible, suppress the focus outline
|
58
|
+
// on elements that programmatically receive focus but wouldn't normally show a visible
|
59
|
+
// focus outline. In general, this would mean that the outline is only applied if the
|
60
|
+
// interaction that led to the element receiving programmatic focus was a keyboard interaction,
|
61
|
+
// or the browser has somehow determined that the user is primarily a keyboard user and/or
|
62
|
+
// wants focus outlines to always be presented.
|
60
63
|
//
|
61
|
-
//
|
62
|
-
|
64
|
+
// See https://developer.mozilla.org/en-US/docs/Web/CSS/:focus-visible
|
65
|
+
// and https://developer.paciellogroup.com/blog/2018/03/focus-visible-and-backwards-compatibility/
|
66
|
+
[tabindex="-1"]:focus:not(:focus-visible) {
|
63
67
|
outline: 0 !important;
|
64
68
|
}
|
65
69
|
|
@@ -155,7 +159,7 @@ strong {
|
|
155
159
|
}
|
156
160
|
|
157
161
|
small {
|
158
|
-
font-size
|
162
|
+
@include font-size(80%); // Add the correct font size in all browsers
|
159
163
|
}
|
160
164
|
|
161
165
|
//
|
@@ -166,7 +170,7 @@ small {
|
|
166
170
|
sub,
|
167
171
|
sup {
|
168
172
|
position: relative;
|
169
|
-
font-size
|
173
|
+
@include font-size(75%);
|
170
174
|
line-height: 0;
|
171
175
|
vertical-align: baseline;
|
172
176
|
}
|
@@ -184,30 +188,25 @@ a {
|
|
184
188
|
text-decoration: $link-decoration;
|
185
189
|
background-color: transparent; // Remove the gray background on active links in IE 10.
|
186
190
|
|
187
|
-
@include hover {
|
191
|
+
@include hover() {
|
188
192
|
color: $link-hover-color;
|
189
193
|
text-decoration: $link-hover-decoration;
|
190
194
|
}
|
191
195
|
}
|
192
196
|
|
193
|
-
// And undo these styles for placeholder links/named anchors (without href)
|
194
|
-
// which have not been made explicitly keyboard-focusable (without tabindex).
|
197
|
+
// And undo these styles for placeholder links/named anchors (without href).
|
195
198
|
// It would be more straightforward to just use a[href] in previous block, but that
|
196
199
|
// causes specificity issues in many other styles that are too complex to fix.
|
197
200
|
// See https://github.com/twbs/bootstrap/issues/19402
|
198
201
|
|
199
|
-
a:not([href]):not([
|
202
|
+
a:not([href]):not([class]) {
|
200
203
|
color: inherit;
|
201
204
|
text-decoration: none;
|
202
205
|
|
203
|
-
@include hover
|
206
|
+
@include hover() {
|
204
207
|
color: inherit;
|
205
208
|
text-decoration: none;
|
206
209
|
}
|
207
|
-
|
208
|
-
&:focus {
|
209
|
-
outline: 0;
|
210
|
-
}
|
211
210
|
}
|
212
211
|
|
213
212
|
|
@@ -220,7 +219,7 @@ code,
|
|
220
219
|
kbd,
|
221
220
|
samp {
|
222
221
|
font-family: $font-family-monospace;
|
223
|
-
font-size
|
222
|
+
@include font-size(1em); // Correct the odd `em` font sizing in all browsers.
|
224
223
|
}
|
225
224
|
|
226
225
|
pre {
|
@@ -230,6 +229,9 @@ pre {
|
|
230
229
|
margin-bottom: 1rem;
|
231
230
|
// Don't allow content to break outside
|
232
231
|
overflow: auto;
|
232
|
+
// Disable auto-hiding scrollbar in IE & legacy Edge to avoid overlap,
|
233
|
+
// making it impossible to interact with the content
|
234
|
+
-ms-overflow-style: scrollbar;
|
233
235
|
}
|
234
236
|
|
235
237
|
|
@@ -297,6 +299,7 @@ label {
|
|
297
299
|
//
|
298
300
|
// Details at https://github.com/twbs/bootstrap/issues/24093
|
299
301
|
button {
|
302
|
+
// stylelint-disable-next-line property-blacklist
|
300
303
|
border-radius: 0;
|
301
304
|
}
|
302
305
|
|
@@ -316,7 +319,7 @@ optgroup,
|
|
316
319
|
textarea {
|
317
320
|
margin: 0; // Remove the margin in Firefox and Safari
|
318
321
|
font-family: inherit;
|
319
|
-
font-size
|
322
|
+
@include font-size(inherit);
|
320
323
|
line-height: inherit;
|
321
324
|
}
|
322
325
|
|
@@ -330,6 +333,21 @@ select {
|
|
330
333
|
text-transform: none; // Remove the inheritance of text transform in Firefox
|
331
334
|
}
|
332
335
|
|
336
|
+
// Set the cursor for non-`<button>` buttons
|
337
|
+
//
|
338
|
+
// Details at https://github.com/twbs/bootstrap/pull/30562
|
339
|
+
[role="button"] {
|
340
|
+
cursor: pointer;
|
341
|
+
}
|
342
|
+
|
343
|
+
// Remove the inheritance of word-wrap in Safari.
|
344
|
+
//
|
345
|
+
// Details at https://github.com/twbs/bootstrap/issues/24990
|
346
|
+
select {
|
347
|
+
word-wrap: normal;
|
348
|
+
}
|
349
|
+
|
350
|
+
|
333
351
|
// 1. Prevent a WebKit bug where (2) destroys native `audio` and `video`
|
334
352
|
// controls in Android 4.
|
335
353
|
// 2. Correct the inability to style clickable types in iOS and Safari.
|
@@ -340,6 +358,18 @@ button,
|
|
340
358
|
-webkit-appearance: button; // 2
|
341
359
|
}
|
342
360
|
|
361
|
+
// Opinionated: add "hand" cursor to non-disabled button elements.
|
362
|
+
@if $enable-pointer-cursor-for-buttons {
|
363
|
+
button,
|
364
|
+
[type="button"],
|
365
|
+
[type="reset"],
|
366
|
+
[type="submit"] {
|
367
|
+
&:not(:disabled) {
|
368
|
+
cursor: pointer;
|
369
|
+
}
|
370
|
+
}
|
371
|
+
}
|
372
|
+
|
343
373
|
// Remove inner border and padding from Firefox, but don't restore the outline like Normalize.
|
344
374
|
button::-moz-focus-inner,
|
345
375
|
[type="button"]::-moz-focus-inner,
|
@@ -356,18 +386,6 @@ input[type="checkbox"] {
|
|
356
386
|
}
|
357
387
|
|
358
388
|
|
359
|
-
input[type="date"],
|
360
|
-
input[type="time"],
|
361
|
-
input[type="datetime-local"],
|
362
|
-
input[type="month"] {
|
363
|
-
// Remove the default appearance of temporal inputs to avoid a Mobile Safari
|
364
|
-
// bug where setting a custom line-height prevents text from being vertically
|
365
|
-
// centered within the input.
|
366
|
-
// See https://bugs.webkit.org/show_bug.cgi?id=139848
|
367
|
-
// and https://github.com/twbs/bootstrap/issues/11266
|
368
|
-
-webkit-appearance: listbox;
|
369
|
-
}
|
370
|
-
|
371
389
|
textarea {
|
372
390
|
overflow: auto; // Remove the default vertical scrollbar in IE.
|
373
391
|
// Textareas should really only resize vertically so they don't break their (horizontal) containers.
|
@@ -395,7 +413,7 @@ legend {
|
|
395
413
|
max-width: 100%; // 1
|
396
414
|
padding: 0;
|
397
415
|
margin-bottom: .5rem;
|
398
|
-
font-size
|
416
|
+
@include font-size(1.5rem);
|
399
417
|
line-height: inherit;
|
400
418
|
color: inherit; // 2
|
401
419
|
white-space: normal; // 1
|
@@ -421,7 +439,7 @@ progress {
|
|
421
439
|
}
|
422
440
|
|
423
441
|
//
|
424
|
-
// Remove the inner padding
|
442
|
+
// Remove the inner padding in Chrome and Safari on macOS.
|
425
443
|
//
|
426
444
|
|
427
445
|
[type="search"]::-webkit-search-decoration {
|
@@ -13,6 +13,7 @@
|
|
13
13
|
vertical-align: text-bottom;
|
14
14
|
border: $spinner-border-width solid currentColor;
|
15
15
|
border-right-color: transparent;
|
16
|
+
// stylelint-disable-next-line property-blacklist
|
16
17
|
border-radius: 50%;
|
17
18
|
animation: spinner-border .75s linear infinite;
|
18
19
|
}
|
@@ -33,6 +34,7 @@
|
|
33
34
|
}
|
34
35
|
50% {
|
35
36
|
opacity: 1;
|
37
|
+
transform: none;
|
36
38
|
}
|
37
39
|
}
|
38
40
|
|
@@ -42,6 +44,7 @@
|
|
42
44
|
height: $spinner-height;
|
43
45
|
vertical-align: text-bottom;
|
44
46
|
background-color: currentColor;
|
47
|
+
// stylelint-disable-next-line property-blacklist
|
45
48
|
border-radius: 50%;
|
46
49
|
opacity: 0;
|
47
50
|
animation: spinner-grow .75s linear infinite;
|
@@ -5,6 +5,7 @@
|
|
5
5
|
.table {
|
6
6
|
width: 100%;
|
7
7
|
margin-bottom: $spacer;
|
8
|
+
color: $table-color;
|
8
9
|
background-color: $table-bg; // Reset for nesting within parents with `background-color`.
|
9
10
|
|
10
11
|
th,
|
@@ -22,10 +23,6 @@
|
|
22
23
|
tbody + tbody {
|
23
24
|
border-top: (2 * $table-border-width) solid $table-border-color;
|
24
25
|
}
|
25
|
-
|
26
|
-
.table {
|
27
|
-
background-color: $body-bg;
|
28
|
-
}
|
29
26
|
}
|
30
27
|
|
31
28
|
|
@@ -87,7 +84,8 @@
|
|
87
84
|
|
88
85
|
.table-hover {
|
89
86
|
tbody tr {
|
90
|
-
@include hover {
|
87
|
+
@include hover() {
|
88
|
+
color: $table-hover-color;
|
91
89
|
background-color: $table-hover-bg;
|
92
90
|
}
|
93
91
|
}
|
@@ -144,14 +142,15 @@
|
|
144
142
|
}
|
145
143
|
|
146
144
|
&.table-striped {
|
147
|
-
tbody tr:nth-of-type(
|
145
|
+
tbody tr:nth-of-type(#{$table-striped-order}) {
|
148
146
|
background-color: $table-dark-accent-bg;
|
149
147
|
}
|
150
148
|
}
|
151
149
|
|
152
150
|
&.table-hover {
|
153
151
|
tbody tr {
|
154
|
-
@include hover {
|
152
|
+
@include hover() {
|
153
|
+
color: $table-dark-hover-color;
|
155
154
|
background-color: $table-dark-hover-bg;
|
156
155
|
}
|
157
156
|
}
|
@@ -175,7 +174,6 @@
|
|
175
174
|
width: 100%;
|
176
175
|
overflow-x: auto;
|
177
176
|
-webkit-overflow-scrolling: touch;
|
178
|
-
-ms-overflow-style: -ms-autohiding-scrollbar; // See https://github.com/twbs/bootstrap/pull/10057
|
179
177
|
|
180
178
|
// Prevent double border on horizontal scroll due to use of `display: block;`
|
181
179
|
> .table-bordered {
|
@@ -1,14 +1,16 @@
|
|
1
1
|
.toast {
|
2
|
+
// Prevents from shrinking in IE11, when in a flex container
|
3
|
+
// See https://github.com/twbs/bootstrap/issues/28341
|
4
|
+
flex-basis: $toast-max-width;
|
2
5
|
max-width: $toast-max-width;
|
3
|
-
|
4
|
-
|
6
|
+
@include font-size($toast-font-size);
|
7
|
+
color: $toast-color;
|
5
8
|
background-color: $toast-background-color;
|
6
9
|
background-clip: padding-box;
|
7
10
|
border: $toast-border-width solid $toast-border-color;
|
8
|
-
border-radius: $toast-border-radius;
|
9
11
|
box-shadow: $toast-box-shadow;
|
10
|
-
backdrop-filter: blur(10px);
|
11
12
|
opacity: 0;
|
13
|
+
@include border-radius($toast-border-radius);
|
12
14
|
|
13
15
|
&:not(:last-child) {
|
14
16
|
margin-bottom: $toast-padding-x;
|
@@ -36,6 +38,7 @@
|
|
36
38
|
background-color: $toast-header-background-color;
|
37
39
|
background-clip: padding-box;
|
38
40
|
border-bottom: $toast-border-width solid $toast-header-border-color;
|
41
|
+
@include border-top-radius(subtract($toast-border-radius, $toast-border-width));
|
39
42
|
}
|
40
43
|
|
41
44
|
.toast-body {
|
@@ -7,7 +7,7 @@
|
|
7
7
|
// Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element.
|
8
8
|
// So reset our font and text properties to avoid inheriting weird values.
|
9
9
|
@include reset-text();
|
10
|
-
font-size
|
10
|
+
@include font-size($tooltip-font-size);
|
11
11
|
// Allow breaking very long words so they don't overflow the tooltip's bounds
|
12
12
|
word-wrap: break-word;
|
13
13
|
opacity: 0;
|
@@ -13,36 +13,36 @@ h1, h2, h3, h4, h5, h6,
|
|
13
13
|
color: $headings-color;
|
14
14
|
}
|
15
15
|
|
16
|
-
h1, .h1 { font-size
|
17
|
-
h2, .h2 { font-size
|
18
|
-
h3, .h3 { font-size
|
19
|
-
h4, .h4 { font-size
|
20
|
-
h5, .h5 { font-size
|
21
|
-
h6, .h6 { font-size
|
16
|
+
h1, .h1 { @include font-size($h1-font-size); }
|
17
|
+
h2, .h2 { @include font-size($h2-font-size); }
|
18
|
+
h3, .h3 { @include font-size($h3-font-size); }
|
19
|
+
h4, .h4 { @include font-size($h4-font-size); }
|
20
|
+
h5, .h5 { @include font-size($h5-font-size); }
|
21
|
+
h6, .h6 { @include font-size($h6-font-size); }
|
22
22
|
|
23
23
|
.lead {
|
24
|
-
font-size
|
24
|
+
@include font-size($lead-font-size);
|
25
25
|
font-weight: $lead-font-weight;
|
26
26
|
}
|
27
27
|
|
28
28
|
// Type display classes
|
29
29
|
.display-1 {
|
30
|
-
font-size
|
30
|
+
@include font-size($display1-size);
|
31
31
|
font-weight: $display1-weight;
|
32
32
|
line-height: $display-line-height;
|
33
33
|
}
|
34
34
|
.display-2 {
|
35
|
-
font-size
|
35
|
+
@include font-size($display2-size);
|
36
36
|
font-weight: $display2-weight;
|
37
37
|
line-height: $display-line-height;
|
38
38
|
}
|
39
39
|
.display-3 {
|
40
|
-
font-size
|
40
|
+
@include font-size($display3-size);
|
41
41
|
font-weight: $display3-weight;
|
42
42
|
line-height: $display-line-height;
|
43
43
|
}
|
44
44
|
.display-4 {
|
45
|
-
font-size
|
45
|
+
@include font-size($display4-size);
|
46
46
|
font-weight: $display4-weight;
|
47
47
|
line-height: $display-line-height;
|
48
48
|
}
|
@@ -66,7 +66,7 @@ hr {
|
|
66
66
|
|
67
67
|
small,
|
68
68
|
.small {
|
69
|
-
font-size
|
69
|
+
@include font-size($small-font-size);
|
70
70
|
font-weight: $font-weight-normal;
|
71
71
|
}
|
72
72
|
|
@@ -82,12 +82,12 @@ mark,
|
|
82
82
|
//
|
83
83
|
|
84
84
|
.list-unstyled {
|
85
|
-
@include list-unstyled;
|
85
|
+
@include list-unstyled();
|
86
86
|
}
|
87
87
|
|
88
88
|
// Inline turns list items into inline-block
|
89
89
|
.list-inline {
|
90
|
-
@include list-unstyled;
|
90
|
+
@include list-unstyled();
|
91
91
|
}
|
92
92
|
.list-inline-item {
|
93
93
|
display: inline-block;
|
@@ -104,19 +104,19 @@ mark,
|
|
104
104
|
|
105
105
|
// Builds on `abbr`
|
106
106
|
.initialism {
|
107
|
-
font-size
|
107
|
+
@include font-size(90%);
|
108
108
|
text-transform: uppercase;
|
109
109
|
}
|
110
110
|
|
111
111
|
// Blockquotes
|
112
112
|
.blockquote {
|
113
113
|
margin-bottom: $spacer;
|
114
|
-
font-size
|
114
|
+
@include font-size($blockquote-font-size);
|
115
115
|
}
|
116
116
|
|
117
117
|
.blockquote-footer {
|
118
118
|
display: block;
|
119
|
-
font-size
|
119
|
+
@include font-size($blockquote-small-font-size);
|
120
120
|
color: $blockquote-small-color;
|
121
121
|
|
122
122
|
&::before {
|