diff options
| author | Mark Otto <[email protected]> | 2014-03-24 19:30:17 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-24 19:30:17 -0700 |
| commit | 39fec66fc4cb529d05f2b116abedf1bb2bdb65a8 (patch) | |
| tree | 55cdb65256a7313bfda85416a1c100c0adb62e40 /less | |
| parent | 4a2d337bf5f329eac1ca16208414ec1ebfe0546e (diff) | |
| parent | 6f6bce5944bd0e6ab36ab6b39339f381d8a80b2a (diff) | |
| download | bootstrap-39fec66fc4cb529d05f2b116abedf1bb2bdb65a8.tar.xz bootstrap-39fec66fc4cb529d05f2b116abedf1bb2bdb65a8.zip | |
Merge branch 'master' into fat-9461
Diffstat (limited to 'less')
| -rw-r--r-- | less/forms.less | 6 | ||||
| -rw-r--r-- | less/mixins/buttons.less | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/less/forms.less b/less/forms.less index 8578e8ce6..d51065cf6 100644 --- a/less/forms.less +++ b/less/forms.less @@ -31,6 +31,7 @@ legend { label { display: inline-block; + max-width: 100%; // Force IE8 to wrap long content (see #13141) margin-bottom: 5px; font-weight: bold; } @@ -170,7 +171,10 @@ input[type="search"] { // given height of the input. Since this fucks up everything else, we have to // appropriately reset it for Internet Explorer and the size variations. -input[type="date"] { +input[type="date"], +input[type="time"], +input[type="datetime-local"], +input[type="month"] { line-height: @input-height-base; // IE8+ misaligns the text within date inputs, so we reset line-height: @line-height-base ~"\0"; diff --git a/less/mixins/buttons.less b/less/mixins/buttons.less index d7f7cd97a..409f8f20a 100644 --- a/less/mixins/buttons.less +++ b/less/mixins/buttons.less @@ -12,14 +12,14 @@ &:focus, &:active, &.active, - .open .dropdown-toggle& { + .open > .dropdown-toggle& { color: @color; background-color: darken(@background, 10%); border-color: darken(@border, 12%); } &:active, &.active, - .open .dropdown-toggle& { + .open > .dropdown-toggle& { background-image: none; } &.disabled, |