Skip to content

Commit

Permalink
Display user status by the side in sharing flow
Browse files Browse the repository at this point in the history
The quick share drop down now takes the place where the user status
would show in the past, so we have the option of removing it (as it's available
in the profile dropdown) or putting it at the side as such.

It's put on the side without the icon, as the status icon appears on the avatar
when set.

Signed-off-by: fenn-cs <[email protected]>
  • Loading branch information
nfebe committed Sep 13, 2023
1 parent 0e5bb30 commit 4c284c1
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 4c284c1

Please sign in to comment.