Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[all] fix support for new theme in editors

Browse source
This commit is contained in:
Maxim Kadushkin 2022-07-13 13:02:39 +03:00
parent 18a49b3479
commit 024adfe49c
14 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/common/main/lib/controller/Themes.js
View file

@ -36,6 +36,11 @@ define([
type: 'dark',
source: 'static',
},
'theme-contrast-dark': {
text: locale.txtThemeContrastDark || 'Dark Contrast',
type: 'dark',
source: 'static',
},
}
if ( !!window.currentLoaderTheme ) {
@ -118,6 +123,7 @@ define([
"canvas-page-border",
"canvas-ruler-background",
"canvas-ruler-border",
"canvas-ruler-margins-background",
"canvas-ruler-mark",
"canvas-ruler-handle-border",

10
apps/common/main/lib/util/htmlutils.js
View file

@ -93,10 +93,12 @@ if ( !!ui_theme_name ) {
}
if ( checkLocalStorage ) {
var content_theme = localStorage.getItem("content-theme");
if ( content_theme == 'dark' ) {
var current_theme = localStorage.getItem("ui-theme");
if ( !!current_theme && /type":\s*"dark/.test(current_theme) ) {
let current_theme = localStorage.getItem("ui-theme");
if ( !!current_theme && /type":\s*"dark/.test(current_theme) ) {
document.body.classList.add("theme-type-dark");
let content_theme = localStorage.getItem("content-theme");
if ( content_theme == 'dark' ) {
document.body.classList.add("content-theme-dark");
}
}

2
apps/common/main/resources/less/colors-table-dark-contrast.less
View file

@ -1,6 +1,6 @@
:root {
.theme-dark-contrast {
.theme-contrast-dark {
--toolbar-header-document: #1e1e1e;
--toolbar-header-spreadsheet: #1e1e1e;
--toolbar-header-presentation: #1e1e1e;

2
apps/documenteditor/main/index.html
View file

@ -10,7 +10,7 @@
<!-- splash -->
<style type="text/css">
.theme-dark {
.theme-dark, .theme-type-dark {
--toolbar-header-document: #2a2a2a;
--background-toolbar: #404040;
--border-toolbar: #2a2a2a;

1
apps/documenteditor/main/locale/en.json
View file

@ -197,6 +197,7 @@
"Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors",
"Common.UI.Themes.txtThemeClassicLight": "Classic Light",
"Common.UI.Themes.txtThemeDark": "Dark",
"Common.UI.Themes.txtThemeContrastDark": "Dark Contrast",
"Common.UI.Themes.txtThemeLight": "Light",
"Common.UI.Themes.txtThemeSystem": "Same as system",
"Common.UI.Window.cancelButtonText": "Cancel",

1
apps/documenteditor/main/resources/less/app.less
View file

@ -12,6 +12,7 @@
@import "../../../../common/main/resources/less/colors-table.less";
@import "../../../../common/main/resources/less/colors-table-classic.less";
@import "../../../../common/main/resources/less/colors-table-dark.less";
@import "../../../../common/main/resources/less/colors-table-dark-contrast.less";
//
// Bootstrap

2
apps/presentationeditor/main/index.html
View file

@ -9,7 +9,7 @@
<!-- splash -->
<style type="text/css">
.theme-dark {
.theme-dark, .theme-type-dark {
--toolbar-header-presentation: #2a2a2a;
--background-toolbar: #404040;
--border-toolbar: #2a2a2a;

2
apps/presentationeditor/main/index.reporter.html
View file

@ -11,7 +11,7 @@
<!-- splash -->
<style>
.theme-dark {
.theme-dark, .theme-type-dark {
--toolbar-header-presentation: #2a2a2a;
--canvas-background: #666666;
/*--canvas-content-background: #fff;*/

2
apps/presentationeditor/main/index_loader.html
View file

@ -9,7 +9,7 @@
<!-- splash -->
<style type="text/css">
.theme-dark {
.theme-dark, .theme-type-dark {
--romb-start-color: #555;
}
.loadmask {

1
apps/presentationeditor/main/locale/en.json
View file

@ -284,6 +284,7 @@
"Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors",
"Common.UI.Themes.txtThemeClassicLight": "Classic Light",
"Common.UI.Themes.txtThemeDark": "Dark",
"Common.UI.Themes.txtThemeContrastDark": "Dark Contrast",
"Common.UI.Themes.txtThemeLight": "Light",
"Common.UI.Themes.txtThemeSystem": "Same as system",
"Common.UI.Window.cancelButtonText": "Cancel",

1
apps/presentationeditor/main/resources/less/app.less
View file

@ -12,6 +12,7 @@
@import "../../../../common/main/resources/less/colors-table.less";
@import "../../../../common/main/resources/less/colors-table-classic.less";
@import "../../../../common/main/resources/less/colors-table-dark.less";
@import "../../../../common/main/resources/less/colors-table-dark-contrast.less";
//
// Bootstrap

2
apps/spreadsheeteditor/main/index.html
View file

@ -8,7 +8,7 @@
<!-- splash -->
<style type="text/css">
.theme-dark {
.theme-dark, .theme-type-dark {
--toolbar-header-spreadsheet: #2a2a2a;
--background-toolbar: #404040;
--background-normal: #333;

1
apps/spreadsheeteditor/main/locale/en.json
View file

@ -138,6 +138,7 @@
"Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors",
"Common.UI.Themes.txtThemeClassicLight": "Classic Light",
"Common.UI.Themes.txtThemeDark": "Dark",
"Common.UI.Themes.txtThemeContrastDark": "Dark Contrast",
"Common.UI.Themes.txtThemeLight": "Light",
"Common.UI.Themes.txtThemeSystem": "Same as system",
"Common.UI.Window.cancelButtonText": "Cancel",

1
apps/spreadsheeteditor/main/resources/less/app.less
View file

@ -12,6 +12,7 @@
@import "../../../../common/main/resources/less/colors-table.less";
@import "../../../../common/main/resources/less/colors-table-classic.less";
@import "../../../../common/main/resources/less/colors-table-dark.less";
@import "../../../../common/main/resources/less/colors-table-dark-contrast.less";
//
// Bootstrap