Skip to content

Commit 3e90bf2

Browse files
JLLeitschuhJLLeitschuh
committed
gh-pages v3.1.0
1 parent 8b272e5 commit 3e90bf2

21 files changed

+80
-73
lines changed

‎bootstrap/less/bootstrap.less‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Bootstrap v3.3.5 (http://getbootstrap.com)
2+
* Bootstrap v3.3.6 (http://getbootstrap.com)
33
* Copyright 2011-2015 Twitter, Inc.
44
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
55
*/

‎bootstrap/less/button-groups.less‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,12 @@
173173
border-radius: 0;
174174
}
175175
&:first-child:not(:last-child) {
176-
border-top-right-radius: @btn-border-radius-base;
176+
.border-top-radius(@btn-border-radius-base);
177177
.border-bottom-radius(0);
178178
}
179179
&:last-child:not(:first-child) {
180-
border-bottom-left-radius: @btn-border-radius-base;
181180
.border-top-radius(0);
181+
.border-bottom-radius(@btn-border-radius-base);
182182
}
183183
}
184184
.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {

‎bootstrap/less/carousel.less‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
color: @carousel-control-color;
102102
text-align: center;
103103
text-shadow: @carousel-text-shadow;
104+
background-color: rgba(0, 0, 0, 0); // Fix IE9 click-thru bug
104105
// We can't have this transition here because WebKit cancels the carousel
105106
// animation if you trip this while in the middle of another animation.
106107

@@ -240,18 +241,18 @@
240241
.glyphicon-chevron-right,
241242
.icon-prev,
242243
.icon-next {
243-
width: 30px;
244-
height: 30px;
245-
margin-top: -15px;
246-
font-size: 30px;
244+
width: (@carousel-control-font-size * 1.5);
245+
height: (@carousel-control-font-size * 1.5);
246+
margin-top: (@carousel-control-font-size / -2);
247+
font-size: (@carousel-control-font-size * 1.5);
247248
}
248249
.glyphicon-chevron-left,
249250
.icon-prev {
250-
margin-left: -15px;
251+
margin-left: (@carousel-control-font-size / -2);
251252
}
252253
.glyphicon-chevron-right,
253254
.icon-next {
254-
margin-right: -15px;
255+
margin-right: (@carousel-control-font-size / -2);
255256
}
256257
}
257258

‎bootstrap/less/forms.less‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,12 @@ output {
132132
// Placeholder
133133
.placeholder();
134134

135+
// Unstyle the caret on `<select>`s in IE10+.
136+
&::-ms-expand {
137+
border: 0;
138+
background-color: transparent;
139+
}
140+
135141
// Disabled and read-only inputs
136142
//
137143
// HTML5 says that controls under a fieldset > legend:first-child won't be
@@ -433,10 +439,10 @@ input[type="checkbox"] {
433439
.has-feedback label {
434440

435441
& ~ .form-control-feedback {
436-
top: (@line-height-computed + 5); // Height of the `label` and its margin
442+
top: (@line-height-computed + 5); // Height of the `label` and its margin
437443
}
438444
&.sr-only ~ .form-control-feedback {
439-
top: 0;
445+
top: 0;
440446
}
441447
}
442448

@@ -591,7 +597,7 @@ input[type="checkbox"] {
591597
.form-group-lg {
592598
@media (min-width: @screen-sm-min) {
593599
.control-label {
594-
padding-top: ((@padding-large-vertical * @line-height-large) + 1);
600+
padding-top: (@padding-large-vertical + 1);
595601
font-size: @font-size-large;
596602
}
597603
}

‎bootstrap/less/glyphicons.less‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
}
3333

3434
// Individual icons
35-
.glyphicon-asterisk { &:before { content: "\2a"; } }
36-
.glyphicon-plus { &:before { content: "\2b"; } }
35+
.glyphicon-asterisk { &:before { content: "\002a"; } }
36+
.glyphicon-plus { &:before { content: "\002b"; } }
3737
.glyphicon-euro,
3838
.glyphicon-eur { &:before { content: "\20ac"; } }
3939
.glyphicon-minus { &:before { content: "\2212"; } }

‎bootstrap/less/input-groups.less‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929

3030
width: 100%;
3131
margin-bottom: 0;
32+
33+
&:focus {
34+
z-index: 3;
35+
}
3236
}
3337
}
3438

@@ -79,18 +83,18 @@
7983
text-align: center;
8084
background-color: @input-group-addon-bg;
8185
border: 1px solid @input-group-addon-border-color;
82-
border-radius: @border-radius-base;
86+
border-radius: @input-border-radius;
8387

8488
// Sizing
8589
&.input-sm {
8690
padding: @padding-small-vertical @padding-small-horizontal;
8791
font-size: @font-size-small;
88-
border-radius: @border-radius-small;
92+
border-radius: @input-border-radius-small;
8993
}
9094
&.input-lg {
9195
padding: @padding-large-vertical @padding-large-horizontal;
9296
font-size: @font-size-large;
93-
border-radius: @border-radius-large;
97+
border-radius: @input-border-radius-large;
9498
}
9599

96100
// Nuke default margins from checkboxes and radios to vertically center within.

‎bootstrap/less/jumbotron.less‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
.container &,
2929
.container-fluid & {
3030
border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container
31+
padding-left: (@grid-gutter-width / 2);
32+
padding-right: (@grid-gutter-width / 2);
3133
}
3234

3335
.container {

‎bootstrap/less/mixins/buttons.less‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,9 @@
4242
&.disabled,
4343
&[disabled],
4444
fieldset[disabled] & {
45-
&,
4645
&:hover,
4746
&:focus,
48-
&.focus,
49-
&:active,
50-
&.active {
47+
&.focus {
5148
background-color: @background;
5249
border-color: @border;
5350
}

‎bootstrap/less/mixins/grid.less‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
.container-fixed(@gutter: @grid-gutter-width) {
77
margin-right: auto;
88
margin-left: auto;
9-
padding-left: (@gutter / 2);
10-
padding-right: (@gutter / 2);
9+
padding-left: floor((@gutter / 2));
10+
padding-right: ceil((@gutter / 2));
1111
&:extend(.clearfix all);
1212
}
1313

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
88

9-
// Deprecated as of v3.0.1 (will be removed in v4)
9+
// Deprecated as of v3.0.1 (has been removed in v4)
1010
.hide-text() {
1111
font: ~"0/0" a;
1212
color: transparent;

0 commit comments

Comments
 (0)