Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-06 08:48:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

💄 fix https://github.com/siyuan-note/siyuan/issues/6271

Browse source
This commit is contained in:
Vanessa 2022-10-20 01:12:30 +08:00
parent a70dfc8b20
commit b9abeaf22d
2 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/assets/scss/_block.scss
View file

@ -124,7 +124,7 @@
&:hover:not([disabled]):not(.ft__primary),
&--active {
color: var(--b3-theme-on-background);
background-color: var(--b3-theme-background-light);
background-color: var(--b3-list-icon-hover);
}
&[disabled] {

33
app/src/util/assets.ts
View file

@ -9,21 +9,19 @@ import {exportLayout} from "../layout/util";
import {isMobile} from "./functions";
import {fetchPost} from "./fetch";
const loadIcon = (iconURL: string, data: IAppearance) => {
addScript(iconURL, "iconDefaultScript").then(() => {
if (!["ant", "material"].includes(data.icon)) {
const iconScriptElement = document.getElementById("iconScript");
const iconURL = `/appearance/icons/${data.icon}/icon.js?v=${data.iconVer}`;
if (iconScriptElement) {
if (!iconScriptElement.getAttribute("src").startsWith(iconURL)) {
iconScriptElement.remove();
addScript(iconURL, "iconScript");
}
} else {
const loadThirdIcon = (data: IAppearance) => {
if (!["ant", "material"].includes(data.icon)) {
const iconScriptElement = document.getElementById("iconScript");
const iconURL = `/appearance/icons/${data.icon}/icon.js?v=${data.iconVer}`;
if (iconScriptElement) {
if (!iconScriptElement.getAttribute("src").startsWith(iconURL)) {
iconScriptElement.remove();
addScript(iconURL, "iconScript");
}
} else {
addScript(iconURL, "iconScript");
}
});
}
};
export const loadAssets = (data: IAppearance) => {
@ -78,10 +76,17 @@ export const loadAssets = (data: IAppearance) => {
if (iconDefaultScriptElement) {
if (!iconDefaultScriptElement.getAttribute("src").startsWith(iconURL)) {
iconDefaultScriptElement.remove();
loadIcon(iconURL, data);
addScript(iconURL, "iconDefaultScript").then(() => {
loadThirdIcon(data);
});
} else {
loadThirdIcon(data);
}
} else {
loadIcon(iconURL, data);
addScript(iconURL, "iconDefaultScript").then(() => {
loadThirdIcon(data);
});
}
};