mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00
Code Activity

Merge pull request #3619 from coreyti/2.0.4-wip-fix-placeholder

Browse Source 
2.0.4 wip fix placeholder
This commit is contained in:
Mark Otto
2012-05-28 01:00:23 -07:00
parent 287086758b 8a06339501
commit 241cbd478d
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/bootstrap.css
Vendored
+4
View File
@@ -3713,6 +3713,10 @@ input[type="submit"].btn.btn-mini {
color: #cccccc; color: #cccccc;
} }
.navbar-search .search-query:-ms-input-placeholder {
color: #cccccc;
}
.navbar-search .search-query::-webkit-input-placeholder { .navbar-search .search-query::-webkit-input-placeholder {
color: #cccccc; color: #cccccc;
} }
less/mixins.less
+3 -3
View File
@@ -81,13 +81,13 @@
// Placeholder text // Placeholder text
// ------------------------- // -------------------------
.placeholder(@color: @placeholderText) { .placeholder(@color: @placeholderText) {
:-moz-placeholder { &:-moz-placeholder {
color: @color; color: @color;
} }
:-ms-input-placeholder { &:-ms-input-placeholder {
color: @color; color: @color;
} }
::-webkit-input-placeholder { &::-webkit-input-placeholder {
color: @color; color: @color;
} }
} }
less/navbar.less
+1 -7
View File
@@ -123,13 +123,7 @@
.box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)"); .box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)");
.transition(none); .transition(none);
// Placeholder text gets special styles; can't be a grouped selector .placeholder(@navbarSearchPlaceholderColor);
&:-moz-placeholder {
color: @navbarSearchPlaceholderColor;
}
&::-webkit-input-placeholder {
color: @navbarSearchPlaceholderColor;
}
// Focus states (we use .focused since IE7-8 and down doesn't support :focus) // Focus states (we use .focused since IE7-8 and down doesn't support :focus)
&:focus, &:focus,