Skip to content

Commit

Permalink
Merge pull request #33706 from nextcloud/bugfix/dashboard-status
Browse files Browse the repository at this point in the history
  • Loading branch information
juliusknorr authored Aug 29, 2022
2 parents b1421f6 + f14264e commit 5422051
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion apps/dashboard/src/DashboardApp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ export default {
}
.button,
.button-vue
.button-vue,
.edit-panels,
.statuses ::v-deep .action-item .action-item__menutoggle,
.statuses ::v-deep .action-item.action-item--open .action-item__menutoggle {
Expand Down
9 changes: 6 additions & 3 deletions apps/user_status/src/UserStatus.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
-->

<template>
<li>
<component :is="elementTag">
<div class="user-status-menu-item">
<!-- Username display -->
<a v-if="!inline"
Expand Down Expand Up @@ -51,7 +51,7 @@
<!-- Status management modal -->
<SetStatusModal v-if="isModalOpen"
@close="closeModal" />
</li>
</component>
</template>

<script>
Expand Down Expand Up @@ -94,6 +94,9 @@ export default {
}
},
computed: {
elementTag() {
return this.inline ? 'div' : 'li'
},
/**
* The profile page link
*
Expand Down Expand Up @@ -290,7 +293,7 @@ export default {
margin: 0;
border: 0;
border-radius: var(--border-radius-pill);
background-color: var(--color-background-translucent);
background-color: var(--color-main-background-blur);
font-size: inherit;
font-weight: normal;

Expand Down
4 changes: 2 additions & 2 deletions dist/dashboard-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/dashboard-main.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/user_status-menu.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/user_status-menu.js.map

Large diffs are not rendered by default.

0 comments on commit 5422051

Please sign in to comment.