Skip to content

Commit

Permalink
Merge pull request #104 from ConductionNL/development
Browse files Browse the repository at this point in the history
Development to main, week 10
  • Loading branch information
remko48 authored Mar 11, 2024
2 parents 7339b9d + 693d016 commit 5d39f12
Show file tree
Hide file tree
Showing 137 changed files with 1,939 additions and 296 deletions.
15 changes: 14 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,20 @@ Conduction's design tokens theme

- **Version 1.1 (breaking changes from 1.0.x)**

- 1.1.16 / 1.1.17: Updated open-webconcept logo.
- 1.1.24: Updated logo in Dimpact theme.
- 1.1.23:
- Added utrecht Calendar and Checkbox tokens to Leiden theme.
- Updated Leiden theme.
- Updated logo in Open-Webconcept theme.
- 1.1.22:
- Added skip-link tokens in all themes.
- Added focus tokens in all themes.
- Refactored all font-sizes from px to rem in all themes.
- 1.1.21: Fixed minor css parse errors.
- 1.1.20: Updated Open-Webconcept logo.
- 1.1.19: Fixed hex color code in Open-Webconcept theme.
- 1.1.18: Removed empty variables in all themes.
- 1.1.16 / 1.1.17: Updated Open-Webconcept logo.
- 1.1.14 / 1.1.15:
- Added postinstall to package.json.
- 1.1.13:
Expand Down
10 changes: 10 additions & 0 deletions conduction-design-tokens/src/brand/conduction/color.tokens.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
"alert-info": { "value": "#004085" },
"alert-info-background": { "value": "#cce5ff" },
"grey": {
"27": {
"value": "#444444"
},
"29": {
"value": "#4a4a4a"
},
Expand All @@ -39,6 +42,9 @@
"82": {
"value": "#d1d1d1"
},
"87": {
"value": "#dddddd"
},
"97": {
"value": "#f7f7f7"
}
Expand All @@ -63,6 +69,10 @@
"value": "#000000",
"comment": "Base/Black"
},
"0-60t": {
"value": "#00000099",
"comment": "Black with 60% transparency"
},
"30": {
"value": "#4d4d4d"
}
Expand Down
55 changes: 44 additions & 11 deletions conduction-design-tokens/src/brand/conduction/font-size.tokens.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,50 @@
{
"conduction": {
"font-size": {
"4xs": { "value": "5px" },
"3xs": { "value": "8px" },
"2xs": { "value": "10px" },
"xs": { "value": "12px" },
"sm": { "value": "14px" },
"md": { "value": "18px" },
"lg": { "value": "20px" },
"xl": { "value": "24px" },
"2xl": { "value": "32px" },
"3xl": { "value": "48px" },
"4xl": { "value": "58px" }
"4xs": {
"value": "0.313rem",
"comment": "5px"
},
"3xs": {
"value": "0.5rem",
"comment": "8px"
},
"2xs": {
"value": "0.625rem",
"comment": "10px"
},
"xs": {
"value": "0.75rem",
"comment": "12px"
},
"sm": {
"value": "0.875rem",
"comment": "14px"
},
"md": {
"value": "1.125rem",
"comment": "18px"
},
"lg": {
"value": "1.25rem",
"comment": "20px"
},
"xl": {
"value": "1.5rem",
"comment": "24px"
},
"2xl": {
"value": "2rem",
"comment": "32px"
},
"3xl": {
"value": "3rem",
"comment": "48px"
},
"4xl": {
"value": "3.625rem",
"comment": "58px"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"current": {
"color": { "value": "{conduction.color.primary}" },
"background-color": { "value": "{conduction.color.white.100}" },
"box-shadow": { "value": "" },
"box-shadow": { "value": "unset" },
"mobile": {
"box-shadow": { "value": "" }
"box-shadow": { "value": "unset" }
},
"font-weight": {}
},
Expand All @@ -34,9 +34,9 @@
"current": {
"color": { "value": "{conduction.color.primary}" },
"background-color": { "value": "{conduction.color.white.100}" },
"box-shadow": { "value": "" },
"box-shadow": { "value": "unset" },
"mobile": {
"box-shadow": { "value": "" }
"box-shadow": { "value": "unset" }
},
"font-weight": {}
}
Expand All @@ -62,7 +62,7 @@
"current": {
"color": { "value": "{conduction.color.primary}" },
"background-color": { "value": "{conduction.color.white.100}" },
"box-shadow": { "value": "" }
"box-shadow": { "value": "unset" }
},
"font-size": { "value": "{conduction.font-size.md}" },
"font-weight": { "value": "400" },
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"utrecht": {
"skip-link": {
"font-weight": { "value": "{conduction.typography.font-weight.bold}" },
"font-size": { "value": "{conduction.font-size.md}" },
"outline-style": { "value": "none" },
"outline-color": {},
"border-radius": { "value": "3px" },
"focus": {
"text-decoration": { "value": "{utrecht.skip-link.text-decoration}" }
},
"inset-block-start": {},
"inset-inline-start": {},
"box-shadow-width": {}
}
}
}
15 changes: 15 additions & 0 deletions conduction-design-tokens/src/component/utrecht/focus.tokens.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"utrecht": {
"focus": {
"background-color": {},
"color": {},
"outline-color": {},
"outline-offset": { "value": "2.5px" },
"outline-style": {},
"outline-width": { "value": "2.5px" },
"inverse": {
"outline-color": { "value": "{conduction.color.black.0-60t}" }
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
"border-width": { "value": "{conduction.size.4xs}" },
"color": { "value": "{conduction.color.grey.29}" },
"font-family": { "value": "{conduction.typography.sans-serif.font-family}" },
"font-size": { "value": "15px" },
"font-size": {
"value": "0.938rem",
"comment": "15px"
},
"min-inline-height": {},
"max-inline-size": {},
"padding-block-end": { "value": "{conduction.size.xs}" },
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"utrecht": {
"skip-link": {
"background-color": { "value": "{conduction.color.grey.87}" },
"color": { "value": "{conduction.color.grey.27}" },
"min-block-size": { "value": "20px" },
"min-inline-size": { "value": "20px" },
"padding-block-start": { "value": "15px" },
"padding-block-end": { "value": "{conduction.size.sm}" },
"padding-inline-start": { "value": "23px" },
"padding-inline-end": { "value": "23px" },
"text-decoration": { "value": "none" },
"z-index": { "value": "100000" }
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
"border-width": { "value": "{conduction.size.4xs}" },
"color": { "value": "{conduction.color.grey.29}" },
"font-family": { "value": "{conduction.typography.sans-serif.font-family}" },
"font-size": { "value": "15px" },
"font-size": {
"value": "0.938rem",
"comment": "15px"
},
"min-inline-height": {},
"max-inline-size": {},
"padding-block-end": { "value": "{conduction.size.xs}" },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@
},
"29": {
"value": "#334761"
},
"49": {
"value": "#0771f2"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,50 @@
{
"commonground": {
"font-size": {
"4xs": { "value": "5px" },
"3xs": { "value": "8px" },
"2xs": { "value": "10px" },
"xs": { "value": "12px" },
"sm": { "value": "14px" },
"md": { "value": "16px" },
"lg": { "value": "20px" },
"xl": { "value": "24px" },
"2xl": { "value": "30px" },
"3xl": { "value": "48px" },
"4xl": { "value": "58px" }
"4xs": {
"value": "0.313rem",
"comment": "5px"
},
"3xs": {
"value": "0.5rem",
"comment": "8px"
},
"2xs": {
"value": "0.625rem",
"comment": "10px"
},
"xs": {
"value": "0.75rem",
"comment": "12px"
},
"sm": {
"value": "0.875rem",
"comment": "14px"
},
"md": {
"value": "1rem",
"comment": "16px"
},
"lg": {
"value": "1.25rem",
"comment": "20px"
},
"xl": {
"value": "1.5rem",
"comment": "24px"
},
"2xl": {
"value": "1.875rem",
"comment": "30px"
},
"3xl": {
"value": "3rem",
"comment": "48px"
},
"4xl": {
"value": "3.625rem",
"comment": "58px"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"background-color": { "value": "{commonground.color.primary}" },
"box-shadow": { "value": "inset 0px 0px 0px 2px {commonground.color.black.0}" },
"mobile": {
"box-shadow": { "value": "" }
"box-shadow": { "value": "unset" }
},
"font-weight": {}
},
Expand All @@ -36,7 +36,7 @@
"background-color": { "value": "{commonground.color.primary}" },
"box-shadow": { "value": "inset 0px 0px 0px 2px {commonground.color.black.0}" },
"mobile": {
"box-shadow": { "value": "" }
"box-shadow": { "value": "unset" }
},
"font-weight": {}
}
Expand All @@ -62,7 +62,7 @@
"current": {
"color": { "value": "{commonground.color.white.100}" },
"background-color": { "value": "{commonground.color.primary}" },
"box-shadow": { "value": "" }
"box-shadow": { "value": "unset" }
},
"font-size": { "value": "{commonground.font-size.md}" },
"font-weight": { "value": "400" },
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"utrecht": {
"skip-link": {
"font-weight": {},
"font-size": {},
"outline-style": { "value": "none" },
"outline-color": {},
"border-radius": {},
"focus": {
"text-decoration": { "value": "{utrecht.skip-link.text-decoration}" }
},
"inset-block-start": {},
"inset-inline-start": {},
"box-shadow-width": {}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"utrecht": {
"focus": {
"background-color": { "value": "green" },
"color": { "value": "purple" },
"outline-color": { "value": "{commonground.color.black.0}" },
"outline-offset": { "value": "{commonground.size.3xs}" },
"outline-style": {},
"outline-width": { "value": "{commonground.size.3xs}" },
"inverse": {
"outline-color": { "value": "{commonground.color.black.0}" }
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
"border-width": { "value": "{commonground.size.4xs}" },
"color": { "value": "{commonground.color.black.0}" },
"font-family": { "value": "{commonground.typography.sans-serif.font-family}" },
"font-size": { "value": "15px" },
"font-size": {
"value": "0.938rem",
"comment": "15px"
},
"min-inline-height": {},
"max-inline-size": {},
"padding-block-end": { "value": "{commonground.size.xs}" },
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"utrecht": {
"skip-link": {
"background-color": { "value": "{commonground.color.blue.49}" },
"color": { "value": "{commonground.color.white.100}" },
"min-block-size": { "value": "20px" },
"min-inline-size": { "value": "20px" },
"padding-block-start": { "value": "11px" },
"padding-block-end": { "value": "11px" },
"padding-inline-start": { "value": "12px" },
"padding-inline-end": { "value": "12px" },
"text-decoration": { "value": "none" },
"z-index": { "value": "100000" }
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
"border-width": { "value": "{commonground.size.4xs}" },
"color": { "value": "{commonground.color.black.0}" },
"font-family": { "value": "{commonground.typography.sans-serif.font-family}" },
"font-size": { "value": "15px" },
"font-size": {
"value": "0.938rem",
"comment": "15px"
},
"min-inline-height": {},
"max-inline-size": {},
"padding-block-end": { "value": "{commonground.size.xs}" },
Expand Down
Loading

0 comments on commit 5d39f12

Please sign in to comment.