diff options
| author | Mark Otto <[email protected]> | 2014-07-09 10:48:58 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-09 10:48:58 -0700 |
| commit | 41f3af407bab6c77f61b1d1fc8d3526f5276076f (patch) | |
| tree | cb9a982f2fc56ec1ce71849d37dc06b47d313cf3 /less/forms.less | |
| parent | 0e47ce959ce6257c8fdde13b1362dbbe19fb56e3 (diff) | |
| parent | 87c9ce5333139eede2f02d6812c083a86db61cdf (diff) | |
| download | bootstrap-41f3af407bab6c77f61b1d1fc8d3526f5276076f.tar.xz bootstrap-41f3af407bab6c77f61b1d1fc8d3526f5276076f.zip | |
Merge branch 'derp' into derp_navs
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'less/forms.less')
| -rw-r--r-- | less/forms.less | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/less/forms.less b/less/forms.less index dca78cf24..86669b44e 100644 --- a/less/forms.less +++ b/less/forms.less @@ -31,7 +31,6 @@ legend { label { display: inline-block; - max-width: 100%; // Force IE8 to wrap long content (see https://github.com/twbs/bootstrap/issues/13141) margin-bottom: 5px; font-weight: bold; } @@ -52,7 +51,7 @@ input[type="search"] { input[type="radio"], input[type="checkbox"] { margin: 4px 0 0; - margin-top: 1px \9; // IE8-9 + margin-top: 1px \9; // IE9 line-height: normal; } @@ -124,7 +123,7 @@ output { background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214 border: 1px solid @input-border; .border-radius(@input-border-radius); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075); + .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; // Customize the `:focus` state to imitate native WebKit styles. @@ -182,7 +181,7 @@ 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 + // IE9+ misaligns the text within date inputs, so we reset line-height: @line-height-base ~"\0"; &.input-sm { |