Skip to content

Commit 7c7076f

Browse files
authored
Merge pull request #7025 from LibreSign/backport/7023/stable33
[stable33] fix: use same grid/list view icons as files app
2 parents 7ffc039 + 901ec42 commit 7c7076f

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

src/tests/views/FilesList/FilesList.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ describe('FilesList.vue rendering rules', () => {
156156
await flushPromises()
157157

158158
expect(wrapper.vm.mdiFolder).toBeTruthy()
159-
expect(wrapper.vm.mdiViewGrid).toBeTruthy()
160-
expect(wrapper.vm.mdiViewList).toBeTruthy()
159+
expect(wrapper.vm.mdiViewGridOutline).toBeTruthy()
160+
expect(wrapper.vm.mdiFormatListBulletedSquare).toBeTruthy()
161161
expect(wrapper.vm.mdiChevronDown).toBeTruthy()
162162
expect(wrapper.vm.mdiChevronUp).toBeTruthy()
163163
expect(wrapper.vm.mdiReload).toBeTruthy()
@@ -265,7 +265,7 @@ describe('FilesList.vue rendering rules', () => {
265265

266266
const gridButton = wrapper.find('.files-list__header-grid-button')
267267
const iconWithPath = gridButton.findAll('.nc-icon').find((node) => !!node.attributes('data-path'))
268-
expect(iconWithPath?.attributes('data-path')).toBe(wrapper.vm.mdiViewGrid)
268+
expect(iconWithPath?.attributes('data-path')).toBe(wrapper.vm.mdiViewGridOutline)
269269
})
270270

271271
it('renders list toggle icon path when in grid mode', async () => {
@@ -279,6 +279,6 @@ describe('FilesList.vue rendering rules', () => {
279279

280280
const gridButton = wrapper.find('.files-list__header-grid-button')
281281
const iconWithPath = gridButton.findAll('.nc-icon').find((node) => !!node.attributes('data-path'))
282-
expect(iconWithPath?.attributes('data-path')).toBe(wrapper.vm.mdiViewList)
282+
expect(iconWithPath?.attributes('data-path')).toBe(wrapper.vm.mdiFormatListBulletedSquare)
283283
})
284284
})

src/views/FilesList/FilesList.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
variant="tertiary"
5050
@click="toggleGridView">
5151
<template #icon>
52-
<NcIconSvgWrapper v-if="userConfigStore.files_list_grid_view" :path="mdiViewList" />
53-
<NcIconSvgWrapper v-else :path="mdiViewGrid" />
52+
<NcIconSvgWrapper v-if="userConfigStore.files_list_grid_view" :path="mdiFormatListBulletedSquare" />
53+
<NcIconSvgWrapper v-else :path="mdiViewGridOutline" />
5454
</template>
5555
</NcButton>
5656
</div>
@@ -96,9 +96,9 @@ import {
9696
mdiChevronDown,
9797
mdiChevronUp,
9898
mdiFolder,
99+
mdiFormatListBulletedSquare,
99100
mdiReload,
100-
mdiViewGrid,
101-
mdiViewList,
101+
mdiViewGridOutline,
102102
} from '@mdi/js'
103103
104104
import NcActionButton from '@nextcloud/vue/components/NcActionButton'
@@ -147,9 +147,9 @@ export default {
147147
mdiChevronDown,
148148
mdiChevronUp,
149149
mdiFolder,
150+
mdiFormatListBulletedSquare,
150151
mdiReload,
151-
mdiViewGrid,
152-
mdiViewList,
152+
mdiViewGridOutline,
153153
}
154154
},
155155
data() {

0 commit comments

Comments
 (0)