Skip to content

Commit

Permalink
Merge pull request #40405 from nextcloud/manual/backport/stable27/40393
Browse files Browse the repository at this point in the history
[stable27] Display user status by the side in sharing flow
  • Loading branch information
AndyScherzinger authored Sep 14, 2023
2 parents 582c34e + eb9ba2e commit 80dbe54
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 12 deletions.
16 changes: 10 additions & 6 deletions apps/files_sharing/src/components/SharingEntry.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -168,6 +167,10 @@ export default {
&-unique {
color: var(--color-text-maxcontrast);
}

small {
color: var(--color-text-maxcontrast);
}
}

&__actions {
Expand All @@ -176,6 +179,7 @@ export default {

&__summary {
padding: 8px;
padding-left: 10px;
display: flex;
flex-direction: column;
justify-content: center;
Expand Down
4 changes: 2 additions & 2 deletions dist/core-common.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-common.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/files_sharing-files_sharing_tab.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files_sharing-files_sharing_tab.js.map

Large diffs are not rendered by default.

0 comments on commit 80dbe54

Please sign in to comment.