mirror of
https://github.com/twbs/bootstrap.git
synced 2024-11-29 11:24:18 +01:00
Merge pull request #11338 from ZDroid/nestform
Use nesting for .placeholder()
This commit is contained in:
commit
be60ee1377
32
dist/css/bootstrap.css
vendored
32
dist/css/bootstrap.css
vendored
@ -1882,22 +1882,6 @@ output {
|
|||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
|
|
||||||
.form-control:-moz-placeholder {
|
|
||||||
color: #999999;
|
|
||||||
}
|
|
||||||
|
|
||||||
.form-control::-moz-placeholder {
|
|
||||||
color: #999999;
|
|
||||||
}
|
|
||||||
|
|
||||||
.form-control:-ms-input-placeholder {
|
|
||||||
color: #999999;
|
|
||||||
}
|
|
||||||
|
|
||||||
.form-control::-webkit-input-placeholder {
|
|
||||||
color: #999999;
|
|
||||||
}
|
|
||||||
|
|
||||||
.form-control {
|
.form-control {
|
||||||
display: block;
|
display: block;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
@ -1924,6 +1908,22 @@ output {
|
|||||||
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
|
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.form-control:-moz-placeholder {
|
||||||
|
color: #999999;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-control::-moz-placeholder {
|
||||||
|
color: #999999;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-control:-ms-input-placeholder {
|
||||||
|
color: #999999;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-control::-webkit-input-placeholder {
|
||||||
|
color: #999999;
|
||||||
|
}
|
||||||
|
|
||||||
.form-control[disabled],
|
.form-control[disabled],
|
||||||
.form-control[readonly],
|
.form-control[readonly],
|
||||||
fieldset[disabled] .form-control {
|
fieldset[disabled] .form-control {
|
||||||
|
2
dist/css/bootstrap.min.css
vendored
2
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
@ -92,14 +92,6 @@ output {
|
|||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Placeholder
|
|
||||||
//
|
|
||||||
// Placeholder text gets special styles because when browsers invalidate entire
|
|
||||||
// lines if it doesn't understand a selector/
|
|
||||||
.form-control {
|
|
||||||
.placeholder();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Common form controls
|
// Common form controls
|
||||||
//
|
//
|
||||||
@ -142,6 +134,12 @@ output {
|
|||||||
// Customize the `:focus` state to imitate native WebKit styles.
|
// Customize the `:focus` state to imitate native WebKit styles.
|
||||||
.form-control-focus();
|
.form-control-focus();
|
||||||
|
|
||||||
|
// Placeholder
|
||||||
|
//
|
||||||
|
// Placeholder text gets special styles because when browsers invalidate entire
|
||||||
|
// lines if it doesn't understand a selector/
|
||||||
|
.placeholder();
|
||||||
|
|
||||||
// Disabled and read-only inputs
|
// Disabled and read-only inputs
|
||||||
// Note: HTML5 says that controls under a fieldset > legend:first-child won't
|
// Note: HTML5 says that controls under a fieldset > legend:first-child won't
|
||||||
// be disabled if the fieldset is disabled. Due to implementation difficulty,
|
// be disabled if the fieldset is disabled. Due to implementation difficulty,
|
||||||
|
Loading…
Reference in New Issue
Block a user