Skip to content

Commit

Permalink
Updates bootstrap v4.3.1 -> v4.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
gdixon committed Feb 5, 2021
1 parent 8e8e764 commit 1111aa9
Show file tree
Hide file tree
Showing 58 changed files with 745 additions and 454 deletions.
1 change: 1 addition & 0 deletions app/assets/v3/scss/lib/bootstrap/_alert.scss
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
position: absolute;
top: 0;
right: 0;
z-index: 2;
padding: $alert-padding-y $alert-padding-x;
color: inherit;
}
Expand Down
2 changes: 1 addition & 1 deletion app/assets/v3/scss/lib/bootstrap/_badge.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
@include transition($badge-transition);

@at-root a#{&} {
@include hover-focus {
@include hover-focus() {
text-decoration: none;
}
}
Expand Down
5 changes: 3 additions & 2 deletions app/assets/v3/scss/lib/bootstrap/_breadcrumb.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
flex-wrap: wrap;
padding: $breadcrumb-padding-y $breadcrumb-padding-x;
margin-bottom: $breadcrumb-margin-bottom;
@include font-size($breadcrumb-font-size);
list-style: none;
background-color: $breadcrumb-bg;
@include border-radius($breadcrumb-border-radius);
Expand All @@ -14,10 +15,10 @@
padding-left: $breadcrumb-item-padding;

&::before {
display: inline-block; // Suppress underlining of the separator in modern browsers
float: left; // Suppress inline spacings and underlining of the separator
padding-right: $breadcrumb-item-padding;
color: $breadcrumb-divider-color;
content: $breadcrumb-divider;
content: escape-svg($breadcrumb-divider);
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/assets/v3/scss/lib/bootstrap/_button-group.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

// Bring the hover, focused, and "active" buttons to the front to overlay
// the borders properly
@include hover {
@include hover() {
z-index: 1;
}
&:focus,
Expand Down
21 changes: 13 additions & 8 deletions app/assets/v3/scss/lib/bootstrap/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@
font-weight: $btn-font-weight;
color: $body-color;
text-align: center;
text-decoration: if($link-decoration == none, null, none);
white-space: $btn-white-space;
vertical-align: middle;
user-select: none;
background-color: transparent;
border: $btn-border-width solid transparent;
@include button-size($btn-padding-y, $btn-padding-x, $btn-font-size, $btn-line-height, $btn-border-radius);
@include transition($btn-transition);

@include hover {
@include hover() {
color: $body-color;
text-decoration: none;
}
Expand All @@ -35,12 +37,16 @@
@include box-shadow(none);
}

&:not(:disabled):not(.disabled):active,
&:not(:disabled):not(.disabled).active {
@include box-shadow($btn-active-box-shadow);
&:not(:disabled):not(.disabled) {
cursor: if($enable-pointer-cursor-for-buttons, pointer, null);

&:focus {
@include box-shadow($btn-focus-box-shadow, $btn-active-box-shadow);
&:active,
&.active {
@include box-shadow($btn-active-box-shadow);

&:focus {
@include box-shadow($btn-focus-box-shadow, $btn-active-box-shadow);
}
}
}
}
Expand Down Expand Up @@ -79,15 +85,14 @@ fieldset:disabled a.btn {
color: $link-color;
text-decoration: $link-decoration;

@include hover {
@include hover() {
color: $link-hover-color;
text-decoration: $link-hover-decoration;
}

&:focus,
&.focus {
text-decoration: $link-hover-decoration;
box-shadow: none;
}

&:disabled,
Expand Down
87 changes: 42 additions & 45 deletions app/assets/v3/scss/lib/bootstrap/_card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
display: flex;
flex-direction: column;
min-width: 0; // See https://github.com/twbs/bootstrap/pull/22740#issuecomment-305868106
height: $card-height;
word-wrap: break-word;
background-color: $card-bg;
background-clip: border-box;
Expand All @@ -18,23 +19,36 @@
margin-left: 0;
}

> .list-group:first-child {
.list-group-item:first-child {
@include border-top-radius($card-border-radius);
> .list-group {
border-top: inherit;
border-bottom: inherit;

&:first-child {
border-top-width: 0;
@include border-top-radius($card-inner-border-radius);
}
}

> .list-group:last-child {
.list-group-item:last-child {
@include border-bottom-radius($card-border-radius);
&:last-child {
border-bottom-width: 0;
@include border-bottom-radius($card-inner-border-radius);
}
}

// Due to specificity of the above selector (`.card > .list-group`), we must
// use a child selector here to prevent double borders.
> .card-header + .list-group,
> .list-group + .card-footer {
border-top: 0;
}
}

.card-body {
// Enable `flex-grow: 1` for decks and groups so that card blocks take up
// as much space as possible, ensuring footers are aligned to the bottom.
flex: 1 1 auto;
// Workaround for the image size bug in IE
// See: https://github.com/twbs/bootstrap/pull/28855
min-height: 1px;
padding: $card-spacer-x;
color: $card-color;
}
Expand All @@ -53,7 +67,7 @@
}

.card-link {
@include hover {
@include hover() {
text-decoration: none;
}

Expand All @@ -76,16 +90,11 @@
&:first-child {
@include border-radius($card-inner-border-radius $card-inner-border-radius 0 0);
}

+ .list-group {
.list-group-item:first-child {
border-top: 0;
}
}
}

.card-footer {
padding: $card-spacer-y $card-spacer-x;
color: $card-cap-color;
background-color: $card-cap-bg;
border-top: $card-border-width solid $card-border-color;

Expand Down Expand Up @@ -119,45 +128,43 @@
bottom: 0;
left: 0;
padding: $card-img-overlay-padding;
@include border-radius($card-inner-border-radius);
}

.card-img {
.card-img,
.card-img-top,
.card-img-bottom {
flex-shrink: 0; // For IE: https://github.com/twbs/bootstrap/issues/29396
width: 100%; // Required because we use flexbox and this inherently applies align-self: stretch
@include border-radius($card-inner-border-radius);
}

// Card image caps
.card-img,
.card-img-top {
width: 100%; // Required because we use flexbox and this inherently applies align-self: stretch
@include border-top-radius($card-inner-border-radius);
}

.card-img,
.card-img-bottom {
width: 100%; // Required because we use flexbox and this inherently applies align-self: stretch
@include border-bottom-radius($card-inner-border-radius);
}


// Card deck

.card-deck {
display: flex;
flex-direction: column;

.card {
margin-bottom: $card-deck-margin;
}

@include media-breakpoint-up(sm) {
display: flex;
flex-flow: row wrap;
margin-right: -$card-deck-margin;
margin-left: -$card-deck-margin;

.card {
display: flex;
// Flexbugs #4: https://github.com/philipwalton/flexbugs#flexbug-4
flex: 1 0 0%;
flex-direction: column;
margin-right: $card-deck-margin;
margin-bottom: 0; // Override the default
margin-left: $card-deck-margin;
Expand All @@ -171,16 +178,14 @@
//

.card-group {
display: flex;
flex-direction: column;

// The child selector allows nested `.card` within `.card-group`
// to display properly.
> .card {
margin-bottom: $card-group-margin;
}

@include media-breakpoint-up(sm) {
display: flex;
flex-flow: row wrap;
// The child selector allows nested `.card` within `.card-group`
// to display properly.
Expand All @@ -201,12 +206,12 @@

.card-img-top,
.card-header {
// stylelint-disable-next-line property-blacklist
// stylelint-disable-next-line property-disallowed-list
border-top-right-radius: 0;
}
.card-img-bottom,
.card-footer {
// stylelint-disable-next-line property-blacklist
// stylelint-disable-next-line property-disallowed-list
border-bottom-right-radius: 0;
}
}
Expand All @@ -216,12 +221,12 @@

.card-img-top,
.card-header {
// stylelint-disable-next-line property-blacklist
// stylelint-disable-next-line property-disallowed-list
border-top-left-radius: 0;
}
.card-img-bottom,
.card-footer {
// stylelint-disable-next-line property-blacklist
// stylelint-disable-next-line property-disallowed-list
border-bottom-left-radius: 0;
}
}
Expand Down Expand Up @@ -259,30 +264,22 @@
//

.accordion {
overflow-anchor: none;

> .card {
overflow: hidden;

&:not(:first-of-type) {
.card-header:first-child {
@include border-radius(0);
}

&:not(:last-of-type) {
border-bottom: 0;
@include border-radius(0);
}
}

&:first-of-type {
&:not(:last-of-type) {
border-bottom: 0;
@include border-bottom-radius(0);
}

&:last-of-type {
&:not(:first-of-type) {
@include border-top-radius(0);
}

.card-header {
> .card-header {
@include border-radius(0);
margin-bottom: -$card-border-width;
}
}
Expand Down
14 changes: 7 additions & 7 deletions app/assets/v3/scss/lib/bootstrap/_carousel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
.active.carousel-item-right {
z-index: 0;
opacity: 0;
@include transition(0s $carousel-transition-duration opacity);
@include transition(opacity 0s $carousel-transition-duration);
}
}

Expand All @@ -101,7 +101,7 @@
@include transition($carousel-control-transition);

// Hover/focus state
@include hover-focus {
@include hover-focus() {
color: $carousel-control-color;
text-decoration: none;
outline: 0;
Expand All @@ -111,13 +111,13 @@
.carousel-control-prev {
left: 0;
@if $enable-gradients {
background: linear-gradient(90deg, rgba($black, .25), rgba($black, .001));
background-image: linear-gradient(90deg, rgba($black, .25), rgba($black, .001));
}
}
.carousel-control-next {
right: 0;
@if $enable-gradients {
background: linear-gradient(270deg, rgba($black, .25), rgba($black, .001));
background-image: linear-gradient(270deg, rgba($black, .25), rgba($black, .001));
}
}

Expand All @@ -127,13 +127,13 @@
display: inline-block;
width: $carousel-control-icon-width;
height: $carousel-control-icon-width;
background: no-repeat 50% / 100% 100%;
background: 50% / 100% 100% no-repeat;
}
.carousel-control-prev-icon {
background-image: $carousel-control-prev-icon-bg;
background-image: escape-svg($carousel-control-prev-icon-bg);
}
.carousel-control-next-icon {
background-image: $carousel-control-next-icon-bg;
background-image: escape-svg($carousel-control-next-icon-bg);
}


Expand Down
5 changes: 2 additions & 3 deletions app/assets/v3/scss/lib/bootstrap/_close.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
opacity: .5;

// Override <a>'s hover style
@include hover {
@include hover() {
color: $close-color;
text-decoration: none;
}

&:not(:disabled):not(.disabled) {
@include hover-focus {
@include hover-focus() {
opacity: .75;
}
}
Expand All @@ -30,7 +30,6 @@ button.close {
padding: 0;
background-color: transparent;
border: 0;
appearance: none;
}

// Future-proof disabling of clicks on `<a>` elements
Expand Down
Loading

0 comments on commit 1111aa9

Please sign in to comment.