Merge pull request #54075 from nextcloud/feat/material-icons-outline

apps/files/src/actions/deleteAction.ts

@@ -10,7 +10,7 @@ import PQueue from 'p-queue'
 
 import CloseSvg from '@mdi/svg/svg/close.svg?raw'
 import NetworkOffSvg from '@mdi/svg/svg/network-off.svg?raw'
-import TrashCanSvg from '@mdi/svg/svg/trash-can.svg?raw'
+import TrashCanSvg from '@mdi/svg/svg/trash-can-outline.svg?raw'
 
 import { TRASHBIN_VIEW_ID } from '../../../files_trashbin/src/files_views/trashbinView.ts'
 import { askConfirmation, canDisconnectOnly, canUnshareOnly, deleteNode, displayName, shouldAskForConfirmation } from './deleteUtils.ts'

apps/files/src/actions/moveOrCopyAction.ts

@@ -16,8 +16,8 @@ import { openConflictPicker, hasConflict } from '@nextcloud/upload'
 import { basename, join } from 'path'
 import Vue from 'vue'
 
-import CopyIconSvg from '@mdi/svg/svg/folder-multiple.svg?raw'
-import FolderMoveSvg from '@mdi/svg/svg/folder-move.svg?raw'
+import CopyIconSvg from '@mdi/svg/svg/folder-multiple-outline.svg?raw'
+import FolderMoveSvg from '@mdi/svg/svg/folder-move-outline.svg?raw'
 
 import { MoveCopyAction, canCopy, canMove, getQueue } from './moveOrCopyActionUtils'
 import { getContents } from '../services/Files'

apps/files/src/actions/renameAction.ts

@@ -5,7 +5,7 @@
 import { emit } from '@nextcloud/event-bus'
 import { Permission, type Node, FileAction, View } from '@nextcloud/files'
 import { translate as t } from '@nextcloud/l10n'
-import PencilSvg from '@mdi/svg/svg/pencil.svg?raw'
+import PencilSvg from '@mdi/svg/svg/pencil-outline.svg?raw'
 import { getPinia } from '../store'
 import { useFilesStore } from '../store/files'
 import { dirname } from 'path'

apps/files/src/actions/viewInFolderAction.ts

@@ -2,10 +2,13 @@
  * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import { Node, FileType, Permission, View, FileAction } from '@nextcloud/files'
-import { translate as t } from '@nextcloud/l10n'
-import FolderMoveSvg from '@mdi/svg/svg/folder-move.svg?raw'
+import type { Node, View } from '@nextcloud/files'
+
 import { isPublicShare } from '@nextcloud/sharing/public'
+import { FileAction, FileType, Permission } from '@nextcloud/files'
+import { t } from '@nextcloud/l10n'
+
+import FolderMoveSvg from '@mdi/svg/svg/folder-move-outline.svg?raw'
 
 export const action = new FileAction({
 	id: 'view-in-folder',

apps/files/src/components/NavigationQuota.vue

@@ -33,7 +33,7 @@ import { subscribe } from '@nextcloud/event-bus'
 import { translate } from '@nextcloud/l10n'
 import axios from '@nextcloud/axios'
 
-import ChartPie from 'vue-material-design-icons/ChartPie.vue'
+import ChartPie from 'vue-material-design-icons/ChartPieOutline.vue'
 import NcAppNavigationItem from '@nextcloud/vue/components/NcAppNavigationItem'
 import NcProgressBar from '@nextcloud/vue/components/NcProgressBar'
 

apps/files/src/newMenu/newFolder.ts

@@ -12,7 +12,7 @@ import { showError, showInfo, showSuccess } from '@nextcloud/dialogs'
 import { translate as t } from '@nextcloud/l10n'
 import axios from '@nextcloud/axios'
 
-import FolderPlusSvg from '@mdi/svg/svg/folder-plus.svg?raw'
+import FolderPlusSvg from '@mdi/svg/svg/folder-plus-outline.svg?raw'
 
 import { newNodeName } from '../utils/newNodeDialog'
 import logger from '../logger'

apps/files/src/views/FilesList.vue

@@ -181,7 +181,7 @@ import IconAlertCircleOutline from 'vue-material-design-icons/AlertCircleOutline
 import IconReload from 'vue-material-design-icons/Reload.vue'
 import LinkIcon from 'vue-material-design-icons/Link.vue'
 import ListViewIcon from 'vue-material-design-icons/FormatListBulletedSquare.vue'
-import ViewGridIcon from 'vue-material-design-icons/ViewGrid.vue'
+import ViewGridIcon from 'vue-material-design-icons/ViewGridOutline.vue'
 
 import { action as sidebarAction } from '../actions/sidebarAction.ts'
 import { useFileListWidth } from '../composables/useFileListWidth.ts'

apps/files/src/views/Navigation.vue

@@ -47,7 +47,7 @@ import { getNavigation } from '@nextcloud/files'
 import { t, getCanonicalLocale, getLanguage } from '@nextcloud/l10n'
 import { defineComponent } from 'vue'
 
-import IconCog from 'vue-material-design-icons/Cog.vue'
+import IconCog from 'vue-material-design-icons/CogOutline.vue'
 import NcAppNavigation from '@nextcloud/vue/components/NcAppNavigation'
 import NcAppNavigationItem from '@nextcloud/vue/components/NcAppNavigationItem'
 import NcAppNavigationList from '@nextcloud/vue/components/NcAppNavigationList'

apps/files/src/views/favorites.ts

@@ -10,7 +10,7 @@ import { getFavoriteNodes } from '@nextcloud/files/dav'
 import { subscribe } from '@nextcloud/event-bus'
 
 import FolderSvg from '@mdi/svg/svg/folder.svg?raw'
-import StarSvg from '@mdi/svg/svg/star.svg?raw'
+import StarSvg from '@mdi/svg/svg/star-outline.svg?raw'
 
 import { client } from '../services/WebdavClient.ts'
 import { getContents } from '../services/Favorites'

apps/files/src/views/files.ts

@@ -10,7 +10,7 @@ import { getContents } from '../services/Files.ts'
 import { useActiveStore } from '../store/active.ts'
 import { defaultView } from '../utils/filesViews.ts'
 
-import FolderSvg from '@mdi/svg/svg/folder.svg?raw'
+import FolderSvg from '@mdi/svg/svg/folder-outline.svg?raw'
 
 export const VIEW_ID = 'files'
 

apps/files_sharing/src/files_actions/sharingStatusAction.ts

@@ -8,8 +8,8 @@ import { translate as t } from '@nextcloud/l10n'
 import { ShareType } from '@nextcloud/sharing'
 import { isPublicShare } from '@nextcloud/sharing/public'
 
-import AccountGroupSvg from '@mdi/svg/svg/account-group.svg?raw'
-import AccountPlusSvg from '@mdi/svg/svg/account-plus.svg?raw'
+import AccountGroupSvg from '@mdi/svg/svg/account-group-outline.svg?raw'
+import AccountPlusSvg from '@mdi/svg/svg/account-plus-outline.svg?raw'
 import LinkSvg from '@mdi/svg/svg/link.svg?raw'
 import CircleSvg from '../../../../core/img/apps/circles.svg?raw'
 

apps/files_sharing/src/files_newMenu/newFileRequest.ts

@@ -7,7 +7,7 @@ import type { Entry, Folder, Node } from '@nextcloud/files'
 import { defineAsyncComponent } from 'vue'
 import { spawnDialog } from '@nextcloud/dialogs'
 import { translate as t } from '@nextcloud/l10n'
-import FileUploadSvg from '@mdi/svg/svg/file-upload.svg?raw'
+import FileUploadSvg from '@mdi/svg/svg/file-upload-outline.svg?raw'
 
 import Config from '../services/ConfigService'
 import { isPublicShare } from '@nextcloud/sharing/public'

apps/settings/img/password.svg

@@ -1 +1 @@
-<svg viewBox="0 0 16 16" height="16" width="16" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2"><path d="M6.308 21.5c-.497 0-.923-.177-1.277-.531a1.742 1.742 0 0 1-.531-1.277v-9.384c0-.497.177-.923.531-1.277.354-.354.78-.531 1.277-.531H7.5v-2c0-1.249.438-2.311 1.314-3.187C9.689 2.438 10.751 2 12 2c1.249 0 2.311.438 3.187 1.313.875.876 1.313 1.938 1.313 3.187v2h1.192c.497 0 .923.177 1.277.531.354.354.531.78.531 1.277v9.384c0 .497-.177.923-.531 1.277-.354.354-.78.531-1.277.531H6.308ZM12 16.75c.486 0 .899-.17 1.24-.51.34-.341.51-.754.51-1.24s-.17-.899-.51-1.239A1.688 1.688 0 0 0 12 13.25c-.486 0-.899.17-1.239.511-.341.34-.511.753-.511 1.239 0 .486.17.899.511 1.24.34.34.753.51 1.239.51ZM9 8.5h6v-2c0-.833-.292-1.542-.875-2.125A2.894 2.894 0 0 0 12 3.5c-.833 0-1.542.292-2.125.875A2.894 2.894 0 0 0 9 6.5v2Z" style="fill-rule:nonzero" transform="matrix(.71795 0 0 .71795 -.61 -.414)"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" height="16" width="16"><path d="M12,17C10.89,17 10,16.1 10,15C10,13.89 10.89,13 12,13A2,2 0 0,1 14,15A2,2 0 0,1 12,17M18,20V10H6V20H18M18,8A2,2 0 0,1 20,10V20A2,2 0 0,1 18,22H6C4.89,22 4,21.1 4,20V10C4,8.89 4.89,8 6,8H7V6A5,5 0 0,1 12,1A5,5 0 0,1 17,6V8H18M12,3A3,3 0 0,0 9,6V8H15V6A3,3 0 0,0 12,3Z" /></svg>

apps/settings/img/personal.svg

@@ -1 +1 @@
-<svg viewBox="0 0 16 16" height="16" width="16" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2"><path d="M12 11.692c-.962 0-1.786-.342-2.472-1.028C8.843 9.979 8.5 9.155 8.5 8.192c0-.962.343-1.786 1.028-2.471.686-.686 1.51-1.029 2.472-1.029.963 0 1.786.343 2.472 1.029.685.685 1.028 1.509 1.028 2.471 0 .963-.343 1.787-1.028 2.472-.686.686-1.509 1.028-2.472 1.028Zm-7.5 7.616v-2.224c0-.489.133-.943.399-1.36a2.663 2.663 0 0 1 1.067-.962 14.51 14.51 0 0 1 2.991-1.091 12.965 12.965 0 0 1 6.086 0c1.006.243 2.003.606 2.992 1.091.445.224.8.545 1.066.962.266.417.399.871.399 1.36v2.224h-15Z" style="fill-rule:nonzero" transform="matrix(.95789 0 0 .95789 -3.484 -3.495)"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" height="16" width="16"><path d="M12,4A4,4 0 0,1 16,8A4,4 0 0,1 12,12A4,4 0 0,1 8,8A4,4 0 0,1 12,4M12,6A2,2 0 0,0 10,8A2,2 0 0,0 12,10A2,2 0 0,0 14,8A2,2 0 0,0 12,6M12,13C14.67,13 20,14.33 20,17V20H4V17C4,14.33 9.33,13 12,13M12,14.9C9.03,14.9 5.9,16.36 5.9,17V18.1H18.1V17C18.1,16.36 14.97,14.9 12,14.9Z" /></svg>

apps/settings/img/users-white.svg

@@ -1 +1 @@
-<svg viewBox="0 0 16 16" height="16" width="16" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2"><path d="M1.798 19.308v-2.224c0-.515.133-.975.399-1.379a2.721 2.721 0 0 1 1.066-.944c.95-.465 1.906-.823 2.867-1.076.961-.251 2.017-.377 3.168-.377 1.151 0 2.207.126 3.168.377.961.253 1.917.611 2.867 1.076.445.225.8.539 1.066.944.266.404.399.864.399 1.379v2.224h-15Zm17 0v-2.346c0-.657-.161-1.282-.482-1.877a4.533 4.533 0 0 0-1.368-1.531c.671.1 1.307.255 1.91.464.602.21 1.177.458 1.725.744.516.275.915.6 1.197.974.281.374.422.783.422 1.226v2.346h-3.404Zm-9.5-7.616c-.962 0-1.786-.342-2.472-1.028-.685-.685-1.028-1.509-1.028-2.472 0-.962.343-1.786 1.028-2.471.686-.686 1.51-1.029 2.472-1.029.963 0 1.787.343 2.472 1.029.685.685 1.028 1.509 1.028 2.471 0 .963-.343 1.787-1.028 2.472a3.367 3.367 0 0 1-2.472 1.028Zm8.635-3.5c0 .963-.343 1.787-1.028 2.472-.686.686-1.51 1.028-2.472 1.028-.113 0-.257-.013-.431-.038a3.814 3.814 0 0 1-.431-.085c.395-.474.698-1 .91-1.578a5.209 5.209 0 0 0-.007-3.593 5.774 5.774 0 0 0-.903-1.582c.144-.052.287-.085.431-.1.144-.016.287-.024.431-.024.962 0 1.786.343 2.472 1.029.685.685 1.028 1.509 1.028 2.471Z" style="fill:#fff;fill-rule:nonzero" transform="matrix(.78418 0 0 .78418 -1.41 -1.43)"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" height="16" width="16"><path fill="#fff" d="M13.07 10.41A5 5 0 0 0 13.07 4.59A3.39 3.39 0 0 1 15 4A3.5 3.5 0 0 1 15 11A3.39 3.39 0 0 1 13.07 10.41M5.5 7.5A3.5 3.5 0 1 1 9 11A3.5 3.5 0 0 1 5.5 7.5M7.5 7.5A1.5 1.5 0 1 0 9 6A1.5 1.5 0 0 0 7.5 7.5M16 17V19H2V17S2 13 9 13 16 17 16 17M14 17C13.86 16.22 12.67 15 9 15S4.07 16.31 4 17M15.95 13A5.32 5.32 0 0 1 18 17V19H22V17S22 13.37 15.94 13Z" /></svg>

apps/settings/img/users.svg

@@ -1 +1 @@
-<svg viewBox="0 0 16 16" height="16" width="16" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2"><path d="M1.798 19.308v-2.224c0-.515.133-.975.399-1.379a2.721 2.721 0 0 1 1.066-.944c.95-.465 1.906-.823 2.867-1.076.961-.251 2.017-.377 3.168-.377 1.151 0 2.207.126 3.168.377.961.253 1.917.611 2.867 1.076.445.225.8.539 1.066.944.266.404.399.864.399 1.379v2.224h-15Zm17 0v-2.346c0-.657-.161-1.282-.482-1.877a4.533 4.533 0 0 0-1.368-1.531c.671.1 1.307.255 1.91.464.602.21 1.177.458 1.725.744.516.275.915.6 1.197.974.281.374.422.783.422 1.226v2.346h-3.404Zm-9.5-7.616c-.962 0-1.786-.342-2.472-1.028-.685-.685-1.028-1.509-1.028-2.472 0-.962.343-1.786 1.028-2.471.686-.686 1.51-1.029 2.472-1.029.963 0 1.787.343 2.472 1.029.685.685 1.028 1.509 1.028 2.471 0 .963-.343 1.787-1.028 2.472a3.367 3.367 0 0 1-2.472 1.028Zm8.635-3.5c0 .963-.343 1.787-1.028 2.472-.686.686-1.51 1.028-2.472 1.028-.113 0-.257-.013-.431-.038a3.814 3.814 0 0 1-.431-.085c.395-.474.698-1 .91-1.578a5.209 5.209 0 0 0-.007-3.593 5.774 5.774 0 0 0-.903-1.582c.144-.052.287-.085.431-.1.144-.016.287-.024.431-.024.962 0 1.786.343 2.472 1.029.685.685 1.028 1.509 1.028 2.471Z" style="fill-rule:nonzero" transform="matrix(.78418 0 0 .78418 -1.41 -1.43)"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" height="16" width="16"><path d="M13.07 10.41A5 5 0 0 0 13.07 4.59A3.39 3.39 0 0 1 15 4A3.5 3.5 0 0 1 15 11A3.39 3.39 0 0 1 13.07 10.41M5.5 7.5A3.5 3.5 0 1 1 9 11A3.5 3.5 0 0 1 5.5 7.5M7.5 7.5A1.5 1.5 0 1 0 9 6A1.5 1.5 0 0 0 7.5 7.5M16 17V19H2V17S2 13 9 13 16 17 16 17M14 17C13.86 16.22 12.67 15 9 15S4.07 16.31 4 17M15.95 13A5.32 5.32 0 0 1 18 17V19H22V17S22 13.37 15.94 13Z" /></svg>

apps/systemtags/src/files_actions/bulkSystemTagsAction.ts

@@ -10,7 +10,7 @@ import { isPublicShare } from '@nextcloud/sharing/public'
 import { spawnDialog } from '@nextcloud/dialogs'
 import { t } from '@nextcloud/l10n'
 
-import TagMultipleSvg from '@mdi/svg/svg/tag-multiple.svg?raw'
+import TagMultipleSvg from '@mdi/svg/svg/tag-multiple-outline.svg?raw'
 
 /**
  * Spawn a dialog to add or remove tags from multiple nodes.

core/src/views/ContactsMenu.vue

@@ -62,17 +62,18 @@
 </template>
 
 <script>
-import axios from '@nextcloud/axios'
-import Contacts from 'vue-material-design-icons/Contacts.vue'
-import debounce from 'debounce'
-import { getCurrentUser } from '@nextcloud/auth'
 import { generateUrl } from '@nextcloud/router'
+import { getCurrentUser } from '@nextcloud/auth'
+import { t } from '@nextcloud/l10n'
+import axios from '@nextcloud/axios'
+import debounce from 'debounce'
+
+import Contacts from 'vue-material-design-icons/ContactsOutline.vue'
 import Magnify from 'vue-material-design-icons/Magnify.vue'
 import NcButton from '@nextcloud/vue/components/NcButton'
 import NcEmptyContent from '@nextcloud/vue/components/NcEmptyContent'
 import NcHeaderMenu from '@nextcloud/vue/components/NcHeaderMenu'
 import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon'
-import { translate as t } from '@nextcloud/l10n'
 
 import Contact from '../components/ContactsMenu/Contact.vue'
 import logger from '../logger.js'

dist/7457-7457.js.license

@@ -32,9 +32,6 @@ This file is generated from multiple sources. Included packages:
 - @mdi/js
 	- version: 7.4.47
 	- license: Apache-2.0
-- @mdi/svg
-	- version: 7.4.47
-	- license: Apache-2.0
 - @nextcloud/auth
 	- version: 2.5.1
 	- license: GPL-3.0-or-later

dist/files_sharing-init-public.js.license

@@ -2,7 +2,6 @@ SPDX-License-Identifier: MIT
 SPDX-License-Identifier: ISC
 SPDX-License-Identifier: GPL-3.0-or-later
 SPDX-License-Identifier: BSD-3-Clause
-SPDX-License-Identifier: Apache-2.0
 SPDX-License-Identifier: AGPL-3.0-or-later
 SPDX-License-Identifier: (MPL-2.0 OR Apache-2.0)
 SPDX-FileCopyrightText: string_decoder developers
@@ -24,14 +23,10 @@ SPDX-FileCopyrightText: Evan You
 SPDX-FileCopyrightText: Eduardo San Martin Morote
 SPDX-FileCopyrightText: Dr.-Ing. Mario Heiderich, Cure53 <mario@cure53.de> (https://cure53.de/)
 SPDX-FileCopyrightText: Christoph Wurst
-SPDX-FileCopyrightText: Austin Andrews
 SPDX-FileCopyrightText: Alkemics
 
 
 This file is generated from multiple sources. Included packages:
-- @mdi/svg
-	- version: 7.4.47
-	- license: Apache-2.0
 - @nextcloud/auth
 	- version: 2.5.1
 	- license: GPL-3.0-or-later