Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-22 17:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

📱 https://github.com/siyuan-note/siyuan/issues/6710

Browse source
This commit is contained in:
Vanessa 2022-12-22 22:18:07 +08:00
parent 358bf75238
commit 26e6b23887
5 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/assets/scss/_dialog.scss
View file

@ -121,9 +121,17 @@
font-size: 16px; font-size: 16px;
} }
&__cardaction .b3-button {
margin-top: 8px;
}
&__cardblock { &__cardblock {
.protyle-wysiwyg { .protyle-wysiwyg {
padding: 16px; padding: 16px;
[data-node-id][custom-riff-decks] {
box-shadow: none;
}
} }
&--show span[data-type~=mark] { &--show span[data-type~=mark] {

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

@ -16,7 +16,7 @@
position: relative; position: relative;
&[custom-riff-decks] { &[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"] { [spellcheck="false"] {

2
app/src/card/makeCard.ts
View file

@ -5,7 +5,7 @@ import {isMobile} from "../util/functions";
import {hideMessage, showMessage} from "../dialog/message"; import {hideMessage, showMessage} from "../dialog/message";
const genCardItem = (item: { id: string, name: string }) => { const genCardItem = (item: { id: string, name: string }) => {
return `<li style="margin: 0 !important;" data-id="${item.id}" class="b3-list-item b3-list-item--hide-action"> return `<li style="margin: 0 !important;" data-id="${item.id}" class="b3-list-item${isMobile() ? "" : " b3-list-item--hide-action"}">
<span class="b3-list-item__text">${item.name}</span> <span class="b3-list-item__text">${item.name}</span>
<span data-type="add" class="b3-list-item__action b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.addDeck}"> <span data-type="add" class="b3-list-item__action b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.addDeck}">
<svg><use xlink:href="#iconAdd"></use></svg> <svg><use xlink:href="#iconAdd"></use></svg>

11
app/src/card/openCard.ts
View file

@ -29,16 +29,15 @@ export const openCard = () => {
<div class="fn__hr"><input style="opacity: 0;height: 1px;box-sizing: border-box"></div> <div class="fn__hr"><input style="opacity: 0;height: 1px;box-sizing: border-box"></div>
<div class="b3-dialog__cardblock b3-dialog__cardblock--show fn__flex-1${blocks.length === 0 ? " fn__none" : ""}" data-type="render"></div> <div class="b3-dialog__cardblock b3-dialog__cardblock--show fn__flex-1${blocks.length === 0 ? " fn__none" : ""}" data-type="render"></div>
<div class="b3-dialog__cardempty${blocks.length === 0 ? "" : " fn__none"}" data-type="empty">${window.siyuan.languages.noDueCard}</div> <div class="b3-dialog__cardempty${blocks.length === 0 ? "" : " fn__none"}" data-type="empty">${window.siyuan.languages.noDueCard}</div>
<div class="fn__hr"></div> <div class="fn__flex b3-dialog__cardaction${blocks.length === 0 ? " fn__none" : ""}" style="flex-wrap: wrap" data-type="action">
<div class="fn__flex${blocks.length === 0 ? " fn__none" : ""}" data-type="action">
<button data-type="-1" class="b3-button">Show (S)</button> <button data-type="-1" class="b3-button">Show (S)</button>
<span class="fn__flex-1"></span> <span class="${isMobile() ? "fn__space" : "fn__flex-1"}"></span>
<button data-type="0" class="b3-button">Again (A)</button> <button data-type="0" class="b3-button">Again (A)</button>
<span class="fn__flex-1"></span> <span class="${isMobile() ? "fn__space" : "fn__flex-1"}"></span>
<button data-type="1" class="b3-button">Hard (H)</button> <button data-type="1" class="b3-button">Hard (H)</button>
<span class="fn__flex-1"></span> <span class="${isMobile() ? "fn__space" : "fn__flex-1"}"></span>
<button data-type="2" class="b3-button">Good (G)</button> <button data-type="2" class="b3-button">Good (G)</button>
<span class="fn__flex-1"></span> <span class="${isMobile() ? "fn__space" : "fn__flex-1"}"></span>
<button data-type="3" class="b3-button">Easy (E)</button> <button data-type="3" class="b3-button">Easy (E)</button>
</div> </div>
</div>`, </div>`,

9
app/src/mobile/util/menu.ts
View file

@ -14,6 +14,7 @@ import {confirmDialog} from "../../dialog/confirmDialog";
import {openHistory} from "../../history/history"; import {openHistory} from "../../history/history";
import {Dialog} from "../../dialog"; import {Dialog} from "../../dialog";
import {syncGuide} from "../../sync/syncGuide"; import {syncGuide} from "../../sync/syncGuide";
import {openCard} from "../../card/openCard";
const showAccountInfo = (modelElement: HTMLElement, modelMainElement: Element) => { const showAccountInfo = (modelElement: HTMLElement, modelMainElement: Element) => {
closePanel(); closePanel();
@ -124,6 +125,9 @@ export const popMenu = () => {
<div id="menuNewDaily" class="b3-list-item b3-list-item--big"> <div id="menuNewDaily" class="b3-list-item b3-list-item--big">
<svg class="b3-list-item__graphic"><use xlink:href="#iconCalendar"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.dailyNote}</span> <svg class="b3-list-item__graphic"><use xlink:href="#iconCalendar"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.dailyNote}</span>
</div> </div>
<div id="menuCard" class="b3-list-item b3-list-item--big">
<svg class="b3-list-item__graphic"><use xlink:href="#iconRiffCard"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.riffCard}</span>
</div>
<div class="b3-list-item b3-list-item--big" id="menuNewNotebook"> <div class="b3-list-item b3-list-item--big" id="menuNewNotebook">
<svg class="b3-list-item__graphic"><use xlink:href="#iconFilesRoot"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.newNotebook}</span> <svg class="b3-list-item__graphic"><use xlink:href="#iconFilesRoot"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.newNotebook}</span>
</div> </div>
@ -416,6 +420,11 @@ ${accountHTML}
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
break; break;
} else if (target.id === "menuCard") {
openCard();
event.preventDefault();
event.stopPropagation();
break;
} else if (target.id === "menuNewNotebook") { } else if (target.id === "menuNewNotebook") {
newNotebook(); newNotebook();
event.preventDefault(); event.preventDefault();