mirror of
				https://github.com/vector-im/element-web.git
				synced 2025-10-31 16:21:46 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
		
						commit
						43ee22897b
					
				| @ -1403,6 +1403,11 @@ export default React.createClass({ | |||||||
|                     break; |                     break; | ||||||
|             } |             } | ||||||
|         }); |         }); | ||||||
|  | 
 | ||||||
|  |         // Fire the tinter right on startup to ensure the default theme is applied
 | ||||||
|  |         // A later sync can/will correct the tint to be the right value for the user
 | ||||||
|  |         const color_scheme = SettingsStore.getValue("roomColor"); | ||||||
|  |         Tinter.tint(color_scheme.primary_color, color_scheme.secondary_color); | ||||||
|     }, |     }, | ||||||
| 
 | 
 | ||||||
|     /** |     /** | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user