Skip to content

Commit

Permalink
Merge pull request #354 from ConductionNL/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
remko48 authored Nov 8, 2024
2 parents f60d445 + f83b84c commit 948aea6
Show file tree
Hide file tree
Showing 7 changed files with 71 additions and 32 deletions.
74 changes: 50 additions & 24 deletions pwa/package-lock.json

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

9 changes: 6 additions & 3 deletions pwa/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
"private": true,
"description": "Product Website Template",
"author": "Conduction",
"keywords": ["gatsby"],
"keywords": [
"gatsby"
],
"scripts": {
"dev": "gatsby develop",
"develop": "gatsby develop",
"start": "gatsby develop",
"build": "gatsby build --prefix-paths",
Expand All @@ -23,8 +26,8 @@
"prepare": "cd .. && husky install"
},
"dependencies": {
"@conduction/components": "2.2.50",
"@conduction/theme": "1.1.37",
"@conduction/components": "2.2.51",
"@conduction/theme": "1.1.38",
"@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/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@ body {

.utrecht-link--html-a:any-link:hover {
font-weight: var(--utrecht-link-hover-font-weight);
text-decoration-color: var(--utrecht-link-hover-text-decoration-color);
}
1 change: 1 addition & 0 deletions pwa/src/styling/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
@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";
@import "../../node_modules/@conduction/theme/municipalities/lansingerland-design-tokens/dist/index.css";

/* Design Tokens maintained by Frameless */
@import "../../node_modules/@utrecht/design-tokens/dist/theme.css";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,14 @@
--conduction-card-header-title-hover-color,
var(--conduction-card-header-title-color)
) !important;
text-decoration: var(
--conduction-card-header-title-hover-text-decoration,
var(--conduction-card-wrapper-title-text-decoration)
) !important;
text-underline-offset: var(
--conduction-card-header-title-hover-text-underline-offset,
var(--conduction-card-wrapper-title-text-underline-offset)
) !important;
}

.title {
Expand Down
Loading

0 comments on commit 948aea6

Please sign in to comment.