pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request '[winxp] fix bug 75199' (#313) from fix/fix-bugs into release/v9.0.0

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/desktop-apps/pulls/313
This commit is contained in:
Oleg Korshul
2025-06-12 20:13:50 +00:00
parent b76963afc0 8f07e6b30b
commit 70a33e6811
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/loginpage/src/document-creation-grid.js
View File

@ -72,13 +72,15 @@ window.DocumentCreationGrid = function (config = {}) {
<div class="document-creation-grid">
${documentTypes.map(doc => `
<div class="document-creation-item" data-id="${doc.id}" onclick="window.DocumentCreationGrid.handleDocumentSelect('${doc.id}', this)">
<div class="format-label" style="--format-bg-start: ${doc.formatLabel.gradientColorStart}; --format-bg-end: ${doc.formatLabel.gradientColorEnd}">
<div class="format-label" style="--format-bg-start: ${doc.formatLabel.gradientColorStart};
--format-bg-end: ${doc.formatLabel.gradientColorEnd};
--format-bg-winxp: ${doc.formatLabel.bgColorWinXP}">
<span>${doc.formatLabel.value}</span>
</div>
${doc.icon.startsWith('#') ? `<svg class="icon"><use xlink:href="${doc.icon}"></use></svg>` : `<i class="icon ${doc.icon}"></i>`}
<div class="title">
${doc.title}
</div>

4
common/loginpage/src/panelrecent.js
View File

@ -544,6 +544,7 @@
value: 'DOCX',
gradientColorStart: '#4298C5',
gradientColorEnd: '#2D84B2',
bgColorWinXP: '#287ca9',
},
icon: '#docx-big',
},
@ -554,6 +555,7 @@
value: 'XLSX',
gradientColorStart: '#5BB514',
gradientColorEnd: '#318C2B',
bgColorWinXP: '#3aa133',
},
icon: '#xlsx-big',
},
@ -564,6 +566,7 @@
value: 'PPTX',
gradientColorStart: '#F4893A',
gradientColorEnd: '#DE7341',
bgColorWinXP: '#f36700',
},
icon: '#pptx-big',
},
@ -574,6 +577,7 @@
value: 'PDF',
gradientColorStart: '#F36653',
gradientColorEnd: '#D2402D',
bgColorWinXP: '#e54d39',
},
icon: '#pdf-big',
}

6
common/loginpage/src/panelsettings.js
View File

@ -335,8 +335,8 @@
const theme_id = uitheme.relevant_theme_id();
if ( !$("body").hasClass(theme_id) ) {
if ( !type && themes_map[id] )
type = themes_map[id].type;
if ( !type && themes_map[theme_id] )
type = themes_map[theme_id].type;
const _type = (type == 'dark' || /theme-(?:[a-z]+-)?dark(?:-[a-z]*)?/.test(theme_id)) ? 'theme-type-dark' : 'theme-type-light';
const _cls = document.body.className.replace(/theme-[\w-]+/gi,'').trim();
@ -632,7 +632,7 @@
}
}
}
_apply_theme(!!appSettings.uitheme ? appSettings.uitheme : 'theme-classic-light');
_apply_theme(!!appSettings.uitheme ? appSettings.uitheme : THEME_ID_DEFAULT_LIGHT);
if ( appSettings.editorwindowmode !== undefined ) {
($optsLaunchMode = ($('#opts-launch-mode', $panel).show().find('select')))