diff --git a/app/src/asset/renderAssets.ts b/app/src/asset/renderAssets.ts index f7af1eb2b..df64c598f 100644 --- a/app/src/asset/renderAssets.ts +++ b/app/src/asset/renderAssets.ts @@ -68,7 +68,7 @@ export const genAssetHTML = (type: string, pathString: string, imgName: string, if (!pathString.startsWith("assets/")) { netHTML = ''; } - html = ` ${imgName}${netHTML} `; + html = ` ${imgName}${netHTML} `; } else if (Constants.SIYUAN_ASSETS_VIDEO.includes(type)) { html = `
${Constants.ZWSP}
${Constants.ZWSP}
`; } else { diff --git a/app/src/assets/scss/business/_av.scss b/app/src/assets/scss/business/_av.scss index 4aa8b70ae..2ef44abf4 100644 --- a/app/src/assets/scss/business/_av.scss +++ b/app/src/assets/scss/business/_av.scss @@ -167,7 +167,8 @@ } } - &.protyle-wysiwyg--select { + &.protyle-wysiwyg--select, + &.protyle-wysiwyg--hl { .layout-tab-bar, .av__row--header, .av__row--footer { diff --git a/app/src/assets/scss/business/_card.scss b/app/src/assets/scss/business/_card.scss index b1b170916..aa4bc4cd2 100644 --- a/app/src/assets/scss/business/_card.scss +++ b/app/src/assets/scss/business/_card.scss @@ -4,6 +4,7 @@ box-sizing: border-box; max-height: 100%; background-color: var(--b3-theme-surface); + border-radius: var(--b3-border-radius-b); } &__empty { diff --git a/app/src/assets/scss/business/_config.scss b/app/src/assets/scss/business/_config.scss index 16240ae47..c12c18880 100644 --- a/app/src/assets/scss/business/_config.scss +++ b/app/src/assets/scss/business/_config.scss @@ -1,15 +1,33 @@ .config { + &__tab-wrap { + overflow: hidden; + box-sizing: border-box; + background-color: var(--b3-theme-background); + border-radius: 0 var(--b3-border-radius-b) var(--b3-border-radius-b) 0; + width: 100%; + height: 100%; + padding: 16px 0; + } + &__tab-container { overflow: auto; box-sizing: border-box; - flex: 1; - background-color: var(--b3-theme-background); - border-radius: 0 var(--b3-border-radius-b) var(--b3-border-radius-b) 0; + height: 100%; .b3-label { padding: 16px 0; margin: 0 24px; } + + &--full { + margin-top: -16px; + height: calc(100% + 32px); + } + + &--top { + margin-top: -16px; + height: calc(100% + 16px); + } } &__panel { diff --git a/app/src/assets/scss/component/_typography.scss b/app/src/assets/scss/component/_typography.scss index 007118d0d..91213d04c 100644 --- a/app/src/assets/scss/component/_typography.scss +++ b/app/src/assets/scss/component/_typography.scss @@ -479,13 +479,14 @@ &-icon { font-size: 85%; - line-height: 22px; + line-height: 24px; cursor: pointer; - padding: 0 4px; + padding: 5px; transition: var(--b3-transition); background-color: var(--b3-theme-on-surface); - height: 22px; + height: 24px; color: var(--b3-theme-surface); + box-sizing: border-box; &--only { border-radius: var(--b3-border-radius); @@ -517,7 +518,8 @@ } & > svg { - height: 22px; + height: 14px; + float: left; width: 14px; fill: currentColor; } diff --git a/app/src/assets/scss/protyle/_protyle.scss b/app/src/assets/scss/protyle/_protyle.scss index 180324fb4..defb6895e 100644 --- a/app/src/assets/scss/protyle/_protyle.scss +++ b/app/src/assets/scss/protyle/_protyle.scss @@ -258,7 +258,7 @@ } &:not(.fn__none) + .protyle-icons { - margin-top: 57px; + margin-top: 56px; } } diff --git a/app/src/card/viewCards.ts b/app/src/card/viewCards.ts index bfd824063..36ee206b8 100644 --- a/app/src/card/viewCards.ts +++ b/app/src/card/viewCards.ts @@ -39,7 +39,7 @@ export const viewCards = (app: App, deckID: string, title: string, deckType: "Tr -
+
${window.siyuan.languages.emptyContent}
`, diff --git a/app/src/config/index.ts b/app/src/config/index.ts index 91e68ac52..448f9d345 100644 --- a/app/src/config/index.ts +++ b/app/src/config/index.ts @@ -110,19 +110,21 @@ export const openSetting = (app: App) => {
  • ${window.siyuan.languages.cloud}
  • ${window.siyuan.languages.about}
    • -
    ${editor.genHTML()}
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    +
    +
    ${editor.genHTML()}
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    `, width: "90vw", height: "90vh", diff --git a/app/src/protyle/ui/initUI.ts b/app/src/protyle/ui/initUI.ts index 45a7acf95..42f88c0c1 100644 --- a/app/src/protyle/ui/initUI.ts +++ b/app/src/protyle/ui/initUI.ts @@ -141,12 +141,11 @@ export const setPadding = (protyle: IProtyle) => { min24 = 96; } } - if (protyle.options.render.background && protyle.options.render.title) { + if (protyle.options.render.background) { protyle.background.element.lastElementChild.setAttribute("style", `left:${min16}px`); - protyle.title.element.style.margin = `16px ${min16}px 0 ${min24}px`; - } else if (protyle.options.render.background && !protyle.options.render.title) { - protyle.background.element.lastElementChild.setAttribute("style", `left:${min16}px`); - } else if (!protyle.options.render.background && protyle.options.render.title) { + protyle.background.element.querySelector(".protyle-background__img .protyle-icons").setAttribute("style", `right:${min16}px`); + } + if (protyle.options.render.title) { protyle.title.element.style.margin = `16px ${min16}px 0 ${min24}px`; } let bottomHeight = "16px"; diff --git a/app/src/protyle/wysiwyg/transaction.ts b/app/src/protyle/wysiwyg/transaction.ts index 5fa8eb585..cec997ff7 100644 --- a/app/src/protyle/wysiwyg/transaction.ts +++ b/app/src/protyle/wysiwyg/transaction.ts @@ -452,13 +452,13 @@ export const onTransaction = (protyle: IProtyle, operation: IOperation, focus: b if (refElement) { nodeAttrHTML += refElement.outerHTML; } - if (data.new["custom-riff-decks"]) { + if (data.new["custom-riff-decks"] && data.new["custom-riff-decks"] !== data.old["custom-riff-decks"]) { protyle.title.element.style.animation = "addCard 450ms linear"; protyle.title.element.setAttribute("custom-riff-decks", data.new["custom-riff-decks"]); setTimeout(() => { protyle.title.element.style.animation = ""; }, 450); - } else { + } else if (!data.new["custom-riff-decks"]) { protyle.title.element.removeAttribute("custom-riff-decks"); } protyle.title.element.querySelector(".protyle-attr").innerHTML = nodeAttrHTML; @@ -487,12 +487,12 @@ export const onTransaction = (protyle: IProtyle, operation: IOperation, focus: b Object.keys(data.old).forEach(key => { item.removeAttribute(key); }); - if (data.new.style && data.new["custom-riff-decks"]) { + if (data.new.style && data.new["custom-riff-decks"] && data.new["custom-riff-decks"] !== data.old["custom-riff-decks"]) { data.new.style += ";animation:addCard 450ms linear"; } Object.keys(data.new).forEach(key => { item.setAttribute(key, data.new[key]); - if (key === "custom-riff-decks") { + if (key === "custom-riff-decks" && data.new["custom-riff-decks"] !== data.old["custom-riff-decks"]) { item.style.animation = "addCard 450ms linear"; setTimeout(() => { item.style.animation = "";