Skip to content

Commit cb410cd

Browse files
authored
Merge pull request #54075 from nextcloud/feat/material-icons-outline
2 parents 5fa71ab + a1c84cb commit cb410cd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+59
-63
lines changed

apps/files/src/actions/deleteAction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import PQueue from 'p-queue'
1010

1111
import CloseSvg from '@mdi/svg/svg/close.svg?raw'
1212
import NetworkOffSvg from '@mdi/svg/svg/network-off.svg?raw'
13-
import TrashCanSvg from '@mdi/svg/svg/trash-can.svg?raw'
13+
import TrashCanSvg from '@mdi/svg/svg/trash-can-outline.svg?raw'
1414

1515
import { TRASHBIN_VIEW_ID } from '../../../files_trashbin/src/files_views/trashbinView.ts'
1616
import { askConfirmation, canDisconnectOnly, canUnshareOnly, deleteNode, displayName, shouldAskForConfirmation } from './deleteUtils.ts'

apps/files/src/actions/moveOrCopyAction.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import { openConflictPicker, hasConflict } from '@nextcloud/upload'
1616
import { basename, join } from 'path'
1717
import Vue from 'vue'
1818

19-
import CopyIconSvg from '@mdi/svg/svg/folder-multiple.svg?raw'
20-
import FolderMoveSvg from '@mdi/svg/svg/folder-move.svg?raw'
19+
import CopyIconSvg from '@mdi/svg/svg/folder-multiple-outline.svg?raw'
20+
import FolderMoveSvg from '@mdi/svg/svg/folder-move-outline.svg?raw'
2121

2222
import { MoveCopyAction, canCopy, canMove, getQueue } from './moveOrCopyActionUtils'
2323
import { getContents } from '../services/Files'

apps/files/src/actions/renameAction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import { emit } from '@nextcloud/event-bus'
66
import { Permission, type Node, FileAction, View } from '@nextcloud/files'
77
import { translate as t } from '@nextcloud/l10n'
8-
import PencilSvg from '@mdi/svg/svg/pencil.svg?raw'
8+
import PencilSvg from '@mdi/svg/svg/pencil-outline.svg?raw'
99
import { getPinia } from '../store'
1010
import { useFilesStore } from '../store/files'
1111
import { dirname } from 'path'

apps/files/src/actions/viewInFolderAction.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
* SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
5-
import { Node, FileType, Permission, View, FileAction } from '@nextcloud/files'
6-
import { translate as t } from '@nextcloud/l10n'
7-
import FolderMoveSvg from '@mdi/svg/svg/folder-move.svg?raw'
5+
import type { Node, View } from '@nextcloud/files'
6+
87
import { isPublicShare } from '@nextcloud/sharing/public'
8+
import { FileAction, FileType, Permission } from '@nextcloud/files'
9+
import { t } from '@nextcloud/l10n'
10+
11+
import FolderMoveSvg from '@mdi/svg/svg/folder-move-outline.svg?raw'
912

1013
export const action = new FileAction({
1114
id: 'view-in-folder',

apps/files/src/components/NavigationQuota.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import { subscribe } from '@nextcloud/event-bus'
3333
import { translate } from '@nextcloud/l10n'
3434
import axios from '@nextcloud/axios'
3535
36-
import ChartPie from 'vue-material-design-icons/ChartPie.vue'
36+
import ChartPie from 'vue-material-design-icons/ChartPieOutline.vue'
3737
import NcAppNavigationItem from '@nextcloud/vue/components/NcAppNavigationItem'
3838
import NcProgressBar from '@nextcloud/vue/components/NcProgressBar'
3939

apps/files/src/newMenu/newFolder.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { showError, showInfo, showSuccess } from '@nextcloud/dialogs'
1212
import { translate as t } from '@nextcloud/l10n'
1313
import axios from '@nextcloud/axios'
1414

15-
import FolderPlusSvg from '@mdi/svg/svg/folder-plus.svg?raw'
15+
import FolderPlusSvg from '@mdi/svg/svg/folder-plus-outline.svg?raw'
1616

1717
import { newNodeName } from '../utils/newNodeDialog'
1818
import logger from '../logger'

apps/files/src/views/FilesList.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ import IconAlertCircleOutline from 'vue-material-design-icons/AlertCircleOutline
181181
import IconReload from 'vue-material-design-icons/Reload.vue'
182182
import LinkIcon from 'vue-material-design-icons/Link.vue'
183183
import ListViewIcon from 'vue-material-design-icons/FormatListBulletedSquare.vue'
184-
import ViewGridIcon from 'vue-material-design-icons/ViewGrid.vue'
184+
import ViewGridIcon from 'vue-material-design-icons/ViewGridOutline.vue'
185185
186186
import { action as sidebarAction } from '../actions/sidebarAction.ts'
187187
import { useFileListWidth } from '../composables/useFileListWidth.ts'

apps/files/src/views/Navigation.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import { getNavigation } from '@nextcloud/files'
4747
import { t, getCanonicalLocale, getLanguage } from '@nextcloud/l10n'
4848
import { defineComponent } from 'vue'
4949
50-
import IconCog from 'vue-material-design-icons/Cog.vue'
50+
import IconCog from 'vue-material-design-icons/CogOutline.vue'
5151
import NcAppNavigation from '@nextcloud/vue/components/NcAppNavigation'
5252
import NcAppNavigationItem from '@nextcloud/vue/components/NcAppNavigationItem'
5353
import NcAppNavigationList from '@nextcloud/vue/components/NcAppNavigationList'

apps/files/src/views/favorites.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { getFavoriteNodes } from '@nextcloud/files/dav'
1010
import { subscribe } from '@nextcloud/event-bus'
1111

1212
import FolderSvg from '@mdi/svg/svg/folder.svg?raw'
13-
import StarSvg from '@mdi/svg/svg/star.svg?raw'
13+
import StarSvg from '@mdi/svg/svg/star-outline.svg?raw'
1414

1515
import { client } from '../services/WebdavClient.ts'
1616
import { getContents } from '../services/Favorites'

apps/files/src/views/files.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { getContents } from '../services/Files.ts'
1010
import { useActiveStore } from '../store/active.ts'
1111
import { defaultView } from '../utils/filesViews.ts'
1212

13-
import FolderSvg from '@mdi/svg/svg/folder.svg?raw'
13+
import FolderSvg from '@mdi/svg/svg/folder-outline.svg?raw'
1414

1515
export const VIEW_ID = 'files'
1616

0 commit comments

Comments
 (0)