From 10ad5ac83898517ce24d8854e055bf588487266f Mon Sep 17 00:00:00 2001 From: Vanessa Date: Thu, 26 Oct 2023 09:51:41 +0800 Subject: [PATCH] :art: https://github.com/siyuan-note/siyuan/issues/9505 --- app/src/assets/scss/base.scss | 15 +-------------- app/src/assets/scss/business/_av.scss | 10 ---------- app/src/assets/scss/business/_drag.scss | 23 +++++++++++++++++++++++ app/src/assets/scss/business/_layout.scss | 2 +- app/src/assets/scss/mobile.scss | 1 + app/src/assets/scss/protyle/_wysiwyg.scss | 19 ------------------- 6 files changed, 26 insertions(+), 44 deletions(-) create mode 100644 app/src/assets/scss/business/_drag.scss diff --git a/app/src/assets/scss/base.scss b/app/src/assets/scss/base.scss index 9f82d3d40..11040eee5 100644 --- a/app/src/assets/scss/base.scss +++ b/app/src/assets/scss/base.scss @@ -17,6 +17,7 @@ @import "business/graph"; @import "business/layout"; @import "business/block"; +@import "business/drag"; @import "util/reset"; @import "component/card"; @import "component/menu"; @@ -314,20 +315,6 @@ html { } .file-tree { - .dragover { - background-color: var(--b3-theme-primary-lightest); - - &__top { - border-radius: 0; - box-shadow: 0 -2px 0 var(--b3-theme-primary-lighter), inset 0 2px 0 var(--b3-theme-primary-lighter); - } - - &__bottom { - border-radius: 0; - box-shadow: 0 2px 0 var(--b3-theme-primary-lighter), inset 0px -2px 0 var(--b3-theme-primary-lighter); - } - } - &:hover .block__icons .block__icon:not([disabled]) { opacity: 1; } diff --git a/app/src/assets/scss/business/_av.scss b/app/src/assets/scss/business/_av.scss index 13fc4abb0..84f6f25d8 100644 --- a/app/src/assets/scss/business/_av.scss +++ b/app/src/assets/scss/business/_av.scss @@ -339,16 +339,6 @@ &__item { transition: margin .2s cubic-bezier(0, 0, .2, 1) 0ms; - - &.dragover__bottom { - background-color: var(--b3-theme-primary-lightest); - box-shadow: 0 -2px 0 var(--b3-theme-primary-lighter) inset; - } - - &.dragover__top { - background-color: var(--b3-theme-primary-lightest); - box-shadow: 0 2px 0 var(--b3-theme-primary-lighter) inset; - } } &__item:hover .b3-menu__action { diff --git a/app/src/assets/scss/business/_drag.scss b/app/src/assets/scss/business/_drag.scss new file mode 100644 index 000000000..2406132d2 --- /dev/null +++ b/app/src/assets/scss/business/_drag.scss @@ -0,0 +1,23 @@ +.dragover { + background-color: var(--b3-theme-primary-lightest); + + &__top { + border-radius: 0 !important; + box-shadow: 0 -2px 0 var(--b3-theme-primary-lighter), inset 0 2px 0 var(--b3-theme-primary-lighter) !important; + } + + &__bottom { + border-radius: 0 !important; + box-shadow: 0 2px 0 var(--b3-theme-primary-lighter), inset 0px -2px 0 var(--b3-theme-primary-lighter) !important; + } + + &__left { + border-radius: 0 !important; + box-shadow: -4px 0 0 var(--b3-theme-primary-lighter) !important; + } + + &__right { + border-radius: 0 !important; + box-shadow: 4px 0 0 var(--b3-theme-primary-lighter) !important; + } +} diff --git a/app/src/assets/scss/business/_layout.scss b/app/src/assets/scss/business/_layout.scss index 8a8436997..51fa60637 100644 --- a/app/src/assets/scss/business/_layout.scss +++ b/app/src/assets/scss/business/_layout.scss @@ -88,7 +88,7 @@ } &__tab--active { - .b3-list--background .b3-list-item--focus:not(.dragover):not(.dragover__top):not(.dragover__bottom) { + .b3-list--background .b3-list-item--focus { background-color: var(--b3-theme-primary-lightest); } diff --git a/app/src/assets/scss/mobile.scss b/app/src/assets/scss/mobile.scss index ae509a41b..6f45ed784 100644 --- a/app/src/assets/scss/mobile.scss +++ b/app/src/assets/scss/mobile.scss @@ -14,6 +14,7 @@ @import "business/graph"; @import "business/layout"; @import "business/block"; +@import "business/drag"; @import "util/reset"; @import "util/function"; @import "business/history"; diff --git a/app/src/assets/scss/protyle/_wysiwyg.scss b/app/src/assets/scss/protyle/_wysiwyg.scss index 8ae1de70c..ece0cfade 100644 --- a/app/src/assets/scss/protyle/_wysiwyg.scss +++ b/app/src/assets/scss/protyle/_wysiwyg.scss @@ -439,25 +439,6 @@ background-color: var(--b3-protyle-code-linenumber-hl) !important; } - .dragover { - // 需要 !important,否则拖拽到闪卡无 border - &__top { - box-shadow: 0 4px 0 var(--b3-theme-primary-lighter) inset !important; - } - - &__bottom { - box-shadow: 0 -4px 0 var(--b3-theme-primary-lighter) inset !important; - } - - &__left { - box-shadow: -4px 0 0 var(--b3-theme-primary-lighter) !important; - } - - &__right { - box-shadow: 4px 0 0 var(--b3-theme-primary-lighter) !important; - } - } - &--attr .protyle-attr { opacity: 1;