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.

Sign up for GitHub

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

Feat/rotterdam design system #3

Merged
merged 8 commits into from
Dec 11, 2024
Merged

Feat/rotterdam design system #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1ee5320
build: add dependencies and GitHub Actions
Robbert Dec 11, 2024
2bbb9f6
feat: add Rotterdam Design System CSS
Robbert Dec 11, 2024
b2c246c
chore: add dependencies to Git
Robbert Dec 11, 2024
4515f59
refactor: do not include Rotterdam theme twice
Robbert Dec 11, 2024
fc61da5
Added theme-cache to .gitignore, removed quotes around build script c…
Dec 11, 2024
d1e3dd3
Added 2 more files to commit
Dec 11, 2024
895b3ea
Fixed merge conflict for main.scss
Dec 11, 2024
9d1013e
Resolve merge conflicts
Dec 11, 2024
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,6 @@ tmp/
/**/node_modules/
!/javascriptsource/**/node_modules/
/nativemobile/builds/
/theme-cache/
/vendorlib/temp/
.DS_Store
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
},
"scripts": {
"clean": "rimraf themes/web/",
"build": "npm-run-all 'build:**'",
"build": "npm-run-all build:**",
"build:design-tokens": "cp -R node_modules/@gemeente-rotterdam/design-tokens/dist/theme.css theme/web/theme.css",
"build:font-assets": "cp -R node_modules/@gemeente-rotterdam/font/src/*.woff node_modules/@gemeente-rotterdam/font/src/*.woff2 theme/web/",
"build:font-css": "cp -R node_modules/@gemeente-rotterdam/font/src/index.scss theme/web/font.css",
"build:mendix-css": "cp -R node_modules/@gemeente-rotterdam/mendix-css/dist/mendix-nl-design-system-rotterdam-theme.css theme/web/mendix-nl-design-system-rotterdam-theme.css",
"build:mendix-css": "cp -R node_modules/@gemeente-rotterdam/mendix-css/dist/mendix-nl-design-system-theme.css theme/web/mendix-nl-design-system-theme.css",
"lint-build": "sass theme/web/:tmp/"
},
"packageManager": "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion theme/web/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "rotterdam-mendix-variables";
@import "custom-variables";
@import "./theme.css";
@import "mendix-nl-design-system-rotterdam-theme";
@import "mendix-nl-design-system-theme";
@import "font";
Loading
Loading