mirror of https://github.com/twbs/bootstrap.git
				
				
				
			changes for build in preperation for 2.0.3 release
This commit is contained in:
		
							parent
							
								
									b8b1ffde05
								
							
						
					
					
						commit
						73453c7f79
					
				|  | @ -4631,15 +4631,15 @@ a.badge:hover { | ||||||
|   -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); |   -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); | ||||||
|      -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); |      -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); | ||||||
|           box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); |           box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); | ||||||
|  |   -webkit-box-sizing: border-box; | ||||||
|  |      -moz-box-sizing: border-box; | ||||||
|  |       -ms-box-sizing: border-box; | ||||||
|  |           box-sizing: border-box; | ||||||
|   -webkit-transition: width 0.6s ease; |   -webkit-transition: width 0.6s ease; | ||||||
|      -moz-transition: width 0.6s ease; |      -moz-transition: width 0.6s ease; | ||||||
|       -ms-transition: width 0.6s ease; |       -ms-transition: width 0.6s ease; | ||||||
|        -o-transition: width 0.6s ease; |        -o-transition: width 0.6s ease; | ||||||
|           transition: width 0.6s ease; |           transition: width 0.6s ease; | ||||||
|   -webkit-box-sizing: border-box; |  | ||||||
|      -moz-box-sizing: border-box; |  | ||||||
|       -ms-box-sizing: border-box; |  | ||||||
|           box-sizing: border-box; |  | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .progress-striped .bar { | .progress-striped .bar { | ||||||
|  |  | ||||||
|  | @ -137,7 +137,7 @@ | ||||||
| 
 | 
 | ||||||
|       $.ajax({ |       $.ajax({ | ||||||
|         type: 'POST' |         type: 'POST' | ||||||
|       , url: 'http://bootstrap.herokuapp.com' |       , url: /\?dev/.test(window.location) ? 'http://localhost:3000' : 'http://bootstrap.herokuapp.com' | ||||||
|       , dataType: 'jsonpi' |       , dataType: 'jsonpi' | ||||||
|       , params: { |       , params: { | ||||||
|           js: js |           js: js | ||||||
|  | @ -147,7 +147,6 @@ | ||||||
|       } |       } | ||||||
|       }) |       }) | ||||||
|     }) |     }) | ||||||
| 
 |  | ||||||
|   }) |   }) | ||||||
| 
 | 
 | ||||||
| // Modified from the original jsonpi https://github.com/benvinegar/jquery-jsonpi
 | // Modified from the original jsonpi https://github.com/benvinegar/jquery-jsonpi
 | ||||||
|  |  | ||||||
|  | @ -108,7 +108,7 @@ | ||||||
|       <h3>Base CSS</h3> |       <h3>Base CSS</h3> | ||||||
|       <label class="checkbox"><input checked="checked" type="checkbox" value="type.less"> Headings, body, etc</label> |       <label class="checkbox"><input checked="checked" type="checkbox" value="type.less"> Headings, body, etc</label> | ||||||
|       <label class="checkbox"><input checked="checked" type="checkbox" value="code.less"> Code and pre</label> |       <label class="checkbox"><input checked="checked" type="checkbox" value="code.less"> Code and pre</label> | ||||||
|       <label class="checkbox"><input checked="checked" type="checkbox" value="labels.less"> Labels and badges</label> |       <label class="checkbox"><input checked="checked" type="checkbox" value="labels-badges.less"> Labels and badges</label> | ||||||
|       <label class="checkbox"><input checked="checked" type="checkbox" value="tables.less"> Tables</label> |       <label class="checkbox"><input checked="checked" type="checkbox" value="tables.less"> Tables</label> | ||||||
|       <label class="checkbox"><input checked="checked" type="checkbox" value="forms.less"> Forms</label> |       <label class="checkbox"><input checked="checked" type="checkbox" value="forms.less"> Forms</label> | ||||||
|       <label class="checkbox"><input checked="checked" type="checkbox" value="buttons.less"> Buttons</label> |       <label class="checkbox"><input checked="checked" type="checkbox" value="buttons.less"> Buttons</label> | ||||||
|  |  | ||||||
|  | @ -31,7 +31,7 @@ | ||||||
|       <h3>{{_i}}Base CSS{{/i}}</h3> |       <h3>{{_i}}Base CSS{{/i}}</h3> | ||||||
|       <label class="checkbox"><input checked="checked" type="checkbox" value="type.less"> {{_i}}Headings, body, etc{{/i}}</label> |       <label class="checkbox"><input checked="checked" type="checkbox" value="type.less"> {{_i}}Headings, body, etc{{/i}}</label> | ||||||
|       <label class="checkbox"><input checked="checked" type="checkbox" value="code.less"> {{_i}}Code and pre{{/i}}</label> |       <label class="checkbox"><input checked="checked" type="checkbox" value="code.less"> {{_i}}Code and pre{{/i}}</label> | ||||||
|       <label class="checkbox"><input checked="checked" type="checkbox" value="labels.less"> {{_i}}Labels and badges{{/i}}</label> |       <label class="checkbox"><input checked="checked" type="checkbox" value="labels-badges.less"> {{_i}}Labels and badges{{/i}}</label> | ||||||
|       <label class="checkbox"><input checked="checked" type="checkbox" value="tables.less"> {{_i}}Tables{{/i}}</label> |       <label class="checkbox"><input checked="checked" type="checkbox" value="tables.less"> {{_i}}Tables{{/i}}</label> | ||||||
|       <label class="checkbox"><input checked="checked" type="checkbox" value="forms.less"> {{_i}}Forms{{/i}}</label> |       <label class="checkbox"><input checked="checked" type="checkbox" value="forms.less"> {{_i}}Forms{{/i}}</label> | ||||||
|       <label class="checkbox"><input checked="checked" type="checkbox" value="buttons.less"> {{_i}}Buttons{{/i}}</label> |       <label class="checkbox"><input checked="checked" type="checkbox" value="buttons.less"> {{_i}}Buttons{{/i}}</label> | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue