Skip to content

Commit 226ba4f

Browse files
committed
Update Bootstrap less files to 3.3.5
1 parent ef8624b commit 226ba4f

File tree

10 files changed

+49
-10
lines changed

10 files changed

+49
-10
lines changed

build/bootstrap-less/mixins.less

100644100755
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
@import "mixins/responsive-visibility.less";
1111
@import "mixins/size.less";
1212
@import "mixins/tab-focus.less";
13+
@import "mixins/reset-text.less";
1314
@import "mixins/text-emphasis.less";
1415
@import "mixins/text-overflow.less";
1516
@import "mixins/vendor-prefixes.less";

build/bootstrap-less/mixins/background-variant.less

100644100755
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
.bg-variant(@color) {
44
background-color: @color;
5-
a&:hover {
5+
a&:hover,
6+
a&:focus {
67
background-color: darken(@color, 10%);
78
}
89
}

build/bootstrap-less/mixins/buttons.less

100644100755
Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,31 @@
88
background-color: @background;
99
border-color: @border;
1010

11-
&:hover,
1211
&:focus,
13-
&.focus,
12+
&.focus {
13+
color: @color;
14+
background-color: darken(@background, 10%);
15+
border-color: darken(@border, 25%);
16+
}
17+
&:hover {
18+
color: @color;
19+
background-color: darken(@background, 10%);
20+
border-color: darken(@border, 12%);
21+
}
1422
&:active,
1523
&.active,
1624
.open > .dropdown-toggle& {
1725
color: @color;
1826
background-color: darken(@background, 10%);
1927
border-color: darken(@border, 12%);
28+
29+
&:hover,
30+
&:focus,
31+
&.focus {
32+
color: @color;
33+
background-color: darken(@background, 17%);
34+
border-color: darken(@border, 25%);
35+
}
2036
}
2137
&:active,
2238
&.active,

build/bootstrap-less/mixins/grid.less

100644100755
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
// Creates a wrapper for a series of columns
1515
.make-row(@gutter: @grid-gutter-width) {
16-
margin-left: (@gutter / -2);
17-
margin-right: (@gutter / -2);
16+
margin-left: ceil((@gutter / -2));
17+
margin-right: floor((@gutter / -2));
1818
&:extend(.clearfix all);
1919
}
2020

build/bootstrap-less/mixins/hide-text.less

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// CSS image replacement
22
//
3-
// Heads up! v3 launched with with only `.hide-text()`, but per our pattern for
3+
// Heads up! v3 launched with only `.hide-text()`, but per our pattern for
44
// mixins being reused as classes with the same name, this doesn't hold up. As
55
// of v3.0.1 we have added `.text-hide()` and deprecated `.hide-text()`.
66
//

build/bootstrap-less/mixins/list-group.less

100644100755
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
color: @color;
66
background-color: @background;
77

8-
a& {
8+
a&,
9+
button& {
910
color: @color;
1011

1112
.list-group-item-heading {

build/bootstrap-less/mixins/pagination.less

100644100755
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
// Pagination
22

3-
.pagination-size(@padding-vertical; @padding-horizontal; @font-size; @border-radius) {
3+
.pagination-size(@padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) {
44
> li {
55
> a,
66
> span {
77
padding: @padding-vertical @padding-horizontal;
88
font-size: @font-size;
9+
line-height: @line-height;
910
}
1011
&:first-child {
1112
> a,
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
.reset-text() {
2+
font-family: @font-family-base;
3+
// We deliberately do NOT reset font-size.
4+
font-style: normal;
5+
font-weight: normal;
6+
letter-spacing: normal;
7+
line-break: auto;
8+
line-height: @line-height-base;
9+
text-align: left; // Fallback for where `start` is not supported
10+
text-align: start;
11+
text-decoration: none;
12+
text-shadow: none;
13+
text-transform: none;
14+
white-space: normal;
15+
word-break: normal;
16+
word-spacing: normal;
17+
word-wrap: normal;
18+
}

build/bootstrap-less/mixins/responsive-visibility.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
.responsive-visibility() {
66
display: block !important;
77
table& {
8-
display: table;
8+
display: table !important;
99
}
1010
tr& {
1111
display: table-row !important;

build/bootstrap-less/mixins/text-emphasis.less

100644100755
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
.text-emphasis-variant(@color) {
44
color: @color;
5-
a&:hover {
5+
a&:hover,
6+
a&:focus {
67
color: darken(@color, 10%);
78
}
89
}

0 commit comments

Comments
 (0)