Skip to content

Commit df2546d

Browse files
authored
Merge branch 'v4-dev' into v4-dev-martijncuppens-placeholders
2 parents db5a928 + 38ca58b commit df2546d

4 files changed

Lines changed: 18 additions & 13 deletions

File tree

scss/_input-group.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@
128128
// manipulation.
129129

130130
.input-group-lg > .form-control,
131+
.input-group-lg > .custom-select,
131132
.input-group-lg > .input-group-prepend > .input-group-text,
132133
.input-group-lg > .input-group-append > .input-group-text,
133134
.input-group-lg > .input-group-prepend > .btn,
@@ -140,6 +141,7 @@
140141
}
141142

142143
.input-group-sm > .form-control,
144+
.input-group-sm > .custom-select,
143145
.input-group-sm > .input-group-prepend > .input-group-text,
144146
.input-group-sm > .input-group-append > .input-group-text,
145147
.input-group-sm > .input-group-prepend > .btn,
@@ -151,6 +153,11 @@
151153
@include border-radius($input-border-radius-sm);
152154
}
153155

156+
.input-group-lg > .custom-select,
157+
.input-group-sm > .custom-select {
158+
padding-right: ($custom-select-padding-x + $custom-select-indicator-padding);
159+
}
160+
154161

155162
// Prepend and append rounded corners
156163
//

scss/_reboot.scss

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,17 +111,19 @@ p {
111111

112112
// Abbreviations
113113
//
114-
// 1. Remove the bottom border in Firefox 39-.
114+
// 1. Duplicate behavior to the data-* attribute for our tooltip plugin
115115
// 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
116116
// 3. Add explicit cursor to indicate changed behavior.
117-
// 4. Duplicate behavior to the data-* attribute for our tooltip plugin
117+
// 4. Remove the bottom border in Firefox 39-.
118+
// 5. Prevent the text-decoration to be skipped.
118119

119120
abbr[title],
120-
abbr[data-original-title] { // 4
121+
abbr[data-original-title] { // 1
121122
text-decoration: underline; // 2
122123
text-decoration: underline dotted; // 2
123124
cursor: help; // 3
124-
border-bottom: 0; // 1
125+
border-bottom: 0; // 4
126+
text-decoration-skip-ink: none; // 5
125127
}
126128

127129
address {

scss/_spinners.scss

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77
}
88

99
.spinner-border {
10-
position: relative;
1110
display: inline-block;
1211
width: $spinner-width;
1312
height: $spinner-height;
1413
overflow: hidden;
1514
text-indent: -999em;
1615
vertical-align: text-bottom;
17-
border: $spinner-border-width solid;
18-
border-color: currentColor transparent currentColor currentColor;
16+
border: $spinner-border-width solid currentColor;
17+
border-right-color: transparent;
1918
border-radius: 50%;
2019
animation: spinner-border .75s linear infinite;
2120
}
@@ -32,20 +31,14 @@
3231

3332
@keyframes spinner-grow {
3433
0% {
35-
opacity: 0;
3634
transform: scale(0);
3735
}
3836
50% {
3937
opacity: 1;
4038
}
41-
100% {
42-
opacity: 0;
43-
transform: scale(1);
44-
}
4539
}
4640

4741
.spinner-grow {
48-
position: relative;
4942
display: inline-block;
5043
width: $spinner-width;
5144
height: $spinner-height;
@@ -54,6 +47,7 @@
5447
vertical-align: text-bottom;
5548
background-color: currentColor;
5649
border-radius: 50%;
50+
opacity: 0;
5751
animation: spinner-grow .75s linear infinite;
5852
}
5953

site/docs/4.1/utilities/text.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,10 @@ Quickly change the weight (boldness) of text or italicize text.
8585

8686
{% capture example %}
8787
<p class="font-weight-bold">Bold text.</p>
88+
<p class="font-weight-bolder">Bolder weight text (relative to the parent element).</p>
8889
<p class="font-weight-normal">Normal weight text.</p>
8990
<p class="font-weight-light">Light weight text.</p>
91+
<p class="font-weight-lighter">Lighter weight text (relative to the parent element).</p>
9092
<p class="font-italic">Italic text.</p>
9193
{% endcapture %}
9294
{% include example.html content=example %}

0 commit comments

Comments
 (0)