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/9505

Browse source
This commit is contained in:
Vanessa 2023-10-26 11:50:01 +08:00
parent df0e6fe4db
commit 9cb77adf49
5 changed files with 36 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/src/assets/scss/base.scss
View file

@ -195,6 +195,7 @@ html {
margin: 0; margin: 0;
height: 31.5px; height: 31.5px;
border-radius: 0; border-radius: 0;
svg { svg {
width: 10px !important; width: 10px !important;
} }
@ -323,6 +324,23 @@ html {
opacity: .38; opacity: .38;
} }
.dragover__top:after,
.dragover__bottom:after {
content: "";
width: var(--file-toggle-width);
height: 4px;
background-color: var(--b3-theme-surface);
position: absolute;
left: 0;
bottom: -2px;
z-index: 1;
}
.dragover__top:after {
top: -3px;
bottom: auto;
}
&__close { &__close {
min-height: auto; min-height: auto;
transition: var(--b3-transition); transition: var(--b3-transition);

6
app/src/assets/scss/business/_av.scss
View file

@ -86,10 +86,14 @@
position: relative; position: relative;
font-size: 87.5%; font-size: 87.5%;
&.dragover__bottom, { &.dragover__bottom {
border-bottom-color: var(--b3-theme-primary-lighter); border-bottom-color: var(--b3-theme-primary-lighter);
} }
&.dragover__top {
box-shadow: 0 -3px 0 var(--b3-theme-primary-lighter), inset 0 2px 0 var(--b3-theme-primary-lighter) !important;
}
&:hover { &:hover {
[data-type="block-ref"], [data-type="block-ref"],
[data-type="block-more"] { [data-type="block-more"] {

3
app/src/assets/scss/business/_drag.scss
View file

@ -1,9 +1,10 @@
.dragover { .dragover {
background-color: var(--b3-theme-primary-lightest); background-color: var(--b3-theme-primary-lightest);
// 需要 !important，否则拖拽到闪卡无效果
&__top { &__top {
border-radius: 0 !important; border-radius: 0 !important;
box-shadow: 0 -2px 0 var(--b3-theme-primary-lighter), inset 0 2px 0 var(--b3-theme-primary-lighter) !important; box-shadow: 0 -3px 0 var(--b3-theme-primary-lighter), inset 0 1px 0 var(--b3-theme-primary-lighter) !important;
} }
&__bottom { &__bottom {

10
app/src/assets/scss/protyle/_wysiwyg.scss
View file

@ -439,6 +439,16 @@
background-color: var(--b3-protyle-code-linenumber-hl) !important; background-color: var(--b3-protyle-code-linenumber-hl) !important;
} }
.dragover {
&__top:not(.av__row) {
box-shadow: 0 -4px 0 0px var(--b3-theme-primary-lighter) !important;
}
&__bottom:not(.av__row) {
box-shadow: 0 4px 0 0px var(--b3-theme-primary-lighter) !important
}
}
&--attr .protyle-attr { &--attr .protyle-attr {
opacity: 1; opacity: 1;

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

@ -1036,6 +1036,7 @@ export class Files extends Model {
const ariaLabel = `${getDisplayName(item.name, true, true)} ${item.hSize}${item.bookmark ? "<br>" + window.siyuan.languages.bookmark + " " + item.bookmark : ""}${item.name1 ? "<br>" + window.siyuan.languages.name + " " + item.name1 : ""}${item.alias ? "<br>" + window.siyuan.languages.alias + " " + item.alias : ""}${item.memo ? "<br>" + window.siyuan.languages.memo + " " + item.memo : ""}${item.subFileCount !== 0 ? window.siyuan.languages.includeSubFile.replace("x", item.subFileCount) : ""}<br>${window.siyuan.languages.modifiedAt} ${item.hMtime}<br>${window.siyuan.languages.createdAt} ${item.hCtime}`; const ariaLabel = `${getDisplayName(item.name, true, true)} ${item.hSize}${item.bookmark ? "<br>" + window.siyuan.languages.bookmark + " " + item.bookmark : ""}${item.name1 ? "<br>" + window.siyuan.languages.name + " " + item.name1 : ""}${item.alias ? "<br>" + window.siyuan.languages.alias + " " + item.alias : ""}${item.memo ? "<br>" + window.siyuan.languages.memo + " " + item.memo : ""}${item.subFileCount !== 0 ? window.siyuan.languages.includeSubFile.replace("x", item.subFileCount) : ""}<br>${window.siyuan.languages.modifiedAt} ${item.hMtime}<br>${window.siyuan.languages.createdAt} ${item.hCtime}`;
return `<li data-node-id="${item.id}" data-name="${Lute.EscapeHTMLStr(item.name)}" draggable="true" data-count="${item.subFileCount}" return `<li data-node-id="${item.id}" data-name="${Lute.EscapeHTMLStr(item.name)}" draggable="true" data-count="${item.subFileCount}"
data-type="navigation-file" data-type="navigation-file"
style="--file-toggle-width:${(item.path.split("/").length - 2) * 18 + 40}px"
class="b3-list-item b3-list-item--hide-action" data-path="${item.path}"> class="b3-list-item b3-list-item--hide-action" data-path="${item.path}">
<span style="padding-left: ${(item.path.split("/").length - 2) * 18 + 22}px" class="b3-list-item__toggle b3-list-item__toggle--hl${item.subFileCount === 0 ? " fn__hidden" : ""}"> <span style="padding-left: ${(item.path.split("/").length - 2) * 18 + 22}px" class="b3-list-item__toggle b3-list-item__toggle--hl${item.subFileCount === 0 ? " fn__hidden" : ""}">
<svg class="b3-list-item__arrow"><use xlink:href="#iconRight"></use></svg> <svg class="b3-list-item__arrow"><use xlink:href="#iconRight"></use></svg>