Skip to content

Commit e98edf3

Browse files
committed
update bootstrap to 4.3.1, fontawesome 5.7
1 parent 8f4ef5f commit e98edf3

File tree

99 files changed

+10831
-4934
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+10831
-4934
lines changed

assets/js/vendor/bootstrap.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/js/vendor/popper.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/sass/vendor/bootstrap/_alert.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
// Expand the right padding and account for the close button's positioning.
2828

2929
.alert-dismissible {
30-
padding-right: ($close-font-size + $alert-padding-x * 2);
30+
padding-right: $close-font-size + $alert-padding-x * 2;
3131

3232
// Adjust close link position
3333
.close {

assets/sass/vendor/bootstrap/_badge.scss

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,20 @@
66
.badge {
77
display: inline-block;
88
padding: $badge-padding-y $badge-padding-x;
9-
font-size: $badge-font-size;
9+
@include font-size($badge-font-size);
1010
font-weight: $badge-font-weight;
1111
line-height: 1;
1212
text-align: center;
1313
white-space: nowrap;
1414
vertical-align: baseline;
1515
@include border-radius($badge-border-radius);
16+
@include transition($badge-transition);
17+
18+
@at-root a#{&} {
19+
@include hover-focus {
20+
text-decoration: none;
21+
}
22+
}
1623

1724
// Empty badges collapse automatically
1825
&:empty {

assets/sass/vendor/bootstrap/_button-group.scss

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
> .btn {
1111
position: relative;
12-
flex: 0 1 auto;
12+
flex: 1 1 auto;
1313

1414
// Bring the hover, focused, and "active" buttons to the front to overlay
1515
// the borders properly
@@ -22,14 +22,6 @@
2222
z-index: 1;
2323
}
2424
}
25-
26-
// Prevent double borders when buttons are next to each other
27-
.btn + .btn,
28-
.btn + .btn-group,
29-
.btn-group + .btn,
30-
.btn-group + .btn-group {
31-
margin-left: -$btn-border-width;
32-
}
3325
}
3426

3527
// Optional: Group multiple button groups together for a toolbar
@@ -44,8 +36,10 @@
4436
}
4537

4638
.btn-group {
47-
> .btn:first-child {
48-
margin-left: 0;
39+
// Prevent double borders when buttons are next to each other
40+
> .btn:not(:first-child),
41+
> .btn-group:not(:first-child) {
42+
margin-left: -$btn-border-width;
4943
}
5044

5145
// Reset rounded corners
@@ -119,17 +113,14 @@
119113
align-items: flex-start;
120114
justify-content: center;
121115

122-
.btn,
123-
.btn-group {
116+
> .btn,
117+
> .btn-group {
124118
width: 100%;
125119
}
126120

127-
> .btn + .btn,
128-
> .btn + .btn-group,
129-
> .btn-group + .btn,
130-
> .btn-group + .btn-group {
121+
> .btn:not(:first-child),
122+
> .btn-group:not(:first-child) {
131123
margin-top: -$btn-border-width;
132-
margin-left: 0;
133124
}
134125

135126
// Reset rounded corners

assets/sass/vendor/bootstrap/_buttons.scss

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,19 @@
66

77
.btn {
88
display: inline-block;
9+
font-family: $btn-font-family;
910
font-weight: $btn-font-weight;
11+
color: $body-color;
1012
text-align: center;
11-
white-space: nowrap;
1213
vertical-align: middle;
1314
user-select: none;
15+
background-color: transparent;
1416
border: $btn-border-width solid transparent;
15-
@include button-size($btn-padding-y, $btn-padding-x, $font-size-base, $btn-line-height, $btn-border-radius);
17+
@include button-size($btn-padding-y, $btn-padding-x, $btn-font-size, $btn-line-height, $btn-border-radius);
1618
@include transition($btn-transition);
1719

18-
// Share hover and focus styles
19-
@include hover-focus {
20+
@include hover {
21+
color: $body-color;
2022
text-decoration: none;
2123
}
2224

@@ -33,11 +35,6 @@
3335
@include box-shadow(none);
3436
}
3537

36-
// Opinionated: add "hand" cursor to non-disabled .btn elements
37-
&:not(:disabled):not(.disabled) {
38-
cursor: pointer;
39-
}
40-
4138
&:not(:disabled):not(.disabled):active,
4239
&:not(:disabled):not(.disabled).active {
4340
@include box-shadow($btn-active-box-shadow);
@@ -80,19 +77,16 @@ fieldset:disabled a.btn {
8077
.btn-link {
8178
font-weight: $font-weight-normal;
8279
color: $link-color;
83-
background-color: transparent;
80+
text-decoration: $link-decoration;
8481

8582
@include hover {
8683
color: $link-hover-color;
8784
text-decoration: $link-hover-decoration;
88-
background-color: transparent;
89-
border-color: transparent;
9085
}
9186

9287
&:focus,
9388
&.focus {
9489
text-decoration: $link-hover-decoration;
95-
border-color: transparent;
9690
box-shadow: none;
9791
}
9892

@@ -111,11 +105,11 @@ fieldset:disabled a.btn {
111105
//
112106

113107
.btn-lg {
114-
@include button-size($btn-padding-y-lg, $btn-padding-x-lg, $font-size-lg, $btn-line-height-lg, $btn-border-radius-lg);
108+
@include button-size($btn-padding-y-lg, $btn-padding-x-lg, $btn-font-size-lg, $btn-line-height-lg, $btn-border-radius-lg);
115109
}
116110

117111
.btn-sm {
118-
@include button-size($btn-padding-y-sm, $btn-padding-x-sm, $font-size-sm, $btn-line-height-sm, $btn-border-radius-sm);
112+
@include button-size($btn-padding-y-sm, $btn-padding-x-sm, $btn-font-size-sm, $btn-line-height-sm, $btn-border-radius-sm);
119113
}
120114

121115

assets/sass/vendor/bootstrap/_card.scss

Lines changed: 36 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
position: relative;
77
display: flex;
88
flex-direction: column;
9-
min-width: 0;
9+
min-width: 0; // See https://github.com/twbs/bootstrap/pull/22740#issuecomment-305868106
1010
word-wrap: break-word;
1111
background-color: $card-bg;
1212
background-clip: border-box;
@@ -36,14 +36,15 @@
3636
// as much space as possible, ensuring footers are aligned to the bottom.
3737
flex: 1 1 auto;
3838
padding: $card-spacer-x;
39+
color: $card-color;
3940
}
4041

4142
.card-title {
4243
margin-bottom: $card-spacer-y;
4344
}
4445

4546
.card-subtitle {
46-
margin-top: -($card-spacer-y / 2);
47+
margin-top: -$card-spacer-y / 2;
4748
margin-bottom: 0;
4849
}
4950

@@ -68,6 +69,7 @@
6869
.card-header {
6970
padding: $card-spacer-y $card-spacer-x;
7071
margin-bottom: 0; // Removes the default margin-bottom of <hN>
72+
color: $card-cap-color;
7173
background-color: $card-cap-bg;
7274
border-bottom: $card-border-width solid $card-border-color;
7375

@@ -98,15 +100,15 @@
98100
//
99101

100102
.card-header-tabs {
101-
margin-right: -($card-spacer-x / 2);
103+
margin-right: -$card-spacer-x / 2;
102104
margin-bottom: -$card-spacer-y;
103-
margin-left: -($card-spacer-x / 2);
105+
margin-left: -$card-spacer-x / 2;
104106
border-bottom: 0;
105107
}
106108

107109
.card-header-pills {
108-
margin-right: -($card-spacer-x / 2);
109-
margin-left: -($card-spacer-x / 2);
110+
margin-right: -$card-spacer-x / 2;
111+
margin-left: -$card-spacer-x / 2;
110112
}
111113

112114
// Card image
@@ -194,55 +196,35 @@
194196

195197
// Handle rounded corners
196198
@if $enable-rounded {
197-
&:first-child {
199+
&:not(:last-child) {
198200
@include border-right-radius(0);
199201

200202
.card-img-top,
201203
.card-header {
204+
// stylelint-disable-next-line property-blacklist
202205
border-top-right-radius: 0;
203206
}
204207
.card-img-bottom,
205208
.card-footer {
209+
// stylelint-disable-next-line property-blacklist
206210
border-bottom-right-radius: 0;
207211
}
208212
}
209213

210-
&:last-child {
214+
&:not(:first-child) {
211215
@include border-left-radius(0);
212216

213217
.card-img-top,
214218
.card-header {
219+
// stylelint-disable-next-line property-blacklist
215220
border-top-left-radius: 0;
216221
}
217222
.card-img-bottom,
218223
.card-footer {
224+
// stylelint-disable-next-line property-blacklist
219225
border-bottom-left-radius: 0;
220226
}
221227
}
222-
223-
&:only-child {
224-
@include border-radius($card-border-radius);
225-
226-
.card-img-top,
227-
.card-header {
228-
@include border-top-radius($card-border-radius);
229-
}
230-
.card-img-bottom,
231-
.card-footer {
232-
@include border-bottom-radius($card-border-radius);
233-
}
234-
}
235-
236-
&:not(:first-child):not(:last-child):not(:only-child) {
237-
@include border-radius(0);
238-
239-
.card-img-top,
240-
.card-img-bottom,
241-
.card-header,
242-
.card-footer {
243-
@include border-radius(0);
244-
}
245-
}
246228
}
247229
}
248230
}
@@ -277,25 +259,31 @@
277259
//
278260

279261
.accordion {
280-
.card:not(:first-of-type):not(:last-of-type) {
281-
border-bottom: 0;
282-
border-radius: 0;
283-
}
262+
> .card {
263+
overflow: hidden;
284264

285-
.card:not(:first-of-type) {
286-
.card-header:first-child {
287-
border-radius: 0;
265+
&:not(:first-of-type) {
266+
.card-header:first-child {
267+
@include border-radius(0);
268+
}
269+
270+
&:not(:last-of-type) {
271+
border-bottom: 0;
272+
@include border-radius(0);
273+
}
288274
}
289-
}
290275

291-
.card:first-of-type {
292-
border-bottom: 0;
293-
border-bottom-right-radius: 0;
294-
border-bottom-left-radius: 0;
295-
}
276+
&:first-of-type {
277+
border-bottom: 0;
278+
@include border-bottom-radius(0);
279+
}
296280

297-
.card:last-of-type {
298-
border-top-left-radius: 0;
299-
border-top-right-radius: 0;
281+
&:last-of-type {
282+
@include border-top-radius(0);
283+
}
284+
285+
.card-header {
286+
margin-bottom: -$card-border-width;
287+
}
300288
}
301289
}

0 commit comments

Comments
 (0)