Skip to content

Commit 9190969

Browse files
Merge pull request #5428 from Prashant-thakur77/remove-vuetify-buttons-trash
[Remove Vuetify from Studio] Buttons in New folder and Trash
2 parents 05b7e71 + 82e0601 commit 9190969

File tree

2 files changed

+23
-21
lines changed

2 files changed

+23
-21
lines changed

contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,11 @@
7373
class="add-wrapper"
7474
:color="$themeTokens.textInverted"
7575
>
76-
<VBtn
76+
<KButton
7777
v-if="addTopicsMode"
78-
color="greyBackground"
78+
:text="$tr('addTopic')"
7979
@click="createTopic"
80-
>
81-
{{ $tr('addTopic') }}
82-
</VBtn>
80+
/>
8381
<KButton
8482
v-else-if="uploadMode"
8583
:text="$tr('uploadButton')"

contentcuration/contentcuration/frontend/channelEdit/views/trash/TrashModal.vue

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -130,22 +130,22 @@
130130
{{ getSelectedTopicAndResourceCountText(selected) }}
131131
</span>
132132
<VSpacer />
133-
<VBtn
134-
flat
135-
:disabled="!selected.length"
136-
data-test="restore"
137-
@click="moveModalOpen = true"
138-
>
139-
{{ $tr('restoreButton') }}
140-
</VBtn>
141-
<VBtn
142-
color="primary"
143-
:disabled="!selected.length"
144-
data-test="delete"
145-
@click="showConfirmationDialog = true"
146-
>
147-
{{ $tr('deleteButton') }}
148-
</VBtn>
133+
<KButtonGroup>
134+
<KButton
135+
appearance="flat-button"
136+
:text="$tr('restoreButton')"
137+
:disabled="!selected.length"
138+
data-test="restore"
139+
@click="moveModalOpen = true"
140+
/>
141+
<KButton
142+
:primary="true"
143+
:text="$tr('deleteButton')"
144+
:disabled="!selected.length"
145+
data-test="delete"
146+
@click="showConfirmationDialog = true"
147+
/>
148+
</KButtonGroup>
149149
</template>
150150
<KModal
151151
v-if="showConfirmationDialog"
@@ -365,4 +365,8 @@
365365
width: 100%;
366366
}
367367
368+
.button-group {
369+
white-space: nowrap;
370+
}
371+
368372
</style>

0 commit comments

Comments
 (0)