mirror of
https://github.com/twbs/bootstrap.git
synced 2025-01-17 09:52:29 +01:00
tweak spacing once more on prettify; add support for uneditable inputs to input-append and prepend
This commit is contained in:
Mark Otto
parent
e23448ab1b
commit
45d671d97f
17
bootstrap.css
vendored
17
bootstrap.css
vendored
@ -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;
|
||||
|
||||
8
bootstrap.min.css
vendored
8
bootstrap.min.css
vendored
@ -119,7 +119,7 @@ input[type=file]:focus,input[type=checkbox]:focus,select:focus{-webkit-box-shado
|
||||
.input-large{width:210px;}
|
||||
.input-xlarge{width:270px;}
|
||||
.input-xxlarge{width:530px;}
|
||||
input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"]{float:none;margin-left:0;}
|
||||
input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{float:none;margin-left:0;}
|
||||
input.span1,textarea.span1,.uneditable-input.span1{width:50px;}
|
||||
input.span2,textarea.span2,.uneditable-input.span2{width:130px;}
|
||||
input.span3,textarea.span3,.uneditable-input.span3{width:210px;}
|
||||
@ -162,11 +162,13 @@ input::-webkit-input-placeholder{color:#999999;}
|
||||
.help-inline{*position:relative;*top:-5px;display:inline;padding-left:5px;}
|
||||
.input-prepend,.input-append{margin-bottom:5px;zoom:1;}.input-prepend:before,.input-append:before,.input-prepend:after,.input-append:after{display:table;*display:inline;content:"";zoom:1;}
|
||||
.input-prepend:after,.input-append:after{clear:both;}
|
||||
.input-prepend input,.input-append input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
|
||||
.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;width:auto;min-width:16px;height:18px;margin-right:-1px;padding:4px 4px 4px 5px;font-weight:normal;line-height:18px;color:#999999;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#f5f5f5;border:1px solid #ccc;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
|
||||
.input-prepend .active,.input-append .active{background-color:#a9dba9;border-color:#46a546;}
|
||||
.input-prepend .add-on{*margin-top:1px;}
|
||||
.input-append 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 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;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
|
||||
.search-query{padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;}
|
||||
.search-form input,.inline-form input,.horizontal-form input,.search-form textarea,.inline-form textarea,.horizontal-form textarea,.search-form select,.inline-form select,.horizontal-form select,.search-form .uneditable-input,.inline-form .uneditable-input,.horizontal-form .uneditable-input{display:inline-block;margin-bottom:0;}
|
||||
|
||||
@ -31,7 +31,7 @@ ol.linenums {
|
||||
margin: 0 0 0 33px; /* IE indents via margin-left */
|
||||
}
|
||||
ol.linenums li {
|
||||
padding-left: 7px;
|
||||
padding-left: 12px;
|
||||
color: #bebec5;
|
||||
line-height: 18px;
|
||||
text-shadow: 0 1px 0 #fff;
|
||||
|
||||
@ -1039,7 +1039,7 @@
|
||||
<div class="controls">
|
||||
<div class="input-prepend">
|
||||
<span class="add-on">@</span>
|
||||
<input class="input-small" id="prependedInput" name="prependedInput" size="16" type="text">
|
||||
<input class="span2" id="prependedInput" name="prependedInput" size="16" type="text">
|
||||
</div>
|
||||
<p class="help-block">Here's some help text</p>
|
||||
</div>
|
||||
@ -1048,7 +1048,7 @@
|
||||
<label class="control-label" for="appendedInput">Appended text</label>
|
||||
<div class="controls">
|
||||
<div class="input-append">
|
||||
<input class="input-small" id="appendedInput" name="appendedInput" size="16" type="text">
|
||||
<input class="span2" id="appendedInput" name="appendedInput" size="16" type="text">
|
||||
<span class="add-on">.00</span>
|
||||
</div>
|
||||
<p class="help-block">Here's more help text</p>
|
||||
|
||||
@ -192,7 +192,7 @@ select:focus {
|
||||
input[class*="span"],
|
||||
select[class*="span"],
|
||||
textarea[class*="span"],
|
||||
.uneditable-input[class*="span"] {
|
||||
.uneditable-input {
|
||||
float: none;
|
||||
margin-left: 0;
|
||||
}
|
||||
@ -357,9 +357,13 @@ input::-webkit-input-placeholder {
|
||||
.input-append {
|
||||
margin-bottom: 5px;
|
||||
.clearfix(); // Clear the float to prevent wrapping
|
||||
input {
|
||||
input,
|
||||
.uneditable-input {
|
||||
.border-radius(0 3px 3px 0);
|
||||
}
|
||||
.uneditable-input {
|
||||
border-left-color: #ccc;
|
||||
}
|
||||
.add-on {
|
||||
float: left;
|
||||
display: block;
|
||||
@ -388,10 +392,14 @@ input::-webkit-input-placeholder {
|
||||
}
|
||||
}
|
||||
.input-append {
|
||||
input {
|
||||
input,
|
||||
.uneditable-input {
|
||||
float: left;
|
||||
.border-radius(3px 0 0 3px);
|
||||
}
|
||||
.uneditable-input {
|
||||
border-right-color: #ccc;
|
||||
}
|
||||
.add-on {
|
||||
margin-right: 0;
|
||||
margin-left: -1px;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user