Skip to content

Commit 241cbd4

Browse files
committed
Merge pull request twbs#3619 from coreyti/2.0.4-wip-fix-placeholder
2.0.4 wip fix placeholder
2 parents 2870867 + 8a06339 commit 241cbd4

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

docs/assets/css/bootstrap.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3713,6 +3713,10 @@ input[type="submit"].btn.btn-mini {
37133713
color: #cccccc;
37143714
}
37153715

3716+
.navbar-search .search-query:-ms-input-placeholder {
3717+
color: #cccccc;
3718+
}
3719+
37163720
.navbar-search .search-query::-webkit-input-placeholder {
37173721
color: #cccccc;
37183722
}

less/mixins.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,13 @@
8181
// Placeholder text
8282
// -------------------------
8383
.placeholder(@color: @placeholderText) {
84-
:-moz-placeholder {
84+
&:-moz-placeholder {
8585
color: @color;
8686
}
87-
:-ms-input-placeholder {
87+
&:-ms-input-placeholder {
8888
color: @color;
8989
}
90-
::-webkit-input-placeholder {
90+
&::-webkit-input-placeholder {
9191
color: @color;
9292
}
9393
}

less/navbar.less

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,7 @@
123123
.box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)");
124124
.transition(none);
125125

126-
// Placeholder text gets special styles; can't be a grouped selector
127-
&:-moz-placeholder {
128-
color: @navbarSearchPlaceholderColor;
129-
}
130-
&::-webkit-input-placeholder {
131-
color: @navbarSearchPlaceholderColor;
132-
}
126+
.placeholder(@navbarSearchPlaceholderColor);
133127

134128
// Focus states (we use .focused since IE7-8 and down doesn't support :focus)
135129
&:focus,

0 commit comments

Comments
 (0)