Skip to content

Commit eda781a

Browse files
authored
Style: Fix move cursors that should be grabs (#5989)
## Summary Align with designs that use `grab`/`grabbing` instead of `move`. ## Review Focus Additionally - Fixes the use of `@apply` in the places I touched - Removed some `style.css` rules that were always overridden by the component ## Screenshots ### Before https://github.com/user-attachments/assets/9ca65b92-33e5-4feb-853c-9c5ece574ab5 ### After https://github.com/user-attachments/assets/51569025-0156-473e-be93-5662c345901b ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-5989-Style-Fix-move-cursors-that-should-be-grabs-2876d73d3650813bbe95c761c5d46e03) by [Unito](https://www.unito.io)
1 parent ec3a773 commit eda781a

File tree

4 files changed

+12
-16
lines changed

4 files changed

+12
-16
lines changed

packages/design-system/src/css/style.css

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -645,13 +645,10 @@ button.comfy-close-menu-btn {
645645
}
646646

647647
span.drag-handle {
648-
width: 10px;
649-
height: 20px;
650648
display: inline-block;
651649
overflow: hidden;
652650
line-height: 5px;
653651
padding: 3px 4px;
654-
cursor: move;
655652
vertical-align: middle;
656653
margin-top: -0.4em;
657654
margin-left: -0.2em;

src/components/actionbar/ComfyActionbar.vue

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,15 @@
55
:class="{ 'is-dragging': isDragging, 'is-docked': isDocked }"
66
>
77
<div ref="panelRef" class="actionbar-content flex items-center select-none">
8-
<span ref="dragHandleRef" class="drag-handle cursor-move mr-2" />
8+
<span
9+
ref="dragHandleRef"
10+
:class="
11+
cn(
12+
'drag-handle cursor-grab w-3 h-max mr-2',
13+
isDragging && 'cursor-grabbing'
14+
)
15+
"
16+
/>
917
<ComfyQueueButton />
1018
</div>
1119
</Panel>
@@ -26,6 +34,7 @@ import type { Ref } from 'vue'
2634
import { computed, inject, nextTick, onMounted, ref, watch } from 'vue'
2735
2836
import { useSettingStore } from '@/platform/settings/settingStore'
37+
import { cn } from '@/utils/tailwindUtil'
2938
3039
import ComfyQueueButton from './ComfyQueueButton.vue'
3140
@@ -257,8 +266,4 @@ watch([isDragging, isOverlappingWithTopMenu], ([dragging, overlapping]) => {
257266
:deep(.p-panel-header) {
258267
display: none;
259268
}
260-
261-
.drag-handle {
262-
@apply w-3 h-max;
263-
}
264269
</style>

src/components/graph/selectionToolbox/ExecuteButton.vue

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
@mouseleave="() => handleMouseLeave()"
1111
@click="handleClick"
1212
>
13-
<i class="icon-[lucide--play] fill-path-white w-4 h-4" />
13+
<i class="icon-[lucide--play] text-white size-4" />
1414
</Button>
1515
</template>
1616

@@ -64,9 +64,3 @@ const handleClick = async () => {
6464
await commandStore.execute('Comfy.QueueSelectedOutputNodes')
6565
}
6666
</script>
67-
<style scoped>
68-
:deep.fill-path-white > path {
69-
fill: white;
70-
stroke: unset;
71-
}
72-
</style>

src/renderer/extensions/vueNodes/components/NodeHeader.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
v-else
77
:class="
88
cn(
9-
'lg-node-header p-4 rounded-t-2xl cursor-move w-full bg-node-component-header-surface text-node-component-header',
9+
'lg-node-header p-4 rounded-t-2xl w-full bg-node-component-header-surface text-node-component-header',
1010
collapsed && 'rounded-2xl'
1111
)
1212
"

0 commit comments

Comments
 (0)