mirror of https://github.com/twbs/bootstrap.git
				
				
				
			update form shadows and tweak prettyprint styles
This commit is contained in:
		
							parent
							
								
									bcf1136f2c
								
							
						
					
					
						commit
						d6a1402f2a
					
				|  | @ -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 00:47:37 PST 2012 | ||||
|  * Date: Sat Jan  7 00:50:40 PST 2012 | ||||
|  */ | ||||
| html, body { | ||||
|   margin: 0; | ||||
|  | @ -635,9 +635,9 @@ textarea { | |||
|   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-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; | ||||
|  | @ -646,9 +646,9 @@ input, textarea { | |||
| } | ||||
| 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); | ||||
|   -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 { | ||||
|  |  | |||
|  | @ -110,8 +110,8 @@ textarea{height:auto;} | |||
| .controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:6px;} | ||||
| .radio.inline,.checkbox.inline{display:inline-block;margin-bottom:0;} | ||||
| .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: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,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 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-mini{width:60px;} | ||||
| .input-small{width:90px;} | ||||
|  |  | |||
|  | @ -21,10 +21,22 @@ pre.prettyprint { | |||
|   padding: 8px; | ||||
|   background-color: #f7f7f9; | ||||
|   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 */ | ||||
| ol.linenums { margin: 0 0 0 40px; } /* IE indents via margin-left */ | ||||
| ol.linenums li { color: #bebec5; line-height: 18px; text-shadow: 0 1px 0 #fff; } | ||||
| ol.linenums { | ||||
|   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 */ | ||||
| li.L1, li.L3, li.L5, li.L7, li.L9 {  } | ||||
| li.L1, li.L3, li.L5, li.L7, li.L9 { | ||||
|    | ||||
| } | ||||
|  | @ -1009,8 +1009,9 @@ | |||
|         <hr> | ||||
|         <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> | ||||
| <pre class="prettyprint"> | ||||
| <fieldset class="control-group error"> | ||||
| <pre class="prettyprint linenums"> | ||||
| <fieldset | ||||
|   class="control-group error"> | ||||
|   ... | ||||
| </fieldset> | ||||
| </pre> | ||||
|  |  | |||
|  | @ -157,14 +157,14 @@ textarea { | |||
| 
 | ||||
| input, | ||||
| 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(@transition); | ||||
| } | ||||
| input:focus, | ||||
| textarea:focus { | ||||
|   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); | ||||
|   outline: 0; | ||||
| } | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue