Styleshees are now sass-based. Woo.
This commit is contained in:
		
							parent
							
								
									2b124ce602
								
							
						
					
					
						commit
						8b49f62dc8
					
				
					 4 changed files with 18 additions and 19 deletions
				
			
		|  | @ -1 +1,5 @@ | ||||||
| <link href='/site_media/static/css/site-0a247b924d.css' rel='stylesheet' /> | {% load compress %} | ||||||
|  | {% load staticfiles %} | ||||||
|  | {% compress css %} | ||||||
|  |     <link rel="stylesheet" type="text/x-scss" href="{% static "scss/site.scss" %}" /> | ||||||
|  | {% endcompress %} | ||||||
|  |  | ||||||
|  | @ -1,8 +0,0 @@ | ||||||
| @import "variables.scss"; |  | ||||||
| @import "account.scss"; |  | ||||||
| @import "custom.scss"; |  | ||||||
| @import "editor.scss"; |  | ||||||
| @import "site.scss"; |  | ||||||
| @import "symposion-components.scss"; |  | ||||||
| @import "symposion-schedule.scss"; |  | ||||||
| @import "variables.scss"; |  | ||||||
|  | @ -23,8 +23,8 @@ p.login-signup { | ||||||
|             margin-bottom: 0.2em; |             margin-bottom: 0.2em; | ||||||
|         } |         } | ||||||
|         @include make-sm-column(4); |         @include make-sm-column(4); | ||||||
|         .text-center; |         /*.text-center; | ||||||
|         margin: 2em 0; |         margin: 2em 0;*/ | ||||||
|     } |     } | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1,15 +1,18 @@ | ||||||
| @import "bootstrap"; | $icon-font-path: "bootstrap-sass/assets/fonts/bootstrap/"; | ||||||
| @import "font-awesome"; | @import "../bootstrap/stylesheets/_bootstrap.scss"; | ||||||
| 
 | 
 | ||||||
| @import "variables.less"; | /* @import "bootstrap"; | ||||||
|  | @import "font-awesome"; */ | ||||||
|  | 
 | ||||||
|  | @import "variables.scss"; | ||||||
| 
 | 
 | ||||||
| // Account | // Account | ||||||
| @import "account.less"; | @import "account.scss"; | ||||||
| 
 | 
 | ||||||
| // Symposion UI components | // Symposion UI components | ||||||
| @import "editor.less"; | @import "editor.scss"; | ||||||
| @import "symposion-components.less"; | @import "symposion-components.scss"; | ||||||
| @import "symposion-schedule.less"; | @import "symposion-schedule.scss"; | ||||||
| 
 | 
 | ||||||
| // Site overrides | // Site overrides | ||||||
| @import "custom.less"; | @import "custom.scss"; | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 Christopher Neugebauer
						Christopher Neugebauer