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

🎨 https://github.com/siyuan-note/siyuan/issues/10142

Browse source
This commit is contained in:
Vanessa 2024-01-19 23:59:34 +08:00
parent b1e792d025
commit 2f6d2cb28a
11 changed files with 25 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/src/assets/scss/business/_block.scss
View file

@ -107,16 +107,17 @@
} }
&__logo { &__logo {
svg {
height: 16px;
width: 16px;
padding: 4px;
flex-shrink: 0;
}
white-space: nowrap; white-space: nowrap;
margin-right: 8px; margin-right: 8px;
display: flex; display: flex;
align-items: center; align-items: center;
} }
&__logoicon {
margin-right: 4px;
height: 16px;
width: 16px;
padding: 4px;
flex-shrink: 0;
}
} }

8
app/src/assets/scss/business/_custom.scss
View file

@ -23,10 +23,6 @@
transition: var(--b3-transition); transition: var(--b3-transition);
cursor: pointer; cursor: pointer;
svg {
margin-right: 4px;
}
&:hover { &:hover {
opacity: 1; opacity: 1;
} }
@ -42,10 +38,6 @@
width: 160px; width: 160px;
color: var(--b3-theme-on-surface); color: var(--b3-theme-on-surface);
svg {
margin-right: 4px;
}
span { span {
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;

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

@ -45,7 +45,7 @@ export const genCardHTML = (options: {
/// #else /// #else
iconsHTML = `<div class="block__icons"> iconsHTML = `<div class="block__icons">
${options.isTab ? '<div class="fn__flex-1"></div>' : `<div class="block__logo"> ${options.isTab ? '<div class="fn__flex-1"></div>' : `<div class="block__logo">
<svg><use xlink:href="#iconRiffCard"></use></svg>${window.siyuan.languages.riffCard} <svg class="block__logoicon"><use xlink:href="#iconRiffCard"></use></svg>${window.siyuan.languages.riffCard}
</div>`} </div>`}
<span class="fn__flex-1 resize__move" style="min-height: 100%"></span> <span class="fn__flex-1 resize__move" style="min-height: 100%"></span>
<div data-type="count" class="ft__on-surface ft__smaller fn__flex-center${options.cardsData.cards.length === 0 ? " fn__none" : " fn__flex"}">${genCardCount(options.cardsData.unreviewedNewCardCount, options.cardsData.unreviewedOldCardCount)}</span></div> <div data-type="count" class="ft__on-surface ft__smaller fn__flex-center${options.cardsData.cards.length === 0 ? " fn__none" : " fn__flex"}">${genCardCount(options.cardsData.unreviewedNewCardCount, options.cardsData.unreviewedOldCardCount)}</span></div>

6
app/src/layout/dock/Backlink.ts
View file

@ -81,8 +81,7 @@ export class Backlink extends Model {
this.element.classList.add("fn__flex-column", "file-tree", "sy__backlink"); this.element.classList.add("fn__flex-column", "file-tree", "sy__backlink");
this.element.innerHTML = `<div class="block__icons"> this.element.innerHTML = `<div class="block__icons">
<div class="block__logo"> <div class="block__logo">
<svg><use xlink:href="#iconLink"></use></svg> <svg class="block__logoicon"><use xlink:href="#iconLink"></use></svg>${window.siyuan.languages.backlinks}
${window.siyuan.languages.backlinks}
</div> </div>
<span class="counter listCount" style="margin-left: 0"></span> <span class="counter listCount" style="margin-left: 0"></span>
<span class="fn__flex-1"></span> <span class="fn__flex-1"></span>
@ -107,8 +106,7 @@ export class Backlink extends Model {
<div class="backlinkList fn__flex-1"></div> <div class="backlinkList fn__flex-1"></div>
<div class="block__icons"> <div class="block__icons">
<div class="block__logo"> <div class="block__logo">
<svg><use xlink:href="#iconLink"></use></svg> <svg class="block__logoicon"><use xlink:href="#iconLink"></use></svg>${window.siyuan.languages.mentions}
${window.siyuan.languages.mentions}
</div> </div>
<span class="counter listMCount" style="margin-left: 0;"></span> <span class="counter listMCount" style="margin-left: 0;"></span>
<span class="fn__flex-1"></span> <span class="fn__flex-1"></span>

3
app/src/layout/dock/Bookmark.ts
View file

@ -56,8 +56,7 @@ export class Bookmark extends Model {
this.element.classList.add("fn__flex-column", "file-tree", "sy__bookmark"); this.element.classList.add("fn__flex-column", "file-tree", "sy__bookmark");
this.element.innerHTML = `<div class="block__icons"> this.element.innerHTML = `<div class="block__icons">
<div class="block__logo"> <div class="block__logo">
<svg><use xlink:href="#iconBookmark"></use></svg> <svg class="block__logoicon"><use xlink:href="#iconBookmark"></use></svg>${window.siyuan.languages.bookmark}
${window.siyuan.languages.bookmark}
</div> </div>
<span class="fn__flex-1"></span> <span class="fn__flex-1"></span>
<span class="fn__space"></span> <span class="fn__space"></span>

3
app/src/layout/dock/Files.ts
View file

@ -86,8 +86,7 @@ export class Files extends Model {
options.tab.panelElement.classList.add("fn__flex-column", "file-tree", "sy__file"); options.tab.panelElement.classList.add("fn__flex-column", "file-tree", "sy__file");
options.tab.panelElement.innerHTML = `<div class="block__icons"> options.tab.panelElement.innerHTML = `<div class="block__icons">
<div class="block__logo"> <div class="block__logo">
<svg><use xlink:href="#iconFiles"></use></svg> <svg class="block__logoicon"><use xlink:href="#iconFiles"></use></svg>${window.siyuan.languages.fileTree}
${window.siyuan.languages.fileTree}
</div> </div>
<span class="fn__flex-1 fn__space"></span> <span class="fn__flex-1 fn__space"></span>
<span data-type="focus" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.selectOpen1} ${updateHotkeyTip(window.siyuan.config.keymap.general.selectOpen1.custom)}"><svg><use xlink:href='#iconFocus'></use></svg></span> <span data-type="focus" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.selectOpen1} ${updateHotkeyTip(window.siyuan.config.keymap.general.selectOpen1.custom)}"><svg><use xlink:href='#iconFocus'></use></svg></span>

3
app/src/layout/dock/Graph.ts
View file

@ -258,8 +258,7 @@ export class Graph extends Model {
this.element.innerHTML = ` this.element.innerHTML = `
<div class="block__icons"> <div class="block__icons">
<div class="block__logo"> <div class="block__logo">
<svg><use xlink:href="#icon${this.type === "global" ? "GlobalGraph" : "Graph"}"></use></svg> <svg class="block__logoicon"><use xlink:href="#icon${this.type === "global" ? "GlobalGraph" : "Graph"}"></use></svg>${this.type === "global" ? window.siyuan.languages.globalGraph : window.siyuan.languages.graphView}
${this.type === "global" ? window.siyuan.languages.globalGraph : window.siyuan.languages.graphView}
</div> </div>
<span class="fn__flex-1"></span> <span class="fn__flex-1"></span>
<span class="fn__space"></span> <span class="fn__space"></span>

5
app/src/layout/dock/Inbox.ts
View file

@ -55,8 +55,7 @@ export class Inbox extends Model {
this.element.classList.add("fn__flex-column", "file-tree", "sy__inbox"); this.element.classList.add("fn__flex-column", "file-tree", "sy__inbox");
this.element.innerHTML = `<div class="block__icons"> this.element.innerHTML = `<div class="block__icons">
<div class="block__logo"> <div class="block__logo">
<svg><use xlink:href="#iconInbox"></use></svg> <svg class="block__logoicon"><use xlink:href="#iconInbox"></use></svg>${window.siyuan.languages.inbox}&nbsp;
${window.siyuan.languages.inbox}&nbsp;
<span class="inboxSelectCount"></span> <span class="inboxSelectCount"></span>
</div> </div>
<span class="fn__flex-1"></span> <span class="fn__flex-1"></span>
@ -210,7 +209,7 @@ ${data.shorthandContent}
} }
return `<div class="block__icons"> return `<div class="block__icons">
<div class="block__logo fn__pointer fn__flex-1" data-type="back"> <div class="block__logo fn__pointer fn__flex-1" data-type="back">
<svg><use xlink:href="#iconLeft"></use></svg><span class="ft__breakword">${data.shorthandTitle}</span> <svg class="block__logoicon"><use xlink:href="#iconLeft"></use></svg><span class="ft__breakword">${data.shorthandTitle}</span>
</div> </div>
${linkHTML} ${linkHTML}
</div> </div>

3
app/src/layout/dock/Outline.ts
View file

@ -84,8 +84,7 @@ export class Outline extends Model {
options.tab.panelElement.classList.add("fn__flex-column", "file-tree", "sy__outline"); options.tab.panelElement.classList.add("fn__flex-column", "file-tree", "sy__outline");
options.tab.panelElement.innerHTML = `<div class="block__icons"> options.tab.panelElement.innerHTML = `<div class="block__icons">
<div class="block__logo"> <div class="block__logo">
<svg><use xlink:href="#iconAlignCenter"></use></svg> <svg class="block__logoicon"><use xlink:href="#iconAlignCenter"></use></svg>${window.siyuan.languages.outline}
${window.siyuan.languages.outline}
</div> </div>
<span class="fn__flex-1 fn__space"></span> <span class="fn__flex-1 fn__space"></span>
<span data-type="expand" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.stickOpen} ${updateHotkeyTip(window.siyuan.config.keymap.editor.general.expand.custom)}"> <span data-type="expand" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.stickOpen} ${updateHotkeyTip(window.siyuan.config.keymap.editor.general.expand.custom)}">

3
app/src/layout/dock/Tag.ts
View file

@ -53,8 +53,7 @@ export class Tag extends Model {
this.element.innerHTML = `<div class="block__icons"> this.element.innerHTML = `<div class="block__icons">
<div class="block__logo"> <div class="block__logo">
<svg><use xlink:href="#iconTags"></use></svg> <svg class="block__logoicon"><use xlink:href="#iconTags"></use></svg>${window.siyuan.languages.tag}
${window.siyuan.languages.tag}
</div> </div>
<span class="fn__flex-1"></span> <span class="fn__flex-1"></span>
<span class="fn__space"></span> <span class="fn__space"></span>

10
app/src/protyle/render/av/blockAttr.ts
View file

@ -4,6 +4,7 @@ import {escapeAttr} from "../../../util/escape";
import * as dayjs from "dayjs"; import * as dayjs from "dayjs";
import {popTextCell} from "./cell"; import {popTextCell} from "./cell";
import {hasClosestBlock} from "../../util/hasClosest"; import {hasClosestBlock} from "../../util/hasClosest";
import {unicode2Emoji} from "../../../emoji";
const genAVRollupHTML = (value: IAVCellValue) => { const genAVRollupHTML = (value: IAVCellValue) => {
let html = ""; let html = "";
@ -133,6 +134,7 @@ export const renderAVAttribute = (element: HTMLElement, id: string, protyle: IPr
key: { key: {
type: TAVCol, type: TAVCol,
name: string, name: string,
icon: string,
options?: { options?: {
name: string, name: string,
color: string color: string
@ -152,16 +154,16 @@ export const renderAVAttribute = (element: HTMLElement, id: string, protyle: IPr
html += `<div data-av-id="${table.avID}" data-node-id="${id}" data-type="NodeAttributeView"> html += `<div data-av-id="${table.avID}" data-node-id="${id}" data-type="NodeAttributeView">
<div class="fn__flex custom-attr__avheader"> <div class="fn__flex custom-attr__avheader">
<div class="block__logo popover__block" data-id='${JSON.stringify(table.blockIDs)}'> <div class="block__logo popover__block" data-id='${JSON.stringify(table.blockIDs)}'>
<svg><use xlink:href="#iconDatabase"></use></svg> <svg class="block__logoicon"><use xlink:href="#iconDatabase"></use></svg><span>${table.avName || window.siyuan.languages.database}</span>
<span>${table.avName || window.siyuan.languages.database}</span>
</div> </div>
<div class="fn__flex-1"></div> <div class="fn__flex-1"></div>
<button data-type="addColumn" class="b3-button b3-button--outline"><svg><use xlink:href="#iconAdd"></use></svg>${window.siyuan.languages.addAttr}</button> <button data-type="addColumn" class="b3-button b3-button--outline"><svg><use xlink:href="#iconAdd"></use></svg>${window.siyuan.languages.addAttr}</button>
</div>`; </div>`;
table.keyValues?.forEach(item => { table.keyValues?.forEach(item => {
html += `<div class="block__icons av__row" data-id="${id}"> html += `<div class="block__icons av__row" data-id="${id}">
<div class="block__logo"> <div class="block__icon"><svg><use xlink:href="#iconDrag"></use></svg></div>
<svg><use xlink:href="#${getColIconByType(item.key.type)}"></use></svg> <div class="block__logo ariaLabel" aria-label="${escapeAttr(item.key.name)}"">
${item.key.icon ? unicode2Emoji(item.key.icon, "block__logoicon", true) : `<svg class="block__logoicon"><use xlink:href="#${getColIconByType(item.key.type)}"></use></svg>`}
<span>${item.key.name}</span> <span>${item.key.name}</span>
</div> </div>
<div data-av-id="${table.avID}" data-col-id="${item.values[0].keyID}" data-block-id="${item.values[0].blockID}" data-id="${item.values[0].id}" data-type="${item.values[0].type}" <div data-av-id="${table.avID}" data-col-id="${item.values[0].keyID}" data-block-id="${item.values[0].blockID}" data-id="${item.values[0].id}" data-type="${item.values[0].type}"