pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-02-10 18:05:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

[DE] fix modified icons using

Browse Source
This commit is contained in:
maxkadushkin
2025-03-19 11:59:21 +03:00
parent 5dc7838d0a
commit 307e732fa2
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apps/common/main/lib/controller/Themes.js
View File

@ -82,7 +82,10 @@ define([
text: locale.txtThemeWhite || 'White',
type: 'light',
source: 'static',
icons: './resources/img/v2',
icons: {
basepath: './resources/img/v2',
cls: 'next-mod',
}
},
}
@ -456,9 +459,13 @@ define([
document.body.className = document.body.className.replace(/theme-[\w-]+\s?/gi, '').trim();
document.body.classList.add(theme_id, 'theme-type-' + themes_map[theme_id].type);
if ( !!themes_map[theme_id].icons ) {
const base_url = themes_map[theme_id].icons;
if ( !!themes_map[theme_id].icons && themes_map[theme_id].icons.basepath ) {
const base_url = themes_map[theme_id].icons.basepath;
window.uitheme.apply_icons_from_url(theme_id, base_url);
if ( themes_map[theme_id].icons.cls ) {
document.body.classList.add('theme-icons-cls-' + themes_map[theme_id].icons.cls);
}
}
if ( this.api.asc_setContentDarkMode )
@ -538,8 +545,12 @@ define([
document.body.classList.add('theme-type-' + obj.type);
if (themes_map[theme_id].icons) {
if (!document.querySelector('style#' + theme_id)) {
window.uitheme.apply_icons_from_url(theme_id, themes_map[theme_id].icons);
if (themes_map[theme_id].icons.basepath && !document.querySelector('style#' + theme_id)) {
window.uitheme.apply_icons_from_url(theme_id, themes_map[theme_id].icons.basepath);
}
if ( themes_map[theme_id].icons.cls ) {
document.body.classList.add('theme-icons-cls-' + themes_map[theme_id].icons.cls);
}
}

2
apps/common/main/resources/img/toolbar/1x/.css.handlebars
View File

@ -17,7 +17,7 @@
}
{{/spritesheet}}
{{#sprites}}
{{#parselang name}}.{{name}}{{/parselang}} {
{{#extracls}}{{/extracls}}{{#parselang name}}.{{name}}{{/parselang}} {
@btn-icon-offset: 0;
background-position: @btn-icon-offset {{px.offset_y}};

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

@ -145,6 +145,7 @@
@import "thumbnails.less";
@import "sprites/iconssmall@1x";
@import "sprites/iconssmall@1x.v2";
@import "sprites/iconsbig@1x";
@import "sprites/iconshuge@1x";
@import "sprites/iconssmall@2x";