mirror of
https://github.com/twbs/bootstrap.git
synced 2022-11-09 12:25:43 -05:00
reoder forms a bit
This commit is contained in:
Mark Otto
parent
e2b777d9a3
commit
3f2f96b0d7
2 changed files with 72 additions and 70 deletions
77
docs/assets/css/bootstrap.css
vendored
77
docs/assets/css/bootstrap.css
vendored
|
|
@ -995,11 +995,6 @@ input[type="checkbox"] {
|
|||
width: auto;
|
||||
}
|
||||
|
||||
.uneditable-textarea {
|
||||
width: auto;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
select,
|
||||
input[type="file"] {
|
||||
height: 28px;
|
||||
|
|
@ -1030,6 +1025,42 @@ input[type="checkbox"]:focus {
|
|||
outline-offset: -2px;
|
||||
}
|
||||
|
||||
.uneditable-input,
|
||||
.uneditable-textarea {
|
||||
color: #999999;
|
||||
cursor: not-allowed;
|
||||
background-color: #fcfcfc;
|
||||
border-color: #cccccc;
|
||||
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
|
||||
-moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
|
||||
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
|
||||
}
|
||||
|
||||
.uneditable-input {
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.uneditable-textarea {
|
||||
width: auto;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
input:-moz-placeholder,
|
||||
textarea:-moz-placeholder {
|
||||
color: #999999;
|
||||
}
|
||||
|
||||
input:-ms-input-placeholder,
|
||||
textarea:-ms-input-placeholder {
|
||||
color: #999999;
|
||||
}
|
||||
|
||||
input::-webkit-input-placeholder,
|
||||
textarea::-webkit-input-placeholder {
|
||||
color: #999999;
|
||||
}
|
||||
|
||||
.radio,
|
||||
.checkbox {
|
||||
min-height: 18px;
|
||||
|
|
@ -1336,32 +1367,6 @@ select:focus:required:invalid:focus {
|
|||
clear: both;
|
||||
}
|
||||
|
||||
.uneditable-input {
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
cursor: not-allowed;
|
||||
background-color: #ffffff;
|
||||
border-color: #eee;
|
||||
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
|
||||
-moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
|
||||
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
|
||||
}
|
||||
|
||||
input:-moz-placeholder,
|
||||
textarea:-moz-placeholder {
|
||||
color: #999999;
|
||||
}
|
||||
|
||||
input:-ms-input-placeholder,
|
||||
textarea:-ms-input-placeholder {
|
||||
color: #999999;
|
||||
}
|
||||
|
||||
input::-webkit-input-placeholder,
|
||||
textarea::-webkit-input-placeholder {
|
||||
color: #999999;
|
||||
}
|
||||
|
||||
.help-block,
|
||||
.help-inline {
|
||||
color: #595959;
|
||||
|
|
@ -1412,11 +1417,6 @@ textarea::-webkit-input-placeholder {
|
|||
z-index: 2;
|
||||
}
|
||||
|
||||
.input-prepend .uneditable-input,
|
||||
.input-append .uneditable-input {
|
||||
border-left-color: #ccc;
|
||||
}
|
||||
|
||||
.input-prepend .add-on,
|
||||
.input-append .add-on {
|
||||
display: inline-block;
|
||||
|
|
@ -1470,11 +1470,6 @@ textarea::-webkit-input-placeholder {
|
|||
border-radius: 3px 0 0 3px;
|
||||
}
|
||||
|
||||
.input-append .uneditable-input {
|
||||
border-right-color: #ccc;
|
||||
border-left-color: #eee;
|
||||
}
|
||||
|
||||
.input-append .add-on:last-child,
|
||||
.input-append .btn:last-child {
|
||||
-webkit-border-radius: 0 3px 3px 0;
|
||||
|
|
|
|||
|
|
@ -149,12 +149,6 @@ input[type="checkbox"] {
|
|||
width: auto; // Override of generic input selector
|
||||
}
|
||||
|
||||
// Make uneditable textareas behave like a textarea
|
||||
.uneditable-textarea {
|
||||
width: auto;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
// Set the height of select and file controls to match text inputs
|
||||
select,
|
||||
input[type="file"] {
|
||||
|
|
@ -184,6 +178,41 @@ input[type="checkbox"]:focus {
|
|||
}
|
||||
|
||||
|
||||
// Uneditable inputs
|
||||
// -------------------------
|
||||
|
||||
// Make uneditable inputs look inactive
|
||||
.uneditable-input,
|
||||
.uneditable-textarea {
|
||||
color: @grayLight;
|
||||
background-color: darken(@inputBackground, 1%);
|
||||
border-color: @inputBorder;
|
||||
.box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
// For text that needs to appear as an input but should not be an input
|
||||
.uneditable-input {
|
||||
overflow: hidden; // prevent text from wrapping, but still cut it off like an input does
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
// Make uneditable textareas behave like a textarea
|
||||
.uneditable-textarea {
|
||||
width: auto;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
|
||||
// Placeholder
|
||||
// -------------------------
|
||||
|
||||
// Placeholder text gets special styles; can't be bundled together though for some reason
|
||||
input,
|
||||
textarea {
|
||||
.placeholder();
|
||||
}
|
||||
|
||||
|
||||
// CHECKBOXES & RADIOS
|
||||
// -------------------
|
||||
|
|
@ -333,22 +362,6 @@ select:focus:required:invalid {
|
|||
.clearfix(); // Adding clearfix to allow for .pull-right button containers
|
||||
}
|
||||
|
||||
// For text that needs to appear as an input but should not be an input
|
||||
.uneditable-input {
|
||||
overflow: hidden; // prevent text from wrapping, but still cut it off like an input does
|
||||
white-space: nowrap;
|
||||
cursor: not-allowed;
|
||||
background-color: @inputBackground;
|
||||
border-color: #eee;
|
||||
.box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
|
||||
}
|
||||
|
||||
// Placeholder text gets special styles; can't be bundled together though for some reason
|
||||
input,
|
||||
textarea {
|
||||
.placeholder();
|
||||
}
|
||||
|
||||
|
||||
|
||||
// HELP TEXT
|
||||
|
|
@ -382,6 +395,7 @@ textarea {
|
|||
margin-bottom: 5px;
|
||||
font-size: 0;
|
||||
white-space: nowrap; // Prevent span and input from separating
|
||||
|
||||
input,
|
||||
select,
|
||||
.uneditable-input {
|
||||
|
|
@ -396,9 +410,6 @@ textarea {
|
|||
z-index: 2;
|
||||
}
|
||||
}
|
||||
.uneditable-input {
|
||||
border-left-color: #ccc;
|
||||
}
|
||||
.add-on {
|
||||
display: inline-block;
|
||||
width: auto;
|
||||
|
|
@ -440,10 +451,6 @@ textarea {
|
|||
.uneditable-input {
|
||||
.border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
|
||||
}
|
||||
.uneditable-input {
|
||||
border-right-color: #ccc;
|
||||
border-left-color: #eee;
|
||||
}
|
||||
.add-on:last-child,
|
||||
.btn:last-child {
|
||||
.border-radius(0 @inputBorderRadius @inputBorderRadius 0);
|
||||
|
|
|
|||
Loading…
Reference in a new issue