mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-06 13:46:42 +02:00
Code Issues Releases Wiki Activity

fix #2718, misaligned uneditable inputs in prepends/appends

Browse Source
This commit is contained in:
Mark Otto
2012-03-22 17:41:20 -07:00
parent b7b84c7a0d
commit edca6f28f0
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

2
docs/assets/css/bootstrap.css vendored
View File

@@ -951,7 +951,6 @@ select:focus:required:invalid:focus {
clear: both; clear: both;
} }
.uneditable-input { .uneditable-input {
display: block;
background-color: #ffffff; background-color: #ffffff;
border-color: #eee; border-color: #eee;
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
@@ -994,6 +993,7 @@ select:focus:required:invalid:focus {
.input-append .uneditable-input { .input-append .uneditable-input {
margin-bottom: 0; margin-bottom: 0;
*margin-left: 0; *margin-left: 0;
vertical-align: middle;
-webkit-border-radius: 0 3px 3px 0; -webkit-border-radius: 0 3px 3px 0;
-moz-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0;
border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0;

2
less/forms.less
View File

@@ -321,7 +321,6 @@ select:focus:required:invalid {
// For text that needs to appear as an input but should not be an input // For text that needs to appear as an input but should not be an input
.uneditable-input { .uneditable-input {
display: block;
background-color: @inputBackground; background-color: @inputBackground;
border-color: #eee; border-color: #eee;
.box-shadow(inset 0 1px 2px rgba(0,0,0,.025)); .box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
@@ -367,6 +366,7 @@ select:focus:required:invalid {
.uneditable-input { .uneditable-input {
margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
*margin-left: 0; *margin-left: 0;
vertical-align: middle;
.border-radius(0 3px 3px 0); .border-radius(0 3px 3px 0);
&:focus { &:focus {
position: relative; position: relative;