mirror of https://github.com/vector-im/riot-web
				
				
				
			Lift font SCSS partials to theme root
This means that themes which include `light/css/_base.scss` (currently Dark and Status) won't be forced to have Light's font-faces included. This only really matters for Status, which uses different fonts throughout.pull/21833/head
							parent
							
								
									9a7a8da6c0
								
							
						
					
					
						commit
						7678b9c43b
					
				|  | @ -1,4 +1,4 @@ | |||
| @import "../../light/css/_fonts.scss"; | ||||
| @import "../../light/css/_base.scss"; | ||||
| @import "_dark.scss"; | ||||
| @import "../../../../res/css/_components.scss"; | ||||
| 
 | ||||
|  |  | |||
|  | @ -1,5 +1,3 @@ | |||
| @import "_fonts.scss"; | ||||
| 
 | ||||
| // XXX: check this? | ||||
| /* Nunito lacks combining diacritics, so these will fall through | ||||
|    to the next font.  Helevetica's diacritics however do not combine | ||||
|  |  | |||
|  | @ -1,3 +1,3 @@ | |||
| @import "_fonts.scss"; | ||||
| @import "_dharma.scss"; | ||||
| @import "../../../../res/css/_components.scss"; | ||||
| 
 | ||||
|  |  | |||
|  | @ -1,5 +1,3 @@ | |||
| @import "_fonts.scss"; | ||||
| 
 | ||||
| /* Open Sans lacks combining diacritics, so these will fall through | ||||
|    to the next font.  Helevetica's diacritics however do not combine | ||||
|    nicely with Open Sans (on OSX, at least) and result in a huge | ||||
|  |  | |||
|  | @ -1,3 +1,3 @@ | |||
| @import "_fonts.scss"; | ||||
| @import "_base.scss"; | ||||
| @import "../../../../res/css/_components.scss"; | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 J. Ryan Stinnett
						J. Ryan Stinnett