Skip to content

Commit

Permalink
🎨 #13284
Browse files Browse the repository at this point in the history
  • Loading branch information
Vanessa219 committed Nov 27, 2024
1 parent 18f68ac commit 83ea111
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 29 deletions.
22 changes: 12 additions & 10 deletions app/src/assets/scss/business/_av.scss
Original file line number Diff line number Diff line change
Expand Up @@ -125,28 +125,30 @@
position: relative;
font-size: 87.5%;

&.dragover__top::before {
content: '';
position: absolute;
left: 0;
right: 0;
top: -2.5px;
height: 4px;
background-color: var(--b3-theme-primary-lighter);
z-index: 3;
&.dragover__top,
&.dragover__bottom {
box-shadow: none !important;
}

&.dragover__top::after,
&.dragover__bottom::after {
content: '';
position: absolute;
left: 0;
right: 0;
bottom: -2.5px;
height: 4px;
background-color: var(--b3-theme-primary-lighter);
z-index: 3;
}

&.dragover__top::after {
top: -3px;
}

&.dragover__bottom::after {
bottom: -2px;
}

&:hover [data-type="block-more"] {
display: block;
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/assets/scss/business/_custom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
max-height: 24px;
}

.dragover__top.av__row {
box-shadow: 0 -2px 0 var(--b3-theme-primary-lighter), inset 0 2px 0 var(--b3-theme-primary-lighter) !important;
.av__row.dragover__top::after {
top: -2px
}
}
4 changes: 2 additions & 2 deletions app/src/assets/scss/business/_drag.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
}

// 需要 !important,否则拖拽到闪卡无效果
&__top:not(.av__row) {
&__top {
border-radius: 0 !important;
box-shadow: 0 -3px 0 var(--b3-theme-primary-lighter), inset 0 1px 0 var(--b3-theme-primary-lighter) !important;
}

&__bottom:not(.av__row) {
&__bottom {
border-radius: 0 !important;
box-shadow: 0 2px 0 var(--b3-theme-primary-lighter), inset 0 -2px 0 var(--b3-theme-primary-lighter) !important;
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/assets/scss/component/_list.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
border-radius: var(--b3-border-radius);

&:hover:not(.b3-list-item--focus):not(.dragover):not(.dragover__top):not(.dragover__bottom),
&--focus:not(.dragover) {
&--focus:not(.dragover):not(.dragover__top):not(.dragover__bottom) {
background-color: var(--b3-list-hover);
}
}
Expand Down
16 changes: 2 additions & 14 deletions app/src/assets/scss/protyle/_wysiwyg.scss
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,6 @@
}
}

.bq {
.dragover {
&__top:not(.av__row) {
box-shadow: 0 -3px 0 var(--b3-theme-primary-lighter), inset 0 1px 0 var(--b3-theme-primary-lighter) !important;
}

&__bottom:not(.av__row) {
box-shadow: 0 3px 0 var(--b3-theme-primary-lighter), inset 0 -1px 0 var(--b3-theme-primary-lighter) !important;
}
}
}

&.list {
padding: 0;
display: flex;
Expand Down Expand Up @@ -476,11 +464,11 @@
}

.dragover {
&__top:not(.av__row) {
&__top {
box-shadow: 0 -4px 0 0 var(--b3-theme-primary-lighter) !important;
}

&__bottom:not(.av__row) {
&__bottom {
box-shadow: 0 4px 0 0 var(--b3-theme-primary-lighter) !important
}
}
Expand Down

0 comments on commit 83ea111

Please sign in to comment.