Skip to content

Commit 15ae54c

Browse files
committed
Update Bootstrap and FontAwesome
1 parent 8f2932a commit 15ae54c

Some content is hidden

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

77 files changed

+1150
-946
lines changed

assets/_sass/bootstrap/vendor/_alert.scss

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
.alert {
66
padding: $alert-padding;
77
margin-bottom: $spacer-y;
8-
border: 1px solid transparent;
8+
border: $alert-border-width solid transparent;
99
@include border-radius($alert-border-radius);
1010

1111
// Improve alignment and spacing of inner content
@@ -20,7 +20,6 @@
2020

2121
// Headings for larger alerts
2222
.alert-heading {
23-
margin-top: 0;
2423
// Specified to prevent conflicts of changing $headings-color
2524
color: inherit;
2625
}
@@ -62,5 +61,5 @@
6261
@include alert-variant($alert-warning-bg, $alert-warning-border, $alert-warning-text);
6362
}
6463
.alert-danger {
65-
@include alert-variant($alert-danger-bg, $alert-danger-border,$alert-danger-text);
64+
@include alert-variant($alert-danger-bg, $alert-danger-border, $alert-danger-text);
6665
}

assets/_sass/bootstrap/vendor/_breadcrumb.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
list-style: none;
55
background-color: $breadcrumb-bg;
66
@include border-radius($border-radius);
7+
@include clearfix;
78

89
> li {
9-
display: inline-block;
10+
float: left;
1011

11-
+ li:before {
12-
$nbsp: "\00a0";
12+
+ li::before {
1313
padding-right: .5rem;
1414
padding-left: .5rem;
1515
color: $breadcrumb-divider-color;
16-
content: "#{$breadcrumb-divider}#{$nbsp}"; // Unicode space added since inline-block means non-collapsing white-space
16+
content: "#{$breadcrumb-divider}";
1717
}
1818
}
1919

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
.btn + .btn-group,
2828
.btn-group + .btn,
2929
.btn-group + .btn-group {
30-
margin-left: -1px;
30+
margin-left: -$input-btn-border-width;
3131
}
3232
}
3333

@@ -167,7 +167,7 @@
167167
> .btn + .btn-group,
168168
> .btn-group + .btn,
169169
> .btn-group + .btn-group {
170-
margin-top: -1px;
170+
margin-top: -$input-btn-border-width;
171171
margin-left: 0;
172172
}
173173
}

assets/_sass/bootstrap/vendor/_buttons.scss

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@
88
text-align: center;
99
white-space: nowrap;
1010
vertical-align: middle;
11-
touch-action: manipulation;
1211
cursor: pointer;
1312
user-select: none;
14-
border: $border-width solid transparent;
13+
border: $input-btn-border-width solid transparent;
1514
@include button-size($btn-padding-y, $btn-padding-x, $font-size-base, $line-height, $btn-border-radius);
1615
@include transition(all .2s ease-in-out);
1716

@@ -39,16 +38,15 @@
3938
}
4039

4140
&.disabled,
42-
&:disabled,
43-
fieldset[disabled] & {
41+
&:disabled {
4442
cursor: $cursor-disabled;
4543
opacity: .65;
4644
@include box-shadow(none);
4745
}
4846
}
4947

5048
// Future-proof disabling of clicks on `<a>` elements
51-
a.btn.disaabled,
49+
a.btn.disabled,
5250
fieldset[disabled] a.btn {
5351
pointer-events: none;
5452
}
@@ -111,8 +109,7 @@ fieldset[disabled] a.btn {
111109
&,
112110
&:active,
113111
&.active,
114-
&:disabled,
115-
fieldset[disabled] & {
112+
&:disabled {
116113
background-color: transparent;
117114
@include box-shadow(none);
118115
}
@@ -129,8 +126,7 @@ fieldset[disabled] a.btn {
129126
text-decoration: $link-hover-decoration;
130127
background-color: transparent;
131128
}
132-
&:disabled,
133-
fieldset[disabled] & {
129+
&:disabled {
134130
@include hover-focus {
135131
color: $btn-link-disabled-color;
136132
text-decoration: none;

0 commit comments

Comments
 (0)