1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00

Remove support for .uneditable-input

This commit is contained in:
Mark Otto 2013-03-03 23:31:09 -08:00
parent 6239094ca6
commit bfdc6f8607
2 changed files with 23 additions and 102 deletions

View file

@ -1052,8 +1052,7 @@ input[type="email"],
input[type="url"], input[type="url"],
input[type="search"], input[type="search"],
input[type="tel"], input[type="tel"],
input[type="color"], input[type="color"] {
.uneditable-input {
display: inline-block; display: inline-block;
min-height: 34px; min-height: 34px;
padding: 6px 9px; padding: 6px 9px;
@ -1077,8 +1076,7 @@ input[type="color"],
input, input,
select, select,
textarea, textarea {
.uneditable-input {
width: 100%; width: 100%;
} }
@ -1110,8 +1108,7 @@ input[type="email"]:focus,
input[type="url"]:focus, input[type="url"]:focus,
input[type="search"]:focus, input[type="search"]:focus,
input[type="tel"]:focus, input[type="tel"]:focus,
input[type="color"]:focus, input[type="color"]:focus {
.uneditable-input:focus {
border-color: rgba(82, 168, 236, 0.8); border-color: rgba(82, 168, 236, 0.8);
outline: 0; outline: 0;
outline: thin dotted \9; outline: thin dotted \9;
@ -1152,26 +1149,6 @@ input[type="checkbox"]:focus {
outline-offset: -2px; 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);
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, input:-moz-placeholder,
textarea:-moz-placeholder { textarea:-moz-placeholder {
color: #999999; color: #999999;
@ -1256,8 +1233,7 @@ input[type="email"].input-large,
input[type="url"].input-large, input[type="url"].input-large,
input[type="search"].input-large, input[type="search"].input-large,
input[type="tel"].input-large, input[type="tel"].input-large,
input[type="color"].input-large, input[type="color"].input-large {
.uneditable-input.input-large {
padding: 11px 14px; padding: 11px 14px;
font-size: 17.5px; font-size: 17.5px;
border-radius: 6px; border-radius: 6px;
@ -1278,8 +1254,7 @@ input[type="email"].input-small,
input[type="url"].input-small, input[type="url"].input-small,
input[type="search"].input-small, input[type="search"].input-small,
input[type="tel"].input-small, input[type="tel"].input-small,
input[type="color"].input-small, input[type="color"].input-small {
.uneditable-input.input-small {
min-height: 26px; min-height: 26px;
padding: 2px 10px; padding: 2px 10px;
font-size: 11.9px; font-size: 11.9px;
@ -1288,24 +1263,20 @@ input[type="color"].input-small,
input[class*="span"], input[class*="span"],
select[class*="span"], select[class*="span"],
textarea[class*="span"], textarea[class*="span"] {
.uneditable-input[class*="span"] {
float: none; float: none;
margin-right: 0; margin-right: 0;
margin-left: 0; margin-left: 0;
} }
.input-append input[class*="span"], .input-append input[class*="span"],
.input-append .uneditable-input[class*="span"], .input-prepend input[class*="span"] {
.input-prepend input[class*="span"],
.input-prepend .uneditable-input[class*="span"] {
display: inline-block; display: inline-block;
} }
input[class*="span"], input[class*="span"],
select[class*="span"], select[class*="span"],
textarea[class*="span"], textarea[class*="span"] {
.uneditable-input[class*="span"] {
height: 34px; height: 34px;
} }
@ -1441,15 +1412,13 @@ select:focus:invalid:focus {
} }
.input-group input, .input-group input,
.input-group select, .input-group select {
.input-group .uneditable-input {
width: 100%; width: 100%;
} }
.input-group-addon, .input-group-addon,
.input-group-btn, .input-group-btn,
.input-group input, .input-group input {
.input-group .uneditable-input {
display: table-cell; display: table-cell;
margin: 0; margin: 0;
border-radius: 0; border-radius: 0;
@ -1457,15 +1426,13 @@ select:focus:invalid:focus {
.input-group-addon.input-small, .input-group-addon.input-small,
.input-group-btn.input-small, .input-group-btn.input-small,
.input-group input.input-small, .input-group input.input-small {
.input-group .uneditable-input.input-small {
border-radius: 0; border-radius: 0;
} }
.input-group-addon.input-large, .input-group-addon.input-large,
.input-group-btn.input-large, .input-group-btn.input-large,
.input-group input.input-large, .input-group input.input-large {
.input-group .uneditable-input.input-large {
border-radius: 0; border-radius: 0;
} }
@ -1500,21 +1467,18 @@ select:focus:invalid:focus {
} }
.input-group input:first-child, .input-group input:first-child,
.input-group .uneditable-input:first-child,
.input-group-addon:first-child { .input-group-addon:first-child {
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
border-top-left-radius: 4px; border-top-left-radius: 4px;
} }
.input-group input:first-child.input-small, .input-group input:first-child.input-small,
.input-group .uneditable-input:first-child.input-small,
.input-group-addon:first-child.input-small { .input-group-addon:first-child.input-small {
border-bottom-left-radius: 3px; border-bottom-left-radius: 3px;
border-top-left-radius: 3px; border-top-left-radius: 3px;
} }
.input-group input:first-child.input-large, .input-group input:first-child.input-large,
.input-group .uneditable-input:first-child.input-large,
.input-group-addon:first-child.input-large { .input-group-addon:first-child.input-large {
border-bottom-left-radius: 6px; border-bottom-left-radius: 6px;
border-top-left-radius: 6px; border-top-left-radius: 6px;
@ -1525,21 +1489,18 @@ select:focus:invalid:focus {
} }
.input-group input:last-child, .input-group input:last-child,
.input-group .uneditable-input:last-child,
.input-group-addon:last-child { .input-group-addon:last-child {
border-top-right-radius: 4px; border-top-right-radius: 4px;
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
} }
.input-group input:last-child.input-small, .input-group input:last-child.input-small,
.input-group .uneditable-input:last-child.input-small,
.input-group-addon:last-child.input-small { .input-group-addon:last-child.input-small {
border-top-right-radius: 3px; border-top-right-radius: 3px;
border-bottom-right-radius: 3px; border-bottom-right-radius: 3px;
} }
.input-group input:last-child.input-large, .input-group input:last-child.input-large,
.input-group .uneditable-input:last-child.input-large,
.input-group-addon:last-child.input-large { .input-group-addon:last-child.input-large {
border-top-right-radius: 6px; border-top-right-radius: 6px;
border-bottom-right-radius: 6px; border-bottom-right-radius: 6px;
@ -1620,8 +1581,7 @@ select:focus:invalid:focus {
} }
.form-horizontal .control-group input, .form-horizontal .control-group input,
.form-horizontal .control-group select, .form-horizontal .control-group select,
.form-horizontal .control-group textarea, .form-horizontal .control-group textarea {
.form-horizontal .control-group .uneditable-input {
margin-bottom: 0; margin-bottom: 0;
} }
.form-horizontal .control-group > .control-label { .form-horizontal .control-group > .control-label {

View file

@ -53,8 +53,7 @@ input[type="email"],
input[type="url"], input[type="url"],
input[type="search"], input[type="search"],
input[type="tel"], input[type="tel"],
input[type="color"], input[type="color"] {
.uneditable-input {
display: inline-block; display: inline-block;
.box-sizing(border-box); // Makes inputs behave like true block-level elements .box-sizing(border-box); // Makes inputs behave like true block-level elements
min-height: @input-height-base; // Make inputs at least the height of their button counterpart (base line-height + padding + border) min-height: @input-height-base; // Make inputs at least the height of their button counterpart (base line-height + padding + border)
@ -75,8 +74,7 @@ input[type="color"],
// Can't be on input[type=*] selectors or it's too specific // Can't be on input[type=*] selectors or it's too specific
input, input,
select, select,
textarea, textarea {
.uneditable-input {
width: 100%; width: 100%;
} }
@ -111,8 +109,7 @@ input[type="email"],
input[type="url"], input[type="url"],
input[type="search"], input[type="search"],
input[type="tel"], input[type="tel"],
input[type="color"], input[type="color"] {
.uneditable-input {
// Focus state // Focus state
&:focus { &:focus {
border-color: rgba(82,168,236,.8); border-color: rgba(82,168,236,.8);
@ -153,32 +150,6 @@ input[type="checkbox"]:focus {
} }
// Uneditable inputs
// -------------------------
// Make uneditable inputs look inactive
.uneditable-input,
.uneditable-textarea {
color: @grayLight;
background-color: darken(@input-background, 1%);
border-color: @input-border;
.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
// ------------------------- // -------------------------
@ -260,8 +231,7 @@ input[type="email"],
input[type="url"], input[type="url"],
input[type="search"], input[type="search"],
input[type="tel"], input[type="tel"],
input[type="color"], input[type="color"] {
.uneditable-input {
&.input-large { &.input-large {
padding: @padding-large; padding: @padding-large;
font-size: @font-size-large; font-size: @font-size-large;
@ -283,8 +253,7 @@ input[type="color"],
// Grid style input sizes // Grid style input sizes
input[class*="span"], input[class*="span"],
select[class*="span"], select[class*="span"],
textarea[class*="span"], textarea[class*="span"] {
.uneditable-input[class*="span"] {
float: none; float: none;
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;
@ -292,16 +261,13 @@ textarea[class*="span"],
// Ensure input-prepend/append never wraps // Ensure input-prepend/append never wraps
.input-append input[class*="span"], .input-append input[class*="span"],
.input-append .uneditable-input[class*="span"], .input-prepend input[class*="span"] {
.input-prepend input[class*="span"],
.input-prepend .uneditable-input[class*="span"] {
display: inline-block; display: inline-block;
} }
input[class*="span"], input[class*="span"],
select[class*="span"], select[class*="span"],
textarea[class*="span"], textarea[class*="span"] {
.uneditable-input[class*="span"] {
height: @input-height-base; height: @input-height-base;
} }
@ -419,8 +385,7 @@ select:focus:invalid {
} }
input, input,
select, select {
.uneditable-input {
width: 100%; width: 100%;
} }
} }
@ -429,8 +394,7 @@ select:focus:invalid {
// ------------------------- // -------------------------
.input-group-addon, .input-group-addon,
.input-group-btn, .input-group-btn,
.input-group input, .input-group input {
.input-group .uneditable-input {
display: table-cell; display: table-cell;
margin: 0; margin: 0;
border-radius: 0; border-radius: 0;
@ -473,7 +437,6 @@ select:focus:invalid {
// Reset rounded corners // Reset rounded corners
.input-group input:first-child, .input-group input:first-child,
.input-group .uneditable-input:first-child,
.input-group-addon:first-child { .input-group-addon:first-child {
.border-left-radius(@border-radius-base); .border-left-radius(@border-radius-base);
&.input-small { &.input-small {
@ -487,7 +450,6 @@ select:focus:invalid {
border-right: 0; border-right: 0;
} }
.input-group input:last-child, .input-group input:last-child,
.input-group .uneditable-input:last-child,
.input-group-addon:last-child { .input-group-addon:last-child {
.border-right-radius(@border-radius-base); .border-right-radius(@border-radius-base);
&.input-small { &.input-small {
@ -560,8 +522,7 @@ select:focus:invalid {
input, input,
select, select,
textarea, textarea {
.uneditable-input {
margin-bottom: 0; margin-bottom: 0;
} }
} }