From 26e6b238873a2a4134918a909c19235228a63dd4 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Thu, 22 Dec 2022 22:18:07 +0800 Subject: [PATCH] :iphone: https://github.com/siyuan-note/siyuan/issues/6710 --- app/src/assets/scss/_dialog.scss | 8 ++++++++ app/src/assets/scss/_wysiwyg.scss | 2 +- app/src/card/makeCard.ts | 2 +- app/src/card/openCard.ts | 13 ++++++------- app/src/mobile/util/menu.ts | 9 +++++++++ 5 files changed, 25 insertions(+), 9 deletions(-) diff --git a/app/src/assets/scss/_dialog.scss b/app/src/assets/scss/_dialog.scss index 042910b05..756181d1b 100644 --- a/app/src/assets/scss/_dialog.scss +++ b/app/src/assets/scss/_dialog.scss @@ -121,9 +121,17 @@ font-size: 16px; } + &__cardaction .b3-button { + margin-top: 8px; + } + &__cardblock { .protyle-wysiwyg { padding: 16px; + + [data-node-id][custom-riff-decks] { + box-shadow: none; + } } &--show span[data-type~=mark] { diff --git a/app/src/assets/scss/_wysiwyg.scss b/app/src/assets/scss/_wysiwyg.scss index 82cfceb9e..01df75a47 100644 --- a/app/src/assets/scss/_wysiwyg.scss +++ b/app/src/assets/scss/_wysiwyg.scss @@ -16,7 +16,7 @@ position: relative; &[custom-riff-decks] { - box-shadow: 2px 0px 0px var(--b3-protyle-inline-mark-background); + box-shadow: 3px 0px 0px -1px var(--b3-protyle-inline-mark-background); } [spellcheck="false"] { diff --git a/app/src/card/makeCard.ts b/app/src/card/makeCard.ts index 6dfc8804f..6a82b755c 100644 --- a/app/src/card/makeCard.ts +++ b/app/src/card/makeCard.ts @@ -5,7 +5,7 @@ import {isMobile} from "../util/functions"; import {hideMessage, showMessage} from "../dialog/message"; const genCardItem = (item: { id: string, name: string }) => { - return `
  • + return `
  • ${item.name} diff --git a/app/src/card/openCard.ts b/app/src/card/openCard.ts index d6ff8d39f..689094a55 100644 --- a/app/src/card/openCard.ts +++ b/app/src/card/openCard.ts @@ -29,16 +29,15 @@ export const openCard = () => {
    ${window.siyuan.languages.noDueCard}
    -
    -
    +
    - + - + - + - +
    `, @@ -101,7 +100,7 @@ export const openCard = () => { type = "2" } else if (event.detail === "e") { type = "3" - }else if (event.detail === "s") { + } else if (event.detail === "s") { type = "-1" } } diff --git a/app/src/mobile/util/menu.ts b/app/src/mobile/util/menu.ts index fc96440bd..0c834feef 100644 --- a/app/src/mobile/util/menu.ts +++ b/app/src/mobile/util/menu.ts @@ -14,6 +14,7 @@ import {confirmDialog} from "../../dialog/confirmDialog"; import {openHistory} from "../../history/history"; import {Dialog} from "../../dialog"; import {syncGuide} from "../../sync/syncGuide"; +import {openCard} from "../../card/openCard"; const showAccountInfo = (modelElement: HTMLElement, modelMainElement: Element) => { closePanel(); @@ -124,6 +125,9 @@ export const popMenu = () => { + @@ -416,6 +420,11 @@ ${accountHTML} event.preventDefault(); event.stopPropagation(); break; + } else if (target.id === "menuCard") { + openCard(); + event.preventDefault(); + event.stopPropagation(); + break; } else if (target.id === "menuNewNotebook") { newNotebook(); event.preventDefault();