diff --git a/.github/workflows/easycloud-build.yml b/.github/workflows/easycloud-build.yml index 4090cad17aace..9a440287846ee 100644 --- a/.github/workflows/easycloud-build.yml +++ b/.github/workflows/easycloud-build.yml @@ -9,6 +9,7 @@ on: paths: - '.github/workflows/**' - 'src/**' + - 'custom-npms/**' - 'apps/**' - 'apps/**/appinfo/info.xml' - 'apps-custom/**' @@ -54,7 +55,7 @@ jobs: node-version-file: "package.json" - name: Build Nextcloud - run: make -f IONOS/Makefile build_nextcloud + run: make -f IONOS/Makefile build_nextcloud FONTAWESOME_PACKAGE_TOKEN=${{ secrets.FONTAWESOME_PACKAGE_TOKEN }} - name: Install dependencies & build simplesettings app env: diff --git a/.gitmodules b/.gitmodules index 69357bd76fc0c..eca06104ccc39 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,3 +25,6 @@ [submodule "apps-custom/nc_theming"] path = apps-custom/nc_theming url = git@github.com:IONOS-Productivity/nc-theming.git +[submodule "custom-npms/nc-vue-material-design-icons"] + path = custom-npms/nc-vue-material-design-icons + url = git@github.com:IONOS-Productivity/nc-vue-material-design-icons.git diff --git a/IONOS b/IONOS index 411547886cd85..3bc850b7f53e6 160000 --- a/IONOS +++ b/IONOS @@ -1 +1 @@ -Subproject commit 411547886cd85979ece4b812280ae53d1f85c224 +Subproject commit 3bc850b7f53e6bc00aa9bb3bac3693654a364e2e diff --git a/apps/files/src/components/FilesListVirtual.vue b/apps/files/src/components/FilesListVirtual.vue index c11d33f207acd..9fbc6c1281417 100644 --- a/apps/files/src/components/FilesListVirtual.vue +++ b/apps/files/src/components/FilesListVirtual.vue @@ -537,15 +537,11 @@ export default defineComponent({ width: var(--icon-preview-size); height: var(--icon-preview-size); } - - // Slightly increase the size of the folder icon + // Slightly decrease the size of the folder icon &.folder-icon, - &.folder-open-icon { - margin: -3px; - svg { - width: calc(var(--icon-preview-size) + 6px); - height: calc(var(--icon-preview-size) + 6px); - } + &.folder-open-icon svg { + width: calc(var(--icon-preview-size) - 6px); + height: calc(var(--icon-preview-size) - 6px); } } @@ -762,6 +758,15 @@ tbody.files-list__tbody.files-list__tbody--grid { // Visual balance, we use half of the clickable area // as a margin around the preview padding-top: var(--half-clickable-area); + + & > span { + // Slightly decrease the size of the folder icon + &.folder-icon, + &.folder-open-icon svg { + width: calc(var(--icon-preview-size) - 20px); + height: calc(var(--icon-preview-size) - 20px); + } + } } a.files-list__row-name-link { diff --git a/custom-npms/nc-vue-material-design-icons b/custom-npms/nc-vue-material-design-icons new file mode 160000 index 0000000000000..952419c24338b --- /dev/null +++ b/custom-npms/nc-vue-material-design-icons @@ -0,0 +1 @@ +Subproject commit 952419c24338b1b41e4eacc53b15364fab59ff81 diff --git a/package-lock.json b/package-lock.json index 4fa7e181793fb..daae14698e1d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -157,6 +157,7 @@ "tslib": "^2.6.3", "typescript": "^5.4.2", "vue-loader": "^15.9.8", + "vue-material-design-icons": "file:./custom-npms/nc-vue-material-design-icons/dist", "vue-template-compiler": "^2.7.16", "wait-on": "^7.2.0", "webpack": "^5.91.0", @@ -165,10 +166,14 @@ "workbox-webpack-plugin": "^7.0.0" }, "engines": { - "node": "^20.0.0", - "npm": "^10.0.0" + "node": "^20.15.0", + "npm": "^10.7.0" } }, + "custom-npms/nc-vue-material-design-icons/dist": { + "version": "3.2.0", + "license": "MIT" + }, "node_modules/@aashutoshrathi/word-wrap": { "version": "1.2.6", "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", @@ -27755,9 +27760,8 @@ "integrity": "sha512-29YQVVkIdoS6BZBCJAyu9d0OR0eKSm5gk5OjsLssV1+NM4zJnf9cxhN1AVeXkUHJLqOonECweuaR8PZ2x307dw==" }, "node_modules/vue-material-design-icons": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/vue-material-design-icons/-/vue-material-design-icons-5.3.0.tgz", - "integrity": "sha512-wnbRh+48RwX/Gt+iqwCSdWpm0hPBwwv9F7MSouUzZ2PsphYVMJB9KkG9iGs+tgBiT57ZiurFEK07Y/rFKx+Ekg==" + "resolved": "custom-npms/nc-vue-material-design-icons/dist", + "link": true }, "node_modules/vue-multiselect": { "version": "2.1.9", diff --git a/package.json b/package.json index 73395b90052e4..6c32092a7e052 100644 --- a/package.json +++ b/package.json @@ -189,7 +189,8 @@ "webpack": "^5.91.0", "webpack-cli": "^5.0.2", "webpack-merge": "^5.8.0", - "workbox-webpack-plugin": "^7.0.0" + "workbox-webpack-plugin": "^7.0.0", + "vue-material-design-icons": "file:./custom-npms/nc-vue-material-design-icons/dist" }, "browserslist": [ "extends @nextcloud/browserslist-config" @@ -199,6 +200,7 @@ "npm": "^10.7.0" }, "overrides": { - "colors": "1.4.0" - } + "colors": "1.4.0", + "vue-material-design-icons" : "$vue-material-design-icons" + } } diff --git a/themes/nc-ionos-theme b/themes/nc-ionos-theme index f63a8300717f2..64f65995a90a8 160000 --- a/themes/nc-ionos-theme +++ b/themes/nc-ionos-theme @@ -1 +1 @@ -Subproject commit f63a8300717f2bcaf53e5faca3bca646d23e8584 +Subproject commit 64f65995a90a876a51e926f0454c66de8f585ac8