extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some fixes for darkmode:

Browse Source 
- Fix darkmode not switched in popups
- Fix a quick white page shown before switching to darkmode when it's set to 'auto'
This commit is contained in:
Hadi Nategh 2021-01-27 12:26:37 +01:00
parent e980f3a851
commit b9570b9b60
5 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/js/jsapi/app_base.js
View File

@ -177,12 +177,15 @@ var AppJS = (function(){ "use strict"; return Class.extend(
} }
this.et2 = et2.widgetContainer; this.et2 = et2.widgetContainer;
this._fix_iFrameScrolling(); this._fix_iFrameScrolling();
if (this.egw && this.egw.is_popup()) this._set_Window_title(); if (this.egw && this.egw.is_popup())
{
this._set_Window_title();
// apply theme mode
jQuery('html').attr('data-darkmode', egw.getSessionItem('api', 'darkmode') == '0'?'0':'1');
}
// Highlights the favorite based on initial list state // Highlights the favorite based on initial list state
this.highlight_favorite(); this.highlight_favorite();
}, },
/** /**

7
api/js/jsapi/egw_app.js
View File

@ -113,12 +113,13 @@ var EgwApp = /** @class */ (function () {
} }
this.et2 = et2.widgetContainer; this.et2 = et2.widgetContainer;
this._fix_iFrameScrolling(); this._fix_iFrameScrolling();
if (this.egw && this.egw.is_popup()) if (this.egw && this.egw.is_popup()) {
this._set_Window_title(); this._set_Window_title();
// apply theme mode
jQuery('html').attr('data-darkmode', egw.getSessionItem('api', 'darkmode') == '0' ? '0' : '1');
}
// Highlights the favorite based on initial list state // Highlights the favorite based on initial list state
this.highlight_favorite(); this.highlight_favorite();
// apply theme mode
window.framework._setDarkMode(egw.getSessionItem('api', 'darkmode'));
}; };
/** /**
* Observer method receives update notifications from all applications * Observer method receives update notifications from all applications

9
api/js/jsapi/egw_app.ts
View File

@ -203,12 +203,15 @@ export abstract class EgwApp
} }
this.et2 = et2.widgetContainer; this.et2 = et2.widgetContainer;
this._fix_iFrameScrolling(); this._fix_iFrameScrolling();
if (this.egw && this.egw.is_popup()) this._set_Window_title(); if (this.egw && this.egw.is_popup())
{
this._set_Window_title();
// apply theme mode
jQuery('html').attr('data-darkmode', egw.getSessionItem('api', 'darkmode') == '0'?'0':'1');
}
// Highlights the favorite based on initial list state // Highlights the favorite based on initial list state
this.highlight_favorite(); this.highlight_favorite();
// apply theme mode
window.framework._setDarkMode(egw.getSessionItem('api', 'darkmode'));
} }
/** /**

6
pixelegg/css/pixelegg.css
View File

@ -46,6 +46,12 @@
* @package pixelegg * @package pixelegg
* @version $Id$ * @version $Id$
*/ */
@media (prefers-color-scheme: dark) {
html[data-darkmode='2'] {
background: #000;
filter: invert(1) hue-rotate(180deg);
}
}
/** /**
* DARK THEME * DARK THEME
*/ */

6
pixelegg/less/darkmode.less
View File

@ -10,6 +10,12 @@
* @version $Id$ * @version $Id$
*/ */
@media (prefers-color-scheme: dark) {
html[data-darkmode='2'] {
background: #000;
filter: invert(1) hue-rotate(180deg);
}
}
/** /**
* DARK THEME * DARK THEME
*/ */