Skip to content

Commit 2653660

Browse files
committed
Merge remote-tracking branch 'origin' into trunk
2 parents 704ed07 + 4ff2772 commit 2653660

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/atoms/BaseDraggableDialog.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -210,12 +210,12 @@ onUnmounted(() => {
210210
<div
211211
v-if="isOpen"
212212
data-cy="draggable-dialog"
213-
class="modal vue-ui-draggable-dialog"
213+
class="vue-ui-draggable-dialog"
214214
:style="modalStyle"
215215
@click.stop
216216
>
217217
<div
218-
class="modal-header"
218+
class="vue-ui-draggable-dialog-header"
219219
:style="{
220220
backgroundColor: headerBg,
221221
color: headerColor
@@ -243,7 +243,7 @@ onUnmounted(() => {
243243
244244
245245
</span>
246-
<span class="modal-title">
246+
<span class="vue-ui-draggable-dialog-title">
247247
<slot name="title"/>
248248
</span>
249249
<div class="draggable-dialog-actions">
@@ -253,7 +253,7 @@ onUnmounted(() => {
253253
</button>
254254
</div>
255255
</div>
256-
<div :class="{ 'modal-body': !withPadding, 'modal-body-pad': withPadding}">
256+
<div :class="{ 'vue-ui-draggable-dialog-body': !withPadding, 'vue-ui-draggable-dialog-body-pad': withPadding}">
257257
<slot name="content" />
258258
</div>
259259
<div class="resize-handle" @mousedown.stop.prevent="initResize" @touchstart.stop.prevent="initResize" />
@@ -267,7 +267,7 @@ onUnmounted(() => {
267267
</template>
268268
269269
<style scoped>
270-
.modal-header {
270+
.vue-ui-draggable-dialog-header {
271271
display: flex;
272272
align-items: center;
273273
user-select: none;
@@ -296,7 +296,7 @@ onUnmounted(() => {
296296
cursor: grabbing;
297297
}
298298
299-
.modal-title {
299+
.vue-ui-draggable-dialog-title {
300300
flex: 1;
301301
font-weight: bold;
302302
}
@@ -310,14 +310,14 @@ onUnmounted(() => {
310310
justify-content: center;
311311
}
312312
313-
.modal-body {
313+
.vue-ui-draggable-dialog-body {
314314
width: 100%;
315315
height: 80%;
316316
overflow: auto;
317317
transition: all 0.2s ease-in-out;
318318
}
319319
320-
.modal-body-pad {
320+
.vue-ui-draggable-dialog-body-pad {
321321
padding: 0 12px;
322322
width: calc(100% - 24px);
323323
height: 80%;

src/components/vue-ui-table.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@
525525
<!-- CHART MODAL -->
526526
<div class="vue-ui-table-chart-modal" v-if="showChart && canChart"
527527
:style="`width: ${modalWidth}px;top:${clientY}px; left:${clientX}px;background:${FINAL_CONFIG.style.chart.modal.backgroundColor};color:${FINAL_CONFIG.style.chart.modal.color}`">
528-
<div class="modal-drag-handle" @mousedown="dragMouseDown">
528+
<div class="vue-ui-modal-drag-handle" @mousedown="dragMouseDown">
529529
<!-- Your modal title or drag icon here -->
530530
<span v-html="icons.grip"/>
531531
<button class="close-chart-modal" @click="showChart = false">✖</button>
@@ -2591,7 +2591,7 @@ input.vue-ui-table-dialog-input {
25912591
color: white;
25922592
}
25932593
2594-
.vue-ui-table-chart-modal .modal-drag-handle {
2594+
.vue-ui-table-chart-modal .vue-ui-modal-drag-handle {
25952595
cursor: move;
25962596
user-select: none;
25972597
display: flex;

0 commit comments

Comments
 (0)