Skip to content

Commit 932bc48

Browse files
authored
Merge pull request #7039 from LibreSign/backport/7038/stable33
[stable33] fix(ui): render proper buttons when RequestPicker is inline
2 parents bcce7ee + 57375c5 commit 932bc48

1 file changed

Lines changed: 32 additions & 9 deletions

File tree

src/components/Request/RequestPicker.vue

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,32 @@
44
-->
55
<template>
66
<div v-if="canRequestSign">
7-
<NcActions :menu-name="t('libresign', 'Request')"
8-
:inline="inline ? 3 : 0"
9-
:force-name="inline"
10-
:class="{column: inline}"
7+
<div v-if="inline" class="request-picker-buttons">
8+
<NcButton variant="secondary"
9+
@click="showModalUploadFromUrl()">
10+
<template #icon>
11+
<NcIconSvgWrapper :path="mdiLink" :size="20" />
12+
</template>
13+
{{ t('libresign', 'Upload from URL') }}
14+
</NcButton>
15+
<NcButton variant="secondary"
16+
:title="envelopeEnabled ? t('libresign', 'Multiple files allowed') : null"
17+
@click="openFilePicker">
18+
<template #icon>
19+
<NcIconSvgWrapper :path="mdiFolder" :size="20" />
20+
</template>
21+
{{ t('libresign', 'Choose from Files') }}
22+
</NcButton>
23+
<NcButton variant="secondary"
24+
@click="uploadFile">
25+
<template #icon>
26+
<NcIconSvgWrapper :path="mdiUpload" :size="20" />
27+
</template>
28+
{{ t('libresign', 'Upload') }}
29+
</NcButton>
30+
</div>
31+
<NcActions v-else
32+
:menu-name="t('libresign', 'Request')"
1133
:variant="variant"
1234
v-model:open="openedMenu">
1335
<template #icon>
@@ -16,22 +38,22 @@
1638
<NcActionButton :wide="true"
1739
@click="showModalUploadFromUrl()">
1840
<template #icon>
19-
<NcIconSvgWrapper :path="mdiLink" :size="20" />
41+
<NcIconSvgWrapper :path="mdiLink" :size="20" />
2042
</template>
2143
{{ t('libresign', 'Upload from URL') }}
2244
</NcActionButton>
2345
<NcActionButton :wide="true"
2446
:title="envelopeEnabled ? t('libresign', 'Multiple files allowed') : null"
2547
@click="openFilePicker">
2648
<template #icon>
27-
<NcIconSvgWrapper :path="mdiFolder" :size="20" />
49+
<NcIconSvgWrapper :path="mdiFolder" :size="20" />
2850
</template>
2951
{{ t('libresign', 'Choose from Files') }}
3052
</NcActionButton>
3153
<NcActionButton :wide="true"
3254
@click="uploadFile">
3355
<template #icon>
34-
<NcIconSvgWrapper :path="mdiUpload" :size="20" />
56+
<NcIconSvgWrapper :path="mdiUpload" :size="20" />
3557
</template>
3658
{{ t('libresign', 'Upload') }}
3759
</NcActionButton>
@@ -451,9 +473,10 @@ export default {
451473
</script>
452474
453475
<style lang="scss" scoped>
454-
.column {
476+
.request-picker-buttons {
455477
display: flex;
456-
gap: 12px; flex: 1;
478+
gap: 12px;
457479
flex-direction: column;
480+
align-items: stretch;
458481
}
459482
</style>

0 commit comments

Comments
 (0)