Skip to content

Commit

Permalink
Merge pull request #73 from ConductionNL/development
Browse files Browse the repository at this point in the history 
Development to main, week 49
  • Loading branch information
@remko48
remko48 authored Dec 11, 2023
2 parents be21fa2 + ec118ee commit c4e9615
Show file tree
Hide file tree
Showing 34 changed files with 1,012 additions and 1 deletion.
2 changes: 2 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ Conduction's design tokens theme

- **Version 1**

- 1.0.59: Updated radio-button tokens in Rotterdam theme.
- 1.0.58: Added radio-button tokens in all themes.
- 1.0.57: Added navbar to logo tokens in all themes.
- 1.0.56:
- Added DownloadCard tokens to all themes.
Expand Down
14 changes: 14 additions & 0 deletions conduction-design-tokens/src/component/utrecht/extra-tokens/radio-button.tokens.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"utrecht": {
"radio-button": {
"min-block-size": { "value": "16px" },
"min-inline-size": { "value": "16px" },
"checked-disabled": {
"border-color": { "value": "{conduction.color.grey.82}" },
"border-width": { "value": "{conduction.size.4xs}" },
"background-color": { "value": "{conduction.color.white.100}" },
"color": { "value": "{conduction.color.grey.82}" }
}
}
}
}
68 changes: 68 additions & 0 deletions conduction-design-tokens/src/component/utrecht/radio-button.tokens.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{
"utrecht": {
"radio-button": {
"background-color": { "value": "{conduction.color.white.100}" },
"border-color": { "value": "{conduction.color.grey.46}" },
"border-width": { "value": "{conduction.size.4xs}" },
"size": {},
"margin-block-start": {},
"icon": {
"size": { "value": "5px" }
},
"active": {
"border-color": {},
"border-width": {},
"background-color": {},
"color": {}
},
"checked": {
"border-color": { "value": "{conduction.color.primary}" },
"border-width": { "value": "{conduction.size.4xs}" },
"background-color": { "value": "{conduction.color.white.100}" },
"color": { "value": "{conduction.color.primary}" },
"active": {
"border-color": { "value": "{conduction.color.primary}" },
"border-width": { "value": "{conduction.size.4xs}" },
"background-color": { "value": "{conduction.color.white.100}" },
"color": { "value": "{conduction.color.primary}" }
},
"hover": {
"border-color": { "value": "{conduction.color.primary-hover}" },
"border-width": { "value": "{conduction.size.4xs}" },
"background-color": { "value": "{conduction.color.white.100}" },
"color": { "value": "{conduction.color.primary-hover}" }
},
"focus": {
"border-color": { "value": "{conduction.color.primary}" },
"border-width": { "value": "{conduction.size.4xs}" },
"background-color": { "value": "{conduction.color.white.100}" },
"color": { "value": "{conduction.color.primary}" }
}
},
"hover": {
"border-color": { "value": "{conduction.color.grey.31}" },
"border-width": { "value": "{conduction.size.4xs}" },
"background-color": { "value": "{conduction.color.white.100}" },
"color": {}
},
"focus": {
"border-color": { "value": "{conduction.color.primary}" },
"border-width": { "value": "{conduction.size.4xs}" },
"background-color": { "value": "{conduction.color.white.100}" },
"color": { "value": "{conduction.color.primary}" }
},
"disabled": {
"border-color": { "value": "{conduction.color.grey.82}" },
"border-width": { "value": "{conduction.size.4xs}" },
"background-color": { "value": "{conduction.color.grey.97}" },
"color": { "value": "{conduction.color.grey.82}" }
},
"invalid": {
"border-color": { "value": "{conduction.color.error}" },
"border-width": { "value": "{conduction.size.4xs}" },
"background-color": { "value": "{conduction.color.white.100}" },
"color": { "value": "{conduction.color.error}" }
}
}
}
}
14 changes: 14 additions & 0 deletions ...es/commonground-design-tokens/src/component/utrecht/extra-tokens/radio-button.tokens.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"utrecht": {
"radio-button": {
"min-block-size": { "value": "16px" },
"min-inline-size": { "value": "16px" },
"checked-disabled": {
"border-color": { "value": "{commonground.color.grey.82}" },
"border-width": { "value": "{commonground.size.4xs}" },
"background-color": { "value": "{commonground.color.white.100}" },
"color": { "value": "{commonground.color.grey.82}" }
}
}
}
}
68 changes: 68 additions & 0 deletions municipalities/commonground-design-tokens/src/component/utrecht/radio-button.tokens.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{
"utrecht": {
"radio-button": {
"background-color": { "value": "{commonground.color.white.100}" },
"border-color": { "value": "{commonground.color.grey.46}" },
"border-width": { "value": "{commonground.size.4xs}" },
"size": {},
"margin-block-start": {},
"icon": {
"size": { "value": "5px" }
},
"active": {
"border-color": {},
"border-width": {},
"background-color": {},
"color": {}
},
"checked": {
"border-color": { "value": "{commonground.color.primary}" },
"border-width": { "value": "{commonground.size.4xs}" },
"background-color": { "value": "{commonground.color.white.100}" },
"color": { "value": "{commonground.color.primary}" },
"active": {
"border-color": { "value": "{commonground.color.primary}" },
"border-width": { "value": "{commonground.size.4xs}" },
"background-color": { "value": "{commonground.color.white.100}" },
"color": { "value": "{commonground.color.primary}" }
},
"hover": {
"border-color": { "value": "{commonground.color.primary-hover}" },
"border-width": { "value": "{commonground.size.4xs}" },
"background-color": { "value": "{commonground.color.white.100}" },
"color": { "value": "{commonground.color.primary-hover}" }
},
"focus": {
"border-color": { "value": "{commonground.color.primary}" },
"border-width": { "value": "{commonground.size.4xs}" },
"background-color": { "value": "{commonground.color.white.100}" },
"color": { "value": "{commonground.color.primary}" }
}
},
"hover": {
"border-color": { "value": "{commonground.color.grey.31}" },
"border-width": { "value": "{commonground.size.4xs}" },
"background-color": { "value": "{commonground.color.white.100}" },
"color": {}
},
"focus": {
"border-color": { "value": "{commonground.color.primary}" },
"border-width": { "value": "{commonground.size.4xs}" },
"background-color": { "value": "{commonground.color.white.100}" },
"color": { "value": "{commonground.color.primary}" }
},
"disabled": {
"border-color": { "value": "{commonground.color.grey.82}" },
"border-width": { "value": "{commonground.size.4xs}" },
"background-color": { "value": "{commonground.color.grey.97}" },
"color": { "value": "{commonground.color.grey.82}" }
},
"invalid": {
"border-color": { "value": "{commonground.color.error}" },
"border-width": { "value": "{commonground.size.4xs}" },
"background-color": { "value": "{commonground.color.white.100}" },
"color": { "value": "{commonground.color.error}" }
}
}
}
}
3 changes: 3 additions & 0 deletions municipalities/dimpact-design-tokens/src/brand/dimpact/color.tokens.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@
},
"93": {
"value": "#eeeeee"
},
"97": {
"value": "#f7f7f7"
}
},
"light-grey": {
Expand Down
14 changes: 14 additions & 0 deletions ...alities/dimpact-design-tokens/src/component/utrecht/extra-tokens/radio-button.tokens.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"utrecht": {
"radio-button": {
"min-block-size": { "value": "16px" },
"min-inline-size": { "value": "16px" },
"checked-disabled": {
"border-color": { "value": "{dimpact.color.grey.82}" },
"border-width": { "value": "{dimpact.size.4xs}" },
"background-color": { "value": "{dimpact.color.white.100}" },
"color": { "value": "{dimpact.color.grey.82}" }
}
}
}
}
68 changes: 68 additions & 0 deletions municipalities/dimpact-design-tokens/src/component/utrecht/radio-button.tokens.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{
"utrecht": {
"radio-button": {
"background-color": { "value": "{dimpact.color.white.100}" },
"border-color": { "value": "{dimpact.color.grey.46}" },
"border-width": { "value": "{dimpact.size.4xs}" },
"size": {},
"margin-block-start": {},
"icon": {
"size": { "value": "5px" }
},
"active": {
"border-color": {},
"border-width": {},
"background-color": {},
"color": {}
},
"checked": {
"border-color": { "value": "{dimpact.color.primary}" },
"border-width": { "value": "{dimpact.size.4xs}" },
"background-color": { "value": "{dimpact.color.white.100}" },
"color": { "value": "{dimpact.color.primary}" },
"active": {
"border-color": { "value": "{dimpact.color.primary}" },
"border-width": { "value": "{dimpact.size.4xs}" },
"background-color": { "value": "{dimpact.color.white.100}" },
"color": { "value": "{dimpact.color.primary}" }
},
"hover": {
"border-color": { "value": "{dimpact.color.primary-hover}" },
"border-width": { "value": "{dimpact.size.4xs}" },
"background-color": { "value": "{dimpact.color.white.100}" },
"color": { "value": "{dimpact.color.primary-hover}" }
},
"focus": {
"border-color": { "value": "{dimpact.color.primary}" },
"border-width": { "value": "{dimpact.size.4xs}" },
"background-color": { "value": "{dimpact.color.white.100}" },
"color": { "value": "{dimpact.color.primary}" }
}
},
"hover": {
"border-color": { "value": "{dimpact.color.grey.31}" },
"border-width": { "value": "{dimpact.size.4xs}" },
"background-color": { "value": "{dimpact.color.white.100}" },
"color": {}
},
"focus": {
"border-color": { "value": "{dimpact.color.primary}" },
"border-width": { "value": "{dimpact.size.4xs}" },
"background-color": { "value": "{dimpact.color.white.100}" },
"color": { "value": "{dimpact.color.primary}" }
},
"disabled": {
"border-color": { "value": "{dimpact.color.grey.82}" },
"border-width": { "value": "{dimpact.size.4xs}" },
"background-color": { "value": "{dimpact.color.grey.97}" },
"color": { "value": "{dimpact.color.grey.82}" }
},
"invalid": {
"border-color": { "value": "{dimpact.color.error}" },
"border-width": { "value": "{dimpact.size.4xs}" },
"background-color": { "value": "{dimpact.color.white.100}" },
"color": { "value": "{dimpact.color.error}" }
}
}
}
}
3 changes: 3 additions & 0 deletions municipalities/dinkelland-design-tokens/src/brand/dinkelland/color.tokens.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@
},
"94": {
"value": "#edeff2"
},
"97": {
"value": "#f7f7f7"
}
},
"lightgrey": {
Expand Down
14 changes: 14 additions & 0 deletions ...ties/dinkelland-design-tokens/src/component/utrecht/extra-tokens/radio-button.tokens.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"utrecht": {
"radio-button": {
"min-block-size": { "value": "16px" },
"min-inline-size": { "value": "16px" },
"checked-disabled": {
"border-color": { "value": "{dinkelland.color.grey.82}" },
"border-width": { "value": "{dinkelland.size.4xs}" },
"background-color": { "value": "{dinkelland.color.white.100}" },
"color": { "value": "{dinkelland.color.grey.82}" }
}
}
}
}
68 changes: 68 additions & 0 deletions municipalities/dinkelland-design-tokens/src/component/utrecht/radio-button.tokens.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{
"utrecht": {
"radio-button": {
"background-color": { "value": "{dinkelland.color.white.100}" },
"border-color": { "value": "{dinkelland.color.grey.46}" },
"border-width": { "value": "{dinkelland.size.4xs}" },
"size": {},
"margin-block-start": {},
"icon": {
"size": { "value": "5px" }
},
"active": {
"border-color": {},
"border-width": {},
"background-color": {},
"color": {}
},
"checked": {
"border-color": { "value": "{dinkelland.color.primary}" },
"border-width": { "value": "{dinkelland.size.4xs}" },
"background-color": { "value": "{dinkelland.color.white.100}" },
"color": { "value": "{dinkelland.color.primary}" },
"active": {
"border-color": { "value": "{dinkelland.color.primary}" },
"border-width": { "value": "{dinkelland.size.4xs}" },
"background-color": { "value": "{dinkelland.color.white.100}" },
"color": { "value": "{dinkelland.color.primary}" }
},
"hover": {
"border-color": { "value": "{dinkelland.color.primary-hover}" },
"border-width": { "value": "{dinkelland.size.4xs}" },
"background-color": { "value": "{dinkelland.color.white.100}" },
"color": { "value": "{dinkelland.color.primary-hover}" }
},
"focus": {
"border-color": { "value": "{dinkelland.color.primary}" },
"border-width": { "value": "{dinkelland.size.4xs}" },
"background-color": { "value": "{dinkelland.color.white.100}" },
"color": { "value": "{dinkelland.color.primary}" }
}
},
"hover": {
"border-color": { "value": "{dinkelland.color.grey.31}" },
"border-width": { "value": "{dinkelland.size.4xs}" },
"background-color": { "value": "{dinkelland.color.white.100}" },
"color": {}
},
"focus": {
"border-color": { "value": "{dinkelland.color.primary}" },
"border-width": { "value": "{dinkelland.size.4xs}" },
"background-color": { "value": "{dinkelland.color.white.100}" },
"color": { "value": "{dinkelland.color.primary}" }
},
"disabled": {
"border-color": { "value": "{dinkelland.color.grey.82}" },
"border-width": { "value": "{dinkelland.size.4xs}" },
"background-color": { "value": "{dinkelland.color.grey.97}" },
"color": { "value": "{dinkelland.color.grey.82}" }
},
"invalid": {
"border-color": { "value": "{dinkelland.color.error}" },
"border-width": { "value": "{dinkelland.size.4xs}" },
"background-color": { "value": "{dinkelland.color.white.100}" },
"color": { "value": "{dinkelland.color.error}" }
}
}
}
}
3 changes: 3 additions & 0 deletions municipalities/epe-design-tokens/src/brand/epe/color.tokens.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@
},
"90": {
"value": "#e6e6e6"
},
"97": {
"value": "#f7f7f7"
}
},
"white": {
Expand Down
14 changes: 14 additions & 0 deletions municipalities/epe-design-tokens/src/component/utrecht/extra-tokens/radio-button.tokens.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"utrecht": {
"radio-button": {
"min-block-size": { "value": "16px" },
"min-inline-size": { "value": "16px" },
"checked-disabled": {
"border-color": { "value": "{epe.color.grey.82}" },
"border-width": { "value": "{epe.size.4xs}" },
"background-color": { "value": "{epe.color.white.100}" },
"color": { "value": "{epe.color.grey.82}" }
}
}
}
}
Loading

0 comments on commit c4e9615

Please sign in to comment.