Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Override vue MDI icons #34

Merged
merged 5 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/easycloud-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
paths:
- '.github/workflows/**'
- 'src/**'
- 'custom-npms/**'
- 'apps/**'
- 'apps/**/appinfo/info.xml'
- 'apps-custom/**'
Expand Down Expand Up @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@
[submodule "apps-custom/nc_theming"]
path = apps-custom/nc_theming
url = [email protected]:IONOS-Productivity/nc-theming.git
[submodule "custom-npms/nc-vue-material-design-icons"]
path = custom-npms/nc-vue-material-design-icons
url = [email protected]:IONOS-Productivity/nc-vue-material-design-icons.git
2 changes: 1 addition & 1 deletion IONOS
Submodule IONOS updated from 411547 to 3bc850
21 changes: 13 additions & 8 deletions apps/files/src/components/FilesListVirtual.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions custom-npms/nc-vue-material-design-icons
14 changes: 9 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
printminion-co marked this conversation as resolved.
Show resolved Hide resolved
}
}
2 changes: 1 addition & 1 deletion themes/nc-ionos-theme
Loading