diff --git a/app/src/assets/scss/_block.scss b/app/src/assets/scss/_block.scss index f1e38dcd3..e8f29b799 100644 --- a/app/src/assets/scss/_block.scss +++ b/app/src/assets/scss/_block.scss @@ -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] { diff --git a/app/src/util/assets.ts b/app/src/util/assets.ts index 80a9698ec..d38aad24b 100644 --- a/app/src/util/assets.ts +++ b/app/src/util/assets.ts @@ -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); + }); } };