mirror of
				https://github.com/fspc/BikeShed-1.git
				synced 2025-10-31 17:05:36 -04:00 
			
		
		
		
	update less to sass
This commit is contained in:
		
							parent
							
								
									fd5d4798b0
								
							
						
					
					
						commit
						e1e49cbbb2
					
				
										
											Binary file not shown.
										
									
								
							| @ -12,8 +12,8 @@ | |||||||
| //
 | //
 | ||||||
| //= require jquery
 | //= require jquery
 | ||||||
| //= require jquery_ujs
 | //= require jquery_ujs
 | ||||||
| //= require twitter/bootstrap/bootstrap-button
 | // require twitter/bootstrap/bootstrap-button
 | ||||||
| //= require twitter/bootstrap/bootstrap-modal
 | // require twitter/bootstrap/bootstrap-modal
 | ||||||
| //= require utils
 | //= require utils
 | ||||||
| //= require bootstrap-datepicker
 | //= require bootstrap-datepicker
 | ||||||
| //= require bootstrap-timepicker
 | //= require bootstrap-timepicker
 | ||||||
|  | |||||||
| @ -10,6 +10,9 @@ | |||||||
|  * |  * | ||||||
|  *= require_self |  *= require_self | ||||||
|  *= require datepicker |  *= require datepicker | ||||||
|  |  *= require bootstrap | ||||||
|  |  *= require bootstrap-responsive | ||||||
|  *= require bootstrap-timepicker |  *= require bootstrap-timepicker | ||||||
|  *= require bootstrap_and_overrides |  *= require bootstrap_and_overrides | ||||||
|  |  *= require bootstrap-fontawesome | ||||||
| */ | */ | ||||||
|  | |||||||
							
								
								
									
										31
									
								
								app/assets/stylesheets/bootstrap_and_overrides.css.scss
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										31
									
								
								app/assets/stylesheets/bootstrap_and_overrides.css.scss
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @ -0,0 +1,31 @@ | |||||||
|  | body {  | ||||||
|  | 	padding-top: 60px; | ||||||
|  | 	padding-left: 20px; | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | // Set the correct sprite paths | ||||||
|  | $iconSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings.png'); | ||||||
|  | $iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white.png'); | ||||||
|  | 
 | ||||||
|  | // Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines) | ||||||
|  | // Note: If you use asset_path() here, your compiled boostrap_and_overrides.css will not  | ||||||
|  | //       have the proper paths. So for now we use the absolute path. | ||||||
|  | $fontAwesomeEotPath: '/assets/fontawesome-webfont.eot'; | ||||||
|  | $fontAwesomeWoffPath: '/assets/fontawesome-webfont.woff'; | ||||||
|  | $fontAwesomeTtfPath: '/assets/fontawesome-webfont.ttf'; | ||||||
|  | $fontAwesomeSvgPath: '/assets/fontawesome-webfont.svg'; | ||||||
|  | 
 | ||||||
|  | [data-toggle="buttons-radio"] > .btn > input[type="radio"], | ||||||
|  | [data-toggle="buttons"] > .btn > input[type="checkbox"] { | ||||||
|  |   display: none; | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | .inline-block { | ||||||
|  |   display: inline-block; | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | .control-group.error .btn-group > .btn { | ||||||
|  |   color: #b94a48; | ||||||
|  |   border-color: #b94a48; | ||||||
|  | } | ||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user