0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-11 08:54:23 +01:00

update form shadows and tweak prettyprint styles

This commit is contained in:
Mark Otto 2012-01-07 01:03:26 -08:00
parent bcf1136f2c
commit d6a1402f2a
5 changed files with 29 additions and 16 deletions

14
bootstrap.css vendored
View File

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Sat Jan 7 00:47:37 PST 2012 * Date: Sat Jan 7 00:50:40 PST 2012
*/ */
html, body { html, body {
margin: 0; margin: 0;
@ -635,9 +635,9 @@ textarea {
margin-left: 10px; margin-left: 10px;
} }
input, textarea { input, textarea {
-webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1);
-moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1);
box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1);
-webkit-transition: border linear 0.2s, box-shadow linear 0.2s; -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
-moz-transition: border linear 0.2s, box-shadow linear 0.2s; -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
-ms-transition: border linear 0.2s, box-shadow linear 0.2s; -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
@ -646,9 +646,9 @@ input, textarea {
} }
input:focus, textarea:focus { input:focus, textarea:focus {
border-color: rgba(82, 168, 236, 0.8); border-color: rgba(82, 168, 236, 0.8);
-webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
-moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
outline: 0; outline: 0;
} }
input[type=file]:focus, input[type=checkbox]:focus, select:focus { input[type=file]:focus, input[type=checkbox]:focus, select:focus {

4
bootstrap.min.css vendored
View File

@ -110,8 +110,8 @@ textarea{height:auto;}
.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:6px;} .controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:6px;}
.radio.inline,.checkbox.inline{display:inline-block;margin-bottom:0;} .radio.inline,.checkbox.inline{display:inline-block;margin-bottom:0;}
.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;} .radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;}
input,textarea{-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;} input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;}
input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);outline:0;} input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);outline:0;}
input[type=file]:focus,input[type=checkbox]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:1px dotted #666;} input[type=file]:focus,input[type=checkbox]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:1px dotted #666;}
.input-mini{width:60px;} .input-mini{width:60px;}
.input-small{width:90px;} .input-small{width:90px;}

View File

@ -21,10 +21,22 @@ pre.prettyprint {
padding: 8px; padding: 8px;
background-color: #f7f7f9; background-color: #f7f7f9;
border: 1px solid #e1e1e8; border: 1px solid #e1e1e8;
-webkit-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
-moz-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
} }
/* Specify class=linenums on a pre to get line numbering */ /* Specify class=linenums on a pre to get line numbering */
ol.linenums { margin: 0 0 0 40px; } /* IE indents via margin-left */ ol.linenums {
ol.linenums li { color: #bebec5; line-height: 18px; text-shadow: 0 1px 0 #fff; } margin: 0 0 0 33px; /* IE indents via margin-left */
}
ol.linenums li {
padding-left: 7px;
color: #bebec5;
line-height: 18px;
text-shadow: 0 1px 0 #fff;
}
/* Alternate shading for lines */ /* Alternate shading for lines */
li.L1, li.L3, li.L5, li.L7, li.L9 { } li.L1, li.L3, li.L5, li.L7, li.L9 {
}

View File

@ -1009,8 +1009,9 @@
<hr> <hr>
<h3>Form validation</h3> <h3>Form validation</h3>
<p>It also includes validation styles for errors, warnings, and success. To use, add the a class to the surrounding <code>.control-group</code>.</p> <p>It also includes validation styles for errors, warnings, and success. To use, add the a class to the surrounding <code>.control-group</code>.</p>
<pre class="prettyprint"> <pre class="prettyprint linenums">
&lt;fieldset class="control-group error"&gt; &lt;fieldset
class="control-group error"&gt;
... ...
&lt;/fieldset&gt; &lt;/fieldset&gt;
</pre> </pre>

View File

@ -157,14 +157,14 @@ textarea {
input, input,
textarea { textarea {
.box-shadow(inset 0 1px 3px rgba(0,0,0,.1)); .box-shadow(inset 0 1px 1px rgba(0,0,0,.1));
@transition: border linear .2s, box-shadow linear .2s; @transition: border linear .2s, box-shadow linear .2s;
.transition(@transition); .transition(@transition);
} }
input:focus, input:focus,
textarea:focus { textarea:focus {
border-color: rgba(82,168,236,.8); border-color: rgba(82,168,236,.8);
@shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6); @shadow: inset 0 1px 1px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6);
.box-shadow(@shadow); .box-shadow(@shadow);
outline: 0; outline: 0;
} }