[SOGo] Override theme-default.css to prevent theme switching, delete theme-green until fixed

master
André 2018-07-28 14:26:02 +02:00
parent a117e8358c
commit ff463168d1
5 changed files with 18 additions and 89 deletions

View File

@ -43,7 +43,7 @@ COPY ./bootstrap-sogo.sh /
COPY syslog-ng.conf /etc/syslog-ng/syslog-ng.conf COPY syslog-ng.conf /etc/syslog-ng/syslog-ng.conf
COPY supervisord.conf /etc/supervisor/supervisord.conf COPY supervisord.conf /etc/supervisor/supervisord.conf
COPY theme-blue.js /usr/lib/GNUstep/SOGo/WebServerResources/js/theme-blue.js COPY theme-blue.js /usr/lib/GNUstep/SOGo/WebServerResources/js/theme-blue.js
COPY theme-green.js /usr/lib/GNUstep/SOGo/WebServerResources/js/theme-green.js COPY theme-blue.css /usr/lib/GNUstep/SOGo/WebServerResources/css/theme-default.css
COPY sogo-full.svg /usr/lib/GNUstep/SOGo/WebServerResources/img/sogo-full.svg COPY sogo-full.svg /usr/lib/GNUstep/SOGo/WebServerResources/img/sogo-full.svg
CMD exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf CMD exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf

View File

@ -153,7 +153,4 @@ echo ' </dict>
chown sogo:sogo -R /var/lib/sogo/ chown sogo:sogo -R /var/lib/sogo/
chmod 600 /var/lib/sogo/GNUstep/Defaults/sogod.plist chmod 600 /var/lib/sogo/GNUstep/Defaults/sogod.plist
# Inject md-theme to hopefully fix theme swtiching
sed -i 's/<main class/<main md-theme="mailcow" class/g' /usr/lib/GNUstep/SOGo/Templates/MainUI/SOGoRootPage.wox
exec gosu sogo /usr/sbin/sogod exec gosu sogo /usr/sbin/sogod

File diff suppressed because one or more lines are too long

View File

@ -76,28 +76,6 @@
'contrastDarkColors': undefined 'contrastDarkColors': undefined
}); });
/**
* Define the Alternative theme
*/
$mdThemingProvider.theme('mailcow')
.primaryPalette('mailcow-blue', {
'default': '700', // top toolbar
'hue-1': '500',
'hue-2': '700', // sidebar toolbar
'hue-3': 'A700'
})
.accentPalette('mailcow-blue', {
'default': '800', // fab buttons
'hue-1': '50', // center list toolbar
'hue-2': '500',
'hue-3': 'A700'
})
.backgroundPalette('grey', {
'default': '50', // center list background
'hue-1': '100',
'hue-2': '200',
'hue-3': '300'
});
$mdThemingProvider.theme('default') $mdThemingProvider.theme('default')
.primaryPalette('mailcow-blue', { .primaryPalette('mailcow-blue', {
'default': '700', // top toolbar 'default': '700', // top toolbar
@ -118,7 +96,7 @@
'hue-3': '300' 'hue-3': '300'
}); });
$mdThemingProvider.setDefaultTheme('mailcow'); $mdThemingProvider.setDefaultTheme('default');
$mdThemingProvider.generateThemesOnDemand(false); $mdThemingProvider.generateThemesOnDemand(false);
$mdThemingProvider.alwaysWatchTheme(true); $mdThemingProvider.alwaysWatchTheme(true);
} }

View File

@ -1,62 +0,0 @@
/* -*- Mode: javascript; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
(function() {
'use strict';
angular.module('SOGo.Common')
.config(configure)
/**
* @ngInject
*/
configure.$inject = ['$mdThemingProvider'];
function configure($mdThemingProvider) {
/**
* Define the Alternative theme
*/
$mdThemingProvider.theme('mailcow')
.primaryPalette('green', {
'default': '600', // top toolbar
'hue-1': '200',
'hue-2': '600', // sidebar toolbar
'hue-3': 'A700'
})
.accentPalette('green', {
'default': '600', // fab buttons
'hue-1': '50', // center list toolbar
'hue-2': '400',
'hue-3': 'A700'
})
.backgroundPalette('grey', {
'default': '50', // center list background
'hue-1': '50',
'hue-2': '100',
'hue-3': '100'
});
$mdThemingProvider.theme('default')
.primaryPalette('green', {
'default': '600', // top toolbar
'hue-1': '200',
'hue-2': '600', // sidebar toolbar
'hue-3': 'A700'
})
.accentPalette('green', {
'default': '600', // fab buttons
'hue-1': '50', // center list toolbar
'hue-2': '400',
'hue-3': 'A700'
})
.backgroundPalette('grey', {
'default': '50', // center list background
'hue-1': '50',
'hue-2': '100',
'hue-3': '100'
});
$mdThemingProvider.setDefaultTheme('mailcow');
$mdThemingProvider.generateThemesOnDemand(false);
$mdThemingProvider.alwaysWatchTheme(true);
}
})();