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

Merge remote-tracking branch 'origin/dev' into dev

Browse source 
# Conflicts:
#	app/appearance/langs/en_US.json
#	app/appearance/langs/es_ES.json
#	app/appearance/langs/fr_FR.json
#	app/appearance/langs/zh_CHT.json
#	app/appearance/langs/zh_CN.json
This commit is contained in:
Vanessa 2023-02-24 15:26:30 +08:00
commit cdae86d50b
21 changed files with 144 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/assets/scss/business/_card.scss
View file

@ -24,7 +24,7 @@
width: 90%;
& > div {
font-size: 46px;
font-size: 32px;
display: block;
line-height: 46px;
margin-bottom: 4px;

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

@ -54,35 +54,35 @@ export const openCardByData = (cardsData: ICard[], html = "") => {
${window.siyuan.languages.noDueCard}
</div>
<div class="fn__flex card__action${blocks.length === 0 ? " fn__none" : ""}">
<button data-type="-1" class="b3-button fn__flex-1">Show (S)</button>
<button data-type="-1" class="b3-button fn__flex-1">${window.siyuan.languages.cardShowAnswer} (S)</button>
</div>
<div class="fn__flex card__action fn__none">
<div>
<span></span>
<button data-type="0" aria-label="1 / j" class="b3-button b3-button--error b3-tooltips__s b3-tooltips">
<div>❌</div>
Again
${window.siyuan.languages.cardRatingAgain} (1)
</button>
</div>
<div>
<span></span>
<button data-type="1" aria-label="2 / k" class="b3-button b3-button--warning b3-tooltips__s b3-tooltips">
<div>😬</div>
Hard
${window.siyuan.languages.cardRatingHard} (2)
</button>
</div>
<div>
<span></span>
<button data-type="2" aria-label="3 / l" class="b3-button b3-button--info b3-tooltips__s b3-tooltips">
<div>😊</div>
Good
${window.siyuan.languages.cardRatingGood} (3)
</button>
</div>
<div>
<span></span>
<button data-type="3" aria-label="4 / ;" class="b3-button b3-button--success b3-tooltips__s b3-tooltips">
<div>🌈</div>
Easy
${window.siyuan.languages.cardRatingEasy} (4)
</button>
</div>
</div>

2
app/src/mobile/util/initFramework.ts
View file

@ -128,7 +128,7 @@ export const initFramework = () => {
closePanel();
});
initEditorName();
if (window.siyuan.config.newbie) {
if (window.siyuan.config.openHelp) {
mountHelp();
}
const transactionTipElement = document.getElementById("transactionTip");

2
app/src/types/index.d.ts vendored
View file

@ -413,7 +413,7 @@ declare interface IConfig {
api: {
token: string
}
newbie: boolean
openHelp: boolean
system: {
networkProxy: {
host: string

2
app/src/util/onGetConfig.ts
View file

@ -176,7 +176,7 @@ export const onGetConfig = (isStart: boolean) => {
resizeDrag();
}, 200);
});
if (window.siyuan.config.newbie) {
if (window.siyuan.config.openHelp) {
mountHelp();
}
addGA();