Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
241cbd47
Commit
241cbd47
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Plain Diff
Merge pull request #3619 from coreyti/2.0.4-wip-fix-placeholder
2.0.4 wip fix placeholder
parents
28708675
8a063395
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
docs/assets/css/bootstrap.css
+4
-0
docs/assets/css/bootstrap.css
less/mixins.less
+3
-3
less/mixins.less
less/navbar.less
+1
-7
less/navbar.less
with
8 additions
and
10 deletions
+8
-10
docs/assets/css/bootstrap.css
+
4
-
0
View file @
241cbd47
...
...
@@ -3713,6 +3713,10 @@ input[type="submit"].btn.btn-mini {
color
:
#cccccc
;
}
.navbar-search
.search-query
:-ms-input-placeholder
{
color
:
#cccccc
;
}
.navbar-search
.search-query
::-webkit-input-placeholder
{
color
:
#cccccc
;
}
...
...
This diff is collapsed.
Click to expand it.
less/mixins.less
+
3
-
3
View file @
241cbd47
...
...
@@ -81,13 +81,13 @@
// Placeholder text
// -------------------------
.placeholder(@color: @placeholderText) {
:-moz-placeholder {
&
:-moz-placeholder {
color: @color;
}
:-ms-input-placeholder {
&
:-ms-input-placeholder {
color: @color;
}
::-webkit-input-placeholder {
&
::-webkit-input-placeholder {
color: @color;
}
}
...
...
This diff is collapsed.
Click to expand it.
less/navbar.less
+
1
-
7
View file @
241cbd47
...
...
@@ -123,13 +123,7 @@
.box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)");
.transition(none);
// Placeholder text gets special styles; can't be a grouped selector
&:-moz-placeholder {
color: @navbarSearchPlaceholderColor;
}
&::-webkit-input-placeholder {
color: @navbarSearchPlaceholderColor;
}
.placeholder(@navbarSearchPlaceholderColor);
// Focus states (we use .focused since IE7-8 and down doesn't support :focus)
&:focus,
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment