Skip to content

Commit

Permalink
Merge pull request #349 from ConductionNL/development
Browse files Browse the repository at this point in the history
feature/HofvanTwente-theme
  • Loading branch information
remko48 authored Sep 19, 2024
2 parents 9c982aa + d0be7f1 commit cce8d5b
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion docs/componenten.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 5 additions & 4 deletions pwa/package-lock.json

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

2 changes: 1 addition & 1 deletion pwa/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"dependencies": {
"@conduction/components": "2.2.50",
"@conduction/theme": "1.1.34",
"@conduction/theme": "1.1.36",
"@fortawesome/fontawesome-svg-core": "^6.5.2",
"@fortawesome/free-brands-svg-icons": "6.5.2",
"@fortawesome/free-regular-svg-icons": "6.5.2",
Expand Down
1 change: 1 addition & 0 deletions pwa/src/styling/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
@import "../../node_modules/@conduction/theme/municipalities/roosendaal-design-tokens/dist/index.css";
@import "../../node_modules/@conduction/theme/municipalities/gooise-meren-design-tokens/dist/index.css";
@import "../../node_modules/@conduction/theme/municipalities/moerdijk-design-tokens/dist/index.css";
@import "../../node_modules/@conduction/theme/municipalities/hof-van-twente-design-tokens/dist/index.css";

/* Design Tokens maintained by Frameless */
@import "../../node_modules/@utrecht/design-tokens/dist/theme.css";
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

0 comments on commit cce8d5b

Please sign in to comment.