From 7b69549881f33c8a7fe68706f76e7247835f0690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Fri, 6 Jul 2018 11:54:12 +0200 Subject: [PATCH] [SOGo] Fix theme-blue.js contrast and flipping colors on login screen, fixes #1528 --- data/Dockerfiles/sogo/theme-blue.js | 40 ++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/data/Dockerfiles/sogo/theme-blue.js b/data/Dockerfiles/sogo/theme-blue.js index 8992bba2..c2842da9 100644 --- a/data/Dockerfiles/sogo/theme-blue.js +++ b/data/Dockerfiles/sogo/theme-blue.js @@ -12,20 +12,42 @@ configure.$inject = ['$mdThemingProvider']; function configure($mdThemingProvider) { + // Overwrite values to prevent flipping colors on login screen + $mdThemingProvider.definePalette('sogo-green', { + '50': 'E3F2FD', + '100': 'BBDEFB', + '200': '90CAF9', + '300': '64B5F6', + '400': '42A5F5', + '500': '2196F3', + '600': '1E88E5', + '700': '1976D2', + '800': '1565C0', + '900': '0D47A1', + '1000': '0D47A1', + 'A100': '82B1FF', + 'A200': '448AFF', + 'A400': '2979ff', + 'A700': '2962ff', + 'contrastDefaultColor': 'dark', + 'contrastLightColors': ['700', '800', '900'], + 'contrastDarkColors': undefined + }); + /** * Define the Alternative theme */ $mdThemingProvider.theme('mailcow') - .primaryPalette('blue', { + .primaryPalette('sogo-green', { 'default': '700', // top toolbar 'hue-1': '500', 'hue-2': '700', // sidebar toolbar 'hue-3': 'A700' }) - .accentPalette('blue', { - 'default': '700', // fab buttons + .accentPalette('sogo-green', { + 'default': '800', // fab buttons 'hue-1': '50', // center list toolbar - 'hue-2': '600', + 'hue-2': '500', 'hue-3': 'A700' }) .backgroundPalette('grey', { @@ -35,16 +57,16 @@ 'hue-3': '300' }); $mdThemingProvider.theme('default') - .primaryPalette('blue', { + .primaryPalette('sogo-green', { 'default': '700', // top toolbar 'hue-1': '500', 'hue-2': '700', // sidebar toolbar - 'hue-3': 'A700' + 'hue-3': 'A200' }) - .accentPalette('blue', { - 'default': '700', // fab buttons + .accentPalette('sogo-green', { + 'default': '800', // fab buttons 'hue-1': '50', // center list toolbar - 'hue-2': '600', + 'hue-2': '500', 'hue-3': 'A700' }) .backgroundPalette('grey', {