Skip to content

Commit 6d17199

Browse files
committed
rake update[v4.0.0-beta.3]
1 parent 9b3f31d commit 6d17199

6 files changed

Lines changed: 7 additions & 20 deletions

File tree

assets/stylesheets/bootstrap/_alert.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@
4646

4747
@each $color, $value in $theme-colors {
4848
.alert-#{$color} {
49-
@include alert-variant(theme-color-level($color, $alert-bg-level), theme-color-level($color, $alert-border-level), theme-color-level($color, $alert-color-level));
49+
@include alert-variant(theme-color-level($color, -10), theme-color-level($color, -9), theme-color-level($color, 6));
5050
}
5151
}

assets/stylesheets/bootstrap/_popover.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
// Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element.
99
// So reset our font and text properties to avoid inheriting weird values.
1010
@include reset-text();
11-
font-size: $popover-font-size;
11+
font-size: $font-size-sm;
1212
// Allow breaking very long words so they don't overflow the popover's bounds
1313
word-wrap: break-word;
1414
background-color: $popover-bg;
1515
background-clip: padding-box;
1616
border: $popover-border-width solid $popover-border-color;
17-
@include border-radius($popover-border-radius);
17+
@include border-radius($border-radius-lg);
1818
@include box-shadow($popover-box-shadow);
1919

2020
.arrow {

assets/stylesheets/bootstrap/_tooltip.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element.
88
// So reset our font and text properties to avoid inheriting weird values.
99
@include reset-text();
10-
font-size: $tooltip-font-size;
10+
font-size: $font-size-sm;
1111
// Allow breaking very long words so they don't overflow the tooltip's bounds
1212
word-wrap: break-word;
1313
opacity: 0;
@@ -111,5 +111,5 @@
111111
color: $tooltip-color;
112112
text-align: center;
113113
background-color: $tooltip-bg;
114-
@include border-radius($tooltip-border-radius);
114+
@include border-radius($border-radius);
115115
}

assets/stylesheets/bootstrap/_variables.scss

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -667,11 +667,9 @@ $card-columns-margin: $card-spacer-y !default;
667667

668668
// Tooltips
669669

670-
$tooltip-font-size: $font-size-sm !default;
671670
$tooltip-max-width: 200px !default;
672671
$tooltip-color: $white !default;
673672
$tooltip-bg: $black !default;
674-
$tooltip-border-radius: $border-radius !default;
675673
$tooltip-opacity: .9 !default;
676674
$tooltip-padding-y: .25rem !default;
677675
$tooltip-padding-x: .5rem !default;
@@ -684,12 +682,10 @@ $tooltip-arrow-color: $tooltip-bg !default;
684682

685683
// Popovers
686684

687-
$popover-font-size: $font-size-sm !default;
688685
$popover-bg: $white !default;
689686
$popover-max-width: 276px !default;
690687
$popover-border-width: $border-width !default;
691688
$popover-border-color: rgba($black, .2) !default;
692-
$popover-border-radius: $border-radius-lg !default;
693689
$popover-box-shadow: 0 .25rem .5rem rgba($black, .2) !default;
694690

695691
$popover-header-bg: darken($popover-bg, 3%) !default;
@@ -764,10 +760,6 @@ $alert-border-radius: $border-radius !default;
764760
$alert-link-font-weight: $font-weight-bold !default;
765761
$alert-border-width: $border-width !default;
766762

767-
$alert-bg-level: -10 !default;
768-
$alert-border-level: -9 !default;
769-
$alert-color-level: 6 !default;
770-
771763

772764
// Progress bars
773765

assets/stylesheets/bootstrap/utilities/_borders.scss

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,7 @@
44
// Border
55
//
66

7-
.border { border: $border-width solid $border-color !important; }
8-
.border-top { border-top: $border-width solid $border-color !important; }
9-
.border-right { border-right: $border-width solid $border-color !important; }
10-
.border-bottom { border-bottom: $border-width solid $border-color !important; }
11-
.border-left { border-left: $border-width solid $border-color !important; }
12-
7+
.border { border: $border-width solid $border-color !important; }
138
.border-0 { border: 0 !important; }
149
.border-top-0 { border-top: 0 !important; }
1510
.border-right-0 { border-right: 0 !important; }

lib/bootstrap/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
module Bootstrap
22
VERSION = '4.0.0.beta3'
3-
BOOTSTRAP_SHA = '8ffbb74e81bb607e621df276b12f5b6449392114'
3+
BOOTSTRAP_SHA = 'ced70da441d487efb8589acbff445d6b5fa68bb9'
44
end

0 commit comments

Comments
 (0)