mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-21 13:24:08 +03:00
Code Activity

tweak spacing once more on prettify; add support for uneditable inputs to input-append and prepend

Browse Source
This commit is contained in:
Mark Otto
2012-01-07 01:22:52 -08:00
parent e23448ab1b
commit 45d671d97f
5 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bootstrap.css
Vendored
+13 -4
View File
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Sat Jan 7 01:08:05 PST 2012
* Date: Sat Jan 7 01:22:18 PST 2012
*/
html, body {
margin: 0;
@@ -678,7 +678,7 @@ input[type=file]:focus, input[type=checkbox]:focus, select:focus {
input[class*="span"],
select[class*="span"],
textarea[class*="span"],
.uneditable-input[class*="span"] {
.uneditable-input {
float: none;
margin-left: 0;
}
@@ -871,11 +871,17 @@ input::-webkit-input-placeholder {
.input-prepend:after, .input-append:after {
clear: both;
}
.input-prepend input, .input-append input {
.input-prepend input,
.input-append input,
.input-prepend .uneditable-input,
.input-append .uneditable-input {
-webkit-border-radius: 0 3px 3px 0;
-moz-border-radius: 0 3px 3px 0;
border-radius: 0 3px 3px 0;
}
.input-prepend .uneditable-input, .input-append .uneditable-input {
border-left-color: #ccc;
}
.input-prepend .add-on, .input-append .add-on {
float: left;
display: block;
@@ -904,12 +910,15 @@ input::-webkit-input-placeholder {
/* IE6-7 */
}
.input-append input {
.input-append input, .input-append .uneditable-input {
float: left;
-webkit-border-radius: 3px 0 0 3px;
-moz-border-radius: 3px 0 0 3px;
border-radius: 3px 0 0 3px;
}
.input-append .uneditable-input {
border-right-color: #ccc;
}
.input-append .add-on {
margin-right: 0;
margin-left: -1px;