Skip to content

Commit 36b5f3f

Browse files
committed
rake update[v4-dev]
1 parent 23b55fc commit 36b5f3f

6 files changed

Lines changed: 23 additions & 9 deletions

File tree

assets/stylesheets/bootstrap/_input-group.scss

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@
4040
.input-group-addon,
4141
.input-group-btn,
4242
.input-group .form-control {
43-
@if $enable-flex {
44-
// do nothing
45-
} @else {
43+
@if not $enable-flex {
4644
display: table-cell;
4745
}
4846

@@ -53,9 +51,7 @@
5351

5452
.input-group-addon,
5553
.input-group-btn {
56-
@if $enable-flex {
57-
// do nothing
58-
} @else {
54+
@if not $enable-flex {
5955
width: 1%;
6056
}
6157
white-space: nowrap;

assets/stylesheets/bootstrap/_utilities.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
@import "utilities/background";
22
@import "utilities/clearfix";
3+
@import "utilities/display";
4+
@import "utilities/flex";
35
@import "utilities/pulls";
46
@import "utilities/screenreaders";
57
@import "utilities/spacing";
68
@import "utilities/text";
79
@import "utilities/visibility";
8-
@import "utilities/flex";

assets/stylesheets/bootstrap/mixins/_grid-framework.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
// `$columns - 1` because offsetting by the width of an entire row isn't possible
3838
@for $i from 0 through ($columns - 1) {
39-
@if $breakpoint-counter != 1 or $i != 0 { // Avoid emitting useless .col-xs-offset-0
39+
@if $breakpoint-counter != 1 or $i != 0 { // Avoid emitting useless .offset-xs-0
4040
.offset-#{$breakpoint}-#{$i} {
4141
@include make-col-modifier(offset, $i, $columns)
4242
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
//
2+
// Display utilities
3+
//
4+
5+
.d-block {
6+
display: block !important;
7+
}
8+
.d-inline-block {
9+
display: inline-block !important;
10+
}
11+
.d-inline {
12+
display: inline !important;
13+
}

assets/stylesheets/bootstrap/utilities/_spacing.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// Width
2+
3+
.w-100 { width: 100% !important; }
4+
15
// Margin and Padding
26

37
.m-x-auto {

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.alpha3'
3-
BOOTSTRAP_SHA = 'fcb41c7afddc60e65218eaa7d4c95a76bc22380d'
3+
BOOTSTRAP_SHA = '2cc75671e143587ace7efaf79c5b3350a711d57d'
44
end

0 commit comments

Comments
 (0)