From b45b9bc5cfe72b7fe43b4658b8517e9c12150aad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <andre.peters@servercow.de>
Date: Sun, 15 Jul 2018 16:34:25 +0200
Subject: [PATCH] [SOGo] Override more theme options to prevent occasional
 theme switching on login

---
 data/Dockerfiles/sogo/theme-blue.js | 50 ++++++++++++++++++++++++++---
 docker-compose.yml                  |  2 +-
 2 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/data/Dockerfiles/sogo/theme-blue.js b/data/Dockerfiles/sogo/theme-blue.js
index c2842da93..332f3b580 100644
--- a/data/Dockerfiles/sogo/theme-blue.js
+++ b/data/Dockerfiles/sogo/theme-blue.js
@@ -13,6 +13,27 @@
   function configure($mdThemingProvider) {
 
     // Overwrite values to prevent flipping colors on login screen
+    $mdThemingProvider.definePalette('mailcow-blue', {
+      '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
+    });
+
     $mdThemingProvider.definePalette('sogo-green', {
       '50': 'E3F2FD',
       '100': 'BBDEFB',
@@ -34,17 +55,38 @@
       'contrastDarkColors': undefined
     });
 
+    $mdThemingProvider.definePalette('default', {
+      '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('sogo-green', {
+      .primaryPalette('mailcow-blue', {
         'default': '700',  // top toolbar
         'hue-1': '500',
         'hue-2': '700',    // sidebar toolbar
         'hue-3': 'A700'
       })
-      .accentPalette('sogo-green', {
+      .accentPalette('mailcow-blue', {
         'default': '800',  // fab buttons
         'hue-1': '50',     // center list toolbar
         'hue-2': '500',
@@ -57,13 +99,13 @@
         'hue-3': '300'
       });
     $mdThemingProvider.theme('default')
-      .primaryPalette('sogo-green', {
+      .primaryPalette('mailcow-blue', {
         'default': '700',  // top toolbar
         'hue-1': '500',
         'hue-2': '700',    // sidebar toolbar
         'hue-3': 'A200'
       })
-      .accentPalette('sogo-green', {
+      .accentPalette('mailcow-blue', {
         'default': '800',  // fab buttons
         'hue-1': '50',     // center list toolbar
         'hue-2': '500',
diff --git a/docker-compose.yml b/docker-compose.yml
index 856efbc41..1f5cbd3aa 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -146,7 +146,7 @@ services:
             - phpfpm
 
     sogo-mailcow:
-      image: mailcow/sogo:1.28
+      image: mailcow/sogo:1.29
       build: ./data/Dockerfiles/sogo
       environment:
         - DBNAME=${DBNAME}