mirror of
https://github.com/nextcloud/server.git
synced 2026-06-10 17:23:59 -04:00
Merge pull request #40405 from nextcloud/manual/backport/stable27/40393
[stable27] Display user status by the side in sharing flow
This commit is contained in:
commit
80dbe54eaf
5 changed files with 16 additions and 12 deletions
|
|
@ -35,12 +35,11 @@
|
|||
:aria-label="tooltip"
|
||||
:href="share.shareWithLink"
|
||||
class="sharing-entry__desc">
|
||||
<span>{{ title }}<span v-if="!isUnique" class="sharing-entry__desc-unique"> ({{
|
||||
share.shareWithDisplayNameUnique }})</span></span>
|
||||
<p v-if="hasStatus">
|
||||
<span>{{ share.status.icon || '' }}</span>
|
||||
<span>{{ share.status.message || '' }}</span>
|
||||
</p>
|
||||
<span>{{ title }}
|
||||
<span v-if="!isUnique" class="sharing-entry__desc-unique"> ({{
|
||||
share.shareWithDisplayNameUnique }})</span>
|
||||
<small v-if="hasStatus && share.status.message">({{ share.status.message }})</small>
|
||||
</span>
|
||||
</component>
|
||||
<QuickShareSelect :share="share"
|
||||
:file-info="fileInfo"
|
||||
|
|
@ -168,6 +167,10 @@ export default {
|
|||
&-unique {
|
||||
color: var(--color-text-maxcontrast);
|
||||
}
|
||||
|
||||
small {
|
||||
color: var(--color-text-maxcontrast);
|
||||
}
|
||||
}
|
||||
|
||||
&__actions {
|
||||
|
|
@ -176,6 +179,7 @@ export default {
|
|||
|
||||
&__summary {
|
||||
padding: 8px;
|
||||
padding-left: 10px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
|
|
|
|||
4
dist/core-common.js
vendored
4
dist/core-common.js
vendored
File diff suppressed because one or more lines are too long
2
dist/core-common.js.map
vendored
2
dist/core-common.js.map
vendored
File diff suppressed because one or more lines are too long
4
dist/files_sharing-files_sharing_tab.js
vendored
4
dist/files_sharing-files_sharing_tab.js
vendored
File diff suppressed because one or more lines are too long
2
dist/files_sharing-files_sharing_tab.js.map
vendored
2
dist/files_sharing-files_sharing_tab.js.map
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue