diff options
| author | Mark Otto <[email protected]> | 2012-04-15 00:35:30 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-04-15 00:35:30 -0700 |
| commit | 13e4d1d5ac90484c09ecb1a98e540309d043a6f7 (patch) | |
| tree | e022854cdd1277135645452098aca6342791a5d6 | |
| parent | cad8f2b43acac39958c5f3fb04e9d922900e7b89 (diff) | |
| download | bootstrap-13e4d1d5ac90484c09ecb1a98e540309d043a6f7.tar.xz bootstrap-13e4d1d5ac90484c09ecb1a98e540309d043a6f7.zip | |
fix #2990: text wrapping in .uneditable-input
| -rw-r--r-- | docs/assets/css/bootstrap.css | 2 | ||||
| -rw-r--r-- | less/forms.less | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 0218e595b..e51c74e07 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -977,6 +977,8 @@ select:focus:required:invalid:focus { -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); cursor: not-allowed; + overflow: hidden; + white-space: nowrap; } :-moz-placeholder { color: #999999; diff --git a/less/forms.less b/less/forms.less index dd18b91f5..409de0a24 100644 --- a/less/forms.less +++ b/less/forms.less @@ -331,6 +331,9 @@ select:focus:required:invalid { border-color: #eee; .box-shadow(inset 0 1px 2px rgba(0,0,0,.025)); cursor: not-allowed; + // prevent text from wrapping, but still cut it off like an input does + overflow: hidden; + white-space: nowrap; } // Placeholder text gets special styles; can't be bundled together though for some reason |