Skip to content

Commit 8ffe77d

Browse files
authored
Merge pull request #40343 from nextcloud/40289-stable27-fix-appearance
[stable27] 40289 fix appearance
2 parents 96d72c8 + 0abc807 commit 8ffe77d

3 files changed

Lines changed: 33 additions & 24 deletions

File tree

apps/files_sharing/src/views/SharingDetailsTab.vue

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,8 @@
2424
type="radio"
2525
button-variant-grouped="vertical"
2626
@update:checked="toggleCustomPermissions">
27-
{{ t('files_sharing', 'View only') }}
28-
<template #icon>
29-
<ViewIcon :size="20" />
30-
</template>
27+
<ViewIcon :size="20" />
28+
<span>{{ t('files_sharing', 'View only') }}</span>
3129
</NcCheckboxRadioSwitch>
3230
<NcCheckboxRadioSwitch :button-variant="true"
3331
:checked.sync="sharingPermission"
@@ -36,10 +34,8 @@
3634
type="radio"
3735
button-variant-grouped="vertical"
3836
@update:checked="toggleCustomPermissions">
39-
{{ t('files_sharing', 'Allow upload and editing') }}
40-
<template #icon>
41-
<EditIcon :size="20" />
42-
</template>
37+
<EditIcon :size="20" />
38+
<span>{{ t('files_sharing', 'Allow upload and editing') }}</span>
4339
</NcCheckboxRadioSwitch>
4440
<NcCheckboxRadioSwitch v-if="allowsFileDrop"
4541
:button-variant="true"
@@ -49,11 +45,9 @@
4945
type="radio"
5046
button-variant-grouped="vertical"
5147
@update:checked="toggleCustomPermissions">
52-
{{ t('files_sharing', 'File drop') }}
48+
<UploadIcon :size="20" />
49+
<span>{{ t('files_sharing', 'File drop') }}</span>
5350
<small>{{ t('files_sharing', 'Upload only') }}</small>
54-
<template #icon>
55-
<UploadIcon :size="20" />
56-
</template>
5751
</NcCheckboxRadioSwitch>
5852
<NcCheckboxRadioSwitch :button-variant="true"
5953
:checked.sync="sharingPermission"
@@ -62,11 +56,9 @@
6256
type="radio"
6357
button-variant-grouped="vertical"
6458
@update:checked="expandCustomPermissions">
65-
{{ t('files_sharing', 'Custom permissions') }}
59+
<DotsHorizontalIcon :size="20" />
60+
<span>{{ t('files_sharing', 'Custom permissions') }}</span>
6661
<small>{{ t('files_sharing', customPermissionsList) }}</small>
67-
<template #icon>
68-
<DotsHorizontalIcon :size="20" />
69-
</template>
7062
</NcCheckboxRadioSwitch>
7163
</div>
7264
</div>
@@ -142,7 +134,8 @@
142134
{{ t('file_sharing', 'Custom permissions') }}
143135
</NcCheckboxRadioSwitch>
144136
<section v-if="setCustomPermissions" class="custom-permissions-group">
145-
<NcCheckboxRadioSwitch :disabled="!allowsFileDrop && share.type === SHARE_TYPES.SHARE_TYPE_LINK" :checked.sync="hasRead">
137+
<NcCheckboxRadioSwitch :disabled="!allowsFileDrop && share.type === SHARE_TYPES.SHARE_TYPE_LINK"
138+
:checked.sync="hasRead">
146139
{{ t('file_sharing', 'Read') }}
147140
</NcCheckboxRadioSwitch>
148141
<NcCheckboxRadioSwitch v-if="isFolder" :disabled="!canSetCreate" :checked.sync="canCreate">
@@ -151,7 +144,9 @@
151144
<NcCheckboxRadioSwitch :disabled="!canSetEdit" :checked.sync="canEdit">
152145
{{ t('file_sharing', 'Update') }}
153146
</NcCheckboxRadioSwitch>
154-
<NcCheckboxRadioSwitch v-if="config.isResharingAllowed && share.type !== SHARE_TYPES.SHARE_TYPE_LINK" :disabled="!canSetReshare" :checked.sync="canReshare">
147+
<NcCheckboxRadioSwitch v-if="config.isResharingAllowed && share.type !== SHARE_TYPES.SHARE_TYPE_LINK"
148+
:disabled="!canSetReshare"
149+
:checked.sync="canReshare">
155150
{{ t('file_sharing', 'Share') }}
156151
</NcCheckboxRadioSwitch>
157152
<NcCheckboxRadioSwitch v-if="!isPublicShare" :disabled="!canSetDownload" :checked.sync="canDownload">
@@ -667,7 +662,7 @@ export default {
667662
}
668663
},
669664
expandCustomPermissions() {
670-
if (!this.advancedSectionAccordionExpanded) {
665+
if (!this.advancedSectionAccordionExpanded) {
671666
this.advancedSectionAccordionExpanded = true
672667
}
673668
this.toggleCustomPermissions()
@@ -951,11 +946,26 @@ export default {
951946
}
952947
953948
::v-deep label {
949+
display: flex;
950+
flex-wrap: wrap;
954951
955952
span {
956953
display: flex;
957-
flex-direction: column;
954+
955+
&:first-of-type {
956+
flex: 10%;
957+
}
958+
959+
&:last-of-type {
960+
flex: 90%
961+
}
958962
}
963+
964+
small {
965+
padding-left: 10%;
966+
flex-basis: 100% !important;
967+
}
968+
959969
}
960970
}
961971
@@ -999,7 +1009,6 @@ export default {
9991009
*/
10001010
span {
10011011
::v-deep label {
1002-
padding-left: 0 !important;
10031012
background-color: initial !important;
10041013
border: none !important;
10051014
}

dist/files_sharing-files_sharing_tab.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/files_sharing-files_sharing_tab.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)