Skip to content

Commit

Permalink
rake update[v4-dev]
Browse files Browse the repository at this point in the history
  • Loading branch information
@glebm
glebm committed May 16, 2016
1 parent e39dac2 commit f6a7b7b
Show file tree
Hide file tree
Showing 23 changed files with 423 additions and 450 deletions.
8 changes: 1 addition & 7 deletions assets/javascripts/bootstrap.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2062,13 +2062,7 @@ var Modal = (function ($) {
}, {
key: '_checkScrollbar',
value: function _checkScrollbar() {
var fullWindowWidth = window.innerWidth;
if (!fullWindowWidth) {
// workaround for missing window.innerWidth in IE8
var documentElementRect = document.documentElement.getBoundingClientRect();
fullWindowWidth = documentElementRect.right - Math.abs(documentElementRect.left);
}
this._isBodyOverflowing = document.body.clientWidth < fullWindowWidth;
this._isBodyOverflowing = document.body.clientWidth < window.innerWidth;
this._scrollbarWidth = this._getScrollbarWidth();
}
}, {
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap.min.js
View file

Large diffs are not rendered by default.

8 changes: 1 addition & 7 deletions assets/javascripts/bootstrap/modal.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,13 +410,7 @@ var Modal = (function ($) {
}, {
key: '_checkScrollbar',
value: function _checkScrollbar() {
var fullWindowWidth = window.innerWidth;
if (!fullWindowWidth) {
// workaround for missing window.innerWidth in IE8
var documentElementRect = document.documentElement.getBoundingClientRect();
fullWindowWidth = documentElementRect.right - Math.abs(documentElementRect.left);
}
this._isBodyOverflowing = document.body.clientWidth < fullWindowWidth;
this._isBodyOverflowing = document.body.clientWidth < window.innerWidth;
this._scrollbarWidth = this._getScrollbarWidth();
}
}, {
Expand Down
24 changes: 17 additions & 7 deletions assets/stylesheets/bootstrap/_button-group.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,26 @@
// Split button dropdowns
//

// Give the line between buttons some depth
.btn-group > .btn + .dropdown-toggle {
padding-right: $split-btn-dropdown-toggle-padding-x;
padding-left: $split-btn-dropdown-toggle-padding-x;
.btn + .dropdown-toggle-split {
padding-right: $btn-padding-x * .75;
padding-left: $btn-padding-x * .75;

&::after {
margin-left: 0;
}
}
.btn-group > .btn-lg + .dropdown-toggle {
padding-right: $split-btn-lg-dropdown-toggle-padding-x;
padding-left: $split-btn-lg-dropdown-toggle-padding-x;

.btn-sm + .dropdown-toggle-split {
padding-right: $btn-padding-x-sm * .75;
padding-left: $btn-padding-x-sm * .75;
}

.btn-lg + .dropdown-toggle-split {
padding-right: $btn-padding-x-lg * .75;
padding-left: $btn-padding-x-lg * .75;
}


// The clickable button for toggling the menu
// Remove the gradient and set the same inset shadow as the :active state
.btn-group.open .dropdown-toggle {
Expand Down
54 changes: 25 additions & 29 deletions assets/stylesheets/bootstrap/_card.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
background-color: $card-bg;
// border: $card-border-width solid $card-border-color;
@include border-radius($card-border-radius);
// Doesn't use mixin so that cards always have a "border"
box-shadow: inset 0 0 0 $card-border-width $card-border-color;
border: $card-border-width solid $card-border-color;
}

.card-block {
Expand Down Expand Up @@ -49,20 +48,16 @@
}
}

@if $enable-rounded {
.card {
> .list-group:first-child {
.list-group-item:first-child {
border-top-left-radius: $card-border-radius;
border-top-right-radius: $card-border-radius;
}
.card {
> .list-group:first-child {
.list-group-item:first-child {
@include border-top-radius($card-border-radius);
}
}

> .list-group:last-child {
.list-group-item:last-child {
border-bottom-right-radius: $card-border-radius;
border-bottom-left-radius: $card-border-radius;
}
> .list-group:last-child {
.list-group-item:last-child {
@include border-bottom-radius($card-border-radius);
}
}
}
Expand All @@ -76,9 +71,7 @@
@include clearfix;
padding: $card-spacer-y $card-spacer-x;
background-color: $card-cap-bg;
// border-bottom: $card-border-width solid $card-border-color;
// Doesn't use mixin so that cards always have a "border"
box-shadow: inset 0 0 0 $card-border-width $card-border-color;
border-bottom: $card-border-width solid $card-border-color;

&:first-child {
@include border-radius($card-border-radius-inner $card-border-radius-inner 0 0);
Expand All @@ -89,9 +82,7 @@
@include clearfix;
padding: $card-spacer-y $card-spacer-x;
background-color: $card-cap-bg;
// border-top: $card-border-width solid $card-border-color;
// Doesn't use mixin so that cards always have a "border"
box-shadow: inset 0 0 0 $card-border-width $card-border-color;
border-top: $card-border-width solid $card-border-color;

&:last-child {
@include border-radius(0 0 $card-border-radius-inner $card-border-radius-inner);
Expand All @@ -108,10 +99,6 @@
margin-bottom: -$card-spacer-y;
margin-left: -($card-spacer-x / 2);
border-bottom: 0;

.nav-item {
margin-bottom: 0;
}
}

.card-header-pills {
Expand Down Expand Up @@ -189,35 +176,42 @@
right: 0;
bottom: 0;
left: 0;
padding: 1.25rem;
padding: $card-img-overlay-padding;
}



// Card image caps
.card-img-top {
@include border-radius($card-border-radius-inner $card-border-radius-inner 0 0);
@include border-top-radius($card-border-radius-inner);
}
.card-img-bottom {
@include border-radius(0 0 $card-border-radius-inner $card-border-radius-inner);
@include border-bottom-radius($card-border-radius-inner);
}


//
// Card set
//
// Heads up! We do some funky style resetting here for margins across our two
// variations (one flex, one table). Individual cards have margin-bottom by
// default, but they're ignored due to table styles. For a consistent design,
// we've done the same to the flex variation.
//
// Those changes are noted by `// Margin balancing`.

@if $enable-flex {
@include media-breakpoint-up(sm) {
.card-deck {
display: flex;
flex-flow: row wrap;
margin-right: -$card-deck-margin;
margin-bottom: $card-spacer-y; // Margin balancing
margin-left: -$card-deck-margin;

.card {
flex: 1 0 0;
margin-right: $card-deck-margin;
margin-bottom: 0; // Margin balancing
margin-left: $card-deck-margin;
}
}
Expand All @@ -227,12 +221,14 @@
$space-between-cards: (2 * $card-deck-margin);
.card-deck {
display: table;
width: 100%;
margin-bottom: $card-spacer-y; // Margin balancing
table-layout: fixed;
border-spacing: $space-between-cards 0;

.card {
display: table-cell;
width: 1%;
margin-bottom: 0; // Margin balancing
vertical-align: top;
}
}
Expand Down
10 changes: 5 additions & 5 deletions assets/stylesheets/bootstrap/_carousel.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,19 +125,19 @@
top: 50%;
z-index: 5;
display: inline-block;
width: 20px;
height: 20px;
margin-top: -10px;
width: $carousel-icon-width;
height: $carousel-icon-width;
margin-top: -($carousel-icon-width / 2);
font-family: serif;
line-height: 1;
}
.icon-prev {
left: 50%;
margin-left: -10px;
margin-left: -($carousel-icon-width / 2);
}
.icon-next {
right: 50%;
margin-right: -10px;
margin-right: -($carousel-icon-width / 2);
}

.icon-prev {
Expand Down
16 changes: 16 additions & 0 deletions assets/stylesheets/bootstrap/_custom-forms.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,22 @@
border-color: $custom-select-focus-border-color;
outline: none;
@include box-shadow($custom-select-focus-box-shadow);

&::-ms-value {
// For visual consistency with other platforms/browsers,
// supress the default white text on blue background highlight given to
// the selected option text when the (still closed) <select> receives focus
// in IE and (under certain conditions) Edge.
// See https://github.com/twbs/bootstrap/issues/19398.
color: $input-color;
background-color: $input-bg;
}
}

&:disabled {
color: $custom-select-disabled-color;
cursor: $cursor-disabled;
background-color: $custom-select-disabled-bg;
}

// Hides the default caret in IE11
Expand Down
3 changes: 1 addition & 2 deletions assets/stylesheets/bootstrap/_dropdown.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
display: inline-block;
width: 0;
height: 0;
margin-right: .25rem;
margin-left: .25rem;
margin-left: $caret-width;
vertical-align: middle;
content: "";
border-top: $caret-width solid;
Expand Down
Loading

0 comments on commit f6a7b7b

Please sign in to comment.