Skip to content

Commit 4de245b

Browse files
mejo-backportbot[bot]
authored andcommitted
chore(SessionList): Migrate to NcButton and MDI icon
Signed-off-by: Jonas <jonas@freesources.org>
1 parent d1fdb0f commit 4de245b

1 file changed

Lines changed: 24 additions & 31 deletions

File tree

src/components/Editor/SessionList.vue

Lines changed: 24 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,19 @@
77
<NcPopover class="session-list" placement="bottom">
88
<template #trigger="{ attrs }">
99
<div>
10-
<button :title="label"
10+
<NcButton :title="label"
1111
:aria-label="label"
12+
type="tertiary"
1213
class="avatar-list"
1314
v-bind="attrs">
14-
<div class="avatardiv icon-group" />
15-
<AvatarWrapper v-for="session in sessionsVisible"
16-
:key="session.id"
17-
:session="session"
18-
:size="30" />
19-
</button>
15+
<template #icon>
16+
<AccountMultipleIcon :size="20" />
17+
<AvatarWrapper v-for="session in sessionsVisible"
18+
:key="session.id"
19+
:session="session"
20+
:size="28" />
21+
</template>
22+
</NcButton>
2023
</div>
2124
</template>
2225
<template #default>
@@ -47,7 +50,8 @@
4750
</template>
4851

4952
<script>
50-
import { NcCheckboxRadioSwitch, NcPopover } from '@nextcloud/vue'
53+
import { NcButton, NcCheckboxRadioSwitch, NcPopover } from '@nextcloud/vue'
54+
import AccountMultipleIcon from 'vue-material-design-icons/AccountMultiple.vue'
5155
import AvatarWrapper from './AvatarWrapper.vue'
5256
import { COLLABORATOR_DISCONNECT_TIME, COLLABORATOR_IDLE_TIME } from '../../services/SyncService.js'
5357
import { loadState } from '@nextcloud/initial-state'
@@ -57,7 +61,9 @@ import { generateUrl } from '@nextcloud/router'
5761
export default {
5862
name: 'SessionList',
5963
components: {
64+
AccountMultipleIcon,
6065
AvatarWrapper,
66+
NcButton,
6167
NcPopover,
6268
NcCheckboxRadioSwitch,
6369
},
@@ -129,31 +135,18 @@ export default {
129135
}
130136
131137
.avatar-list {
132-
border: none;
133-
background-color: var(--color-main-background);
134-
padding: 0;
135-
margin: 0;
136-
padding-left: 3px;
137-
display: inline-flex;
138-
flex-direction: row-reverse;
139-
140-
.avatar-wrapper {
141-
margin: 0 -12px 0 0;
142-
z-index: 1;
143-
border-radius: 50%;
144-
overflow: hidden;
145-
box-sizing: content-box !important;
146-
height: calc(var(--default-clickable-area) - 4px);
147-
width: calc(var(--default-clickable-area) - 4px);
148-
}
138+
width: min-content !important;
139+
padding-inline: var(--default-grid-baseline);
149140
150-
.icon-more, .icon-group, .icon-settings-dark {
151-
width: var(--default-clickable-area);
152-
height: var(--default-clickable-area);
153-
margin: 0 3px 0 0;
141+
:deep(.button-vue__icon) {
142+
display: inline-flex;
143+
flex-direction: row-reverse;
144+
width: min-content;
154145
155-
&:hover {
156-
background-color: var(--color-background-hover);
146+
.avatar-wrapper {
147+
margin: 3px -12px 3px 0;
148+
z-index: 1;
149+
overflow: hidden;
157150
}
158151
}
159152
}

0 commit comments

Comments
 (0)