diff options
| author | Mark Otto <[email protected]> | 2013-11-22 22:09:04 -0500 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-22 22:09:04 -0500 |
| commit | 98980b0fb2ebc813ac7cdb7b47dafd95c9d35db3 (patch) | |
| tree | 1eb37ecb58bc71628504273161dd0bb11dd4753e /less | |
| parent | 37f3944bd9a1cc2b7cb2dda6f767b708daab5fc1 (diff) | |
| parent | 4c246c0117ea56cb10b91b635ff415ec20d9c97d (diff) | |
| download | bootstrap-98980b0fb2ebc813ac7cdb7b47dafd95c9d35db3.tar.xz bootstrap-98980b0fb2ebc813ac7cdb7b47dafd95c9d35db3.zip | |
Merge branch 'master' into docs_derp
Diffstat (limited to 'less')
| -rw-r--r-- | less/mixins.less | 3 | ||||
| -rw-r--r-- | less/navbar.less | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/less/mixins.less b/less/mixins.less index 3d24e668a..e76d8d697 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -55,7 +55,8 @@ // Placeholder text .placeholder(@color: @input-color-placeholder) { &:-moz-placeholder { color: @color; } // Firefox 4-18 - &::-moz-placeholder { color: @color; } // Firefox 19+ + &::-moz-placeholder { color: @color; // Firefox 19+ + opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526 &:-ms-input-placeholder { color: @color; } // Internet Explorer 10+ &::-webkit-input-placeholder { color: @color; } // Safari and Chrome } diff --git a/less/navbar.less b/less/navbar.less index 987cde6b0..21cffc250 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -340,10 +340,10 @@ // Add a class to make any element properly align itself vertically within the navbars. .navbar-text { - float: left; .navbar-vertical-align(@line-height-computed); @media (min-width: @grid-float-breakpoint) { + float: left; margin-left: @navbar-padding-horizontal; margin-right: @navbar-padding-horizontal; } |