Skip to content

Commit 4499256

Browse files
SudoThijnSudoThijn
authored
Merge pull request #146 from ConductionNL/development
dev -> main
2 parents 2c5d48b + 3942739 commit 4499256

33 files changed

Lines changed: 219 additions & 184 deletions

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Conduction's design tokens theme
55
## Changelog
66

77
- **Version 1.1 (breaking changes from 1.0.x)**
8+
- 1.1.53: Updated Hof van Twente theme to V2
89
- 1.1.52:
910
- Added Soest theme
1011
- Added Stichtse Vecht theme.

‎municipalities/hof-van-twente-design-tokens/src/brand/hof-van-twente/color.tokens.json‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"hof-van-twente": {
33
"color": {
44
"primary": {
5-
"value": "{hof-van-twente.color.turquoise.31}"
5+
"value": "{hof-van-twente.color.turquoise.25}"
66
},
77
"primary-hover": {
8-
"value": "{hof-van-twente.color.turquoise.31}"
8+
"value": "{hof-van-twente.color.turquoise.17}"
99
},
1010
"error": { "value": "#dc3545" },
1111
"alert-error": { "value": "#721c24" },
@@ -20,6 +20,12 @@
2020
"alert-info": { "value": "#004085" },
2121
"alert-info-background": { "value": "#cce5ff" },
2222
"turquoise": {
23+
"10": {
24+
"value": "#00312e"
25+
},
26+
"17": {
27+
"value": "#005955"
28+
},
2329
"25": {
2430
"value": "#007d77"
2531
},
@@ -32,6 +38,20 @@
3238
},
3339
"75": {
3440
"value": "#a6dbd5"
41+
},
42+
"94": {
43+
"value": "#ebf6f6"
44+
},
45+
"96": {
46+
"value": "#f0f8f7"
47+
}
48+
},
49+
"purple": {
50+
"21": {
51+
"value": "#20204c"
52+
},
53+
"28": {
54+
"value": "#2b2b65"
3555
}
3656
},
3757
"grey": {
@@ -57,6 +77,9 @@
5777
"value": "#808080",
5878
"comment": "Base/Grey"
5979
},
80+
"55": {
81+
"value": "#8c8c8c"
82+
},
6083
"80": {
6184
"value": "#cccccc"
6285
},
@@ -109,6 +132,9 @@
109132
"13": {
110133
"value": "#222222"
111134
},
135+
"15": {
136+
"value": "#212529"
137+
},
112138
"20": {
113139
"value": "#333333"
114140
},

‎municipalities/hof-van-twente-design-tokens/src/brand/hof-van-twente/font-size.tokens.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@
2626
"comment": "16px"
2727
},
2828
"lg": {
29-
"value": "1.125rem",
30-
"comment": "18px"
29+
"value": "1.15rem",
30+
"comment": "18.4px"
3131
},
3232
"xl": {
3333
"value": "1.25rem",
3434
"comment": "20px"
3535
},
3636
"2xl": {
37-
"value": "1.438rem",
38-
"comment": "23px"
37+
"value": "1.5rem",
38+
"comment": "24px"
3939
},
4040
"3xl": {
41-
"value": "2rem",
42-
"comment": "32px"
41+
"value": "2.25rem",
42+
"comment": "36px"
4343
},
4444
"4xl": {
4545
"value": "2.5rem",

‎municipalities/hof-van-twente-design-tokens/src/brand/hof-van-twente/typography.tokens.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
{
22
"hof-van-twente": {
33
"typography": {
4+
"open-sans": {
5+
"font-family": {
6+
"value": "\"Open Sans\", -apple-system, BlinkMacSystemFont, Segoe UI, Source Sans Pro, Helvetica Neue, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol"
7+
}
8+
},
49
"roboto-condensed": {
510
"font-family": {
611
"value": "\"Roboto Condensed\", Monospace, Arial, sans-serif"

‎municipalities/hof-van-twente-design-tokens/src/component/conduction/card-header.tokens.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@
1313
"border-bottom-color": {}
1414
},
1515
"title": {
16-
"color": { "value": "{hof-van-twente.color.primary}" }
16+
"color": { "value": "{hof-van-twente.color.primary}" },
17+
"hover": {
18+
"color": { "value": "{hof-van-twente.color.turquoise.10}" },
19+
"text-decoration": { "value": "underline" },
20+
"text-underline-offset": { "value": "0.25rem" }
21+
}
1722
},
1823
"date": {
1924
"color": { "value": "{hof-van-twente.color.black.0}" },

‎municipalities/hof-van-twente-design-tokens/src/component/conduction/card-wrapper.tokens.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"border-bottom-color": {},
99
"border-bottom-style": {},
1010
"border-bottom-width": {},
11-
"border-radius": { "value": "{hof-van-twente.size.md}" },
11+
"border-radius": { "value": "7px" },
1212
"transition": {},
13-
"box-shadow": {"value": "0px 0px 6px 0px rgba(246,246,246,1)"},
13+
"box-shadow": {},
1414
"color": { "value": "{hof-van-twente.color.black.0}" },
1515
"hover": {
1616
"background-color": {},
@@ -22,7 +22,7 @@
2222
"border-bottom-style": {},
2323
"border-bottom-width": {},
2424
"border-radius": {},
25-
"box-shadow": {"value": "0px 0px 6px 0px rgba(30,128,122,0.4)"}
25+
"box-shadow": {}
2626
},
2727
"padding-inline-end": { "value": "{hof-van-twente.size.md}" },
2828
"padding-inline-start": { "value": "{hof-van-twente.size.md}" },

‎municipalities/hof-van-twente-design-tokens/src/component/conduction/download-card.tokens.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"color": { "value": "{utrecht.document.color}" },
77
"font-size": { "value": "{hof-van-twente.font-size.md}" },
88
"font-weight": { "value": "{hof-van-twente.typography.font-weight.bold}" },
9-
"font-family": { "value": "{hof-van-twente.typography.roboto.font-family}" },
9+
"font-family": { "value": "{hof-van-twente.typography.open-sans.font-family}" },
1010
"margin-inline-end": { "value": "{hof-van-twente.size.sm}" }
1111
},
1212
"border-width": { "value": "{hof-van-twente.size.4xs}" },

‎municipalities/hof-van-twente-design-tokens/src/component/conduction/logo.tokens.json‎

Lines changed: 7 additions & 7 deletions
Large diffs are not rendered by default.

‎municipalities/hof-van-twente-design-tokens/src/component/conduction/navigation.tokens.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@
1111
"gap": { "value": "15px" }
1212
},
1313
"hover": {
14-
"color": { "value": "{hof-van-twente.color.turquoise.25}" },
14+
"color": { "value": "{hof-van-twente.color.primary}" },
1515
"background-color": { "value": "{hof-van-twente.color.white.100}" },
16-
"box-shadow": { "value": "inset 0 -2px {hof-van-twente.color.turquoise.25}" },
16+
"box-shadow": { "value": "inset 0 -3px {hof-van-twente.color.primary}" },
1717
"font-weight": {}
1818
},
1919
"current": {
20-
"color": { "value": "{hof-van-twente.color.turquoise.25}" },
20+
"color": { "value": "{hof-van-twente.color.primary}" },
2121
"background-color": { "value": "{hof-van-twente.color.white.100}" },
22-
"box-shadow": { "value": "inset 0 -2px {hof-van-twente.color.turquoise.25}" },
22+
"box-shadow": { "value": "inset 0 -2px {hof-van-twente.color.primary}" },
2323
"font-weight": { "value": "{hof-van-twente.typography.font-weight.normal}" },
2424
"mobile": {
2525
"box-shadow": { "value": "none" }
2626
},
2727
"hover": {
2828
"font-weight": { "value": "{hof-van-twente.typography.font-weight.normal}" },
29-
"box-shadow": { "value": "inset 0 -2px {hof-van-twente.color.turquoise.25}" }
29+
"box-shadow": { "value": "inset 0 -2px {hof-van-twente.color.primary}" }
3030
}
3131
},
3232
"dropdown": {
@@ -36,7 +36,7 @@
3636
"border-style": {},
3737
"border-color": {},
3838
"hover": {
39-
"color": {},
39+
"color": { "value": "{hof-van-twente.color.primary}" },
4040
"background-color": {},
4141
"box-shadow": { "value": "none" },
4242
"font-weight": {}
@@ -52,7 +52,7 @@
5252
}
5353
},
5454
"item": {
55-
"padding": { "value": "18px" },
55+
"padding": { "value": "14px" },
5656
"border-radius": {},
5757
"border-color": {},
5858
"border-style": {},

‎municipalities/hof-van-twente-design-tokens/src/component/conduction/pagination.tokens.json‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,41 +9,41 @@
99
"padding-block-end": { "value": "0px" }
1010
},
1111
"item": {
12-
"gap": { "value": "{hof-van-twente.size.2xs}" },
13-
"color": { "value": "{hof-van-twente.color.black.0}" },
14-
"background-color": { "value": "unset" },
15-
"padding-inline-start": { "value": "{hof-van-twente.size.3xs}" },
16-
"padding-inline-end": { "value": "{hof-van-twente.size.3xs}" },
17-
"padding-block-start": { "value": "0" },
18-
"padding-block-end": { "value": "0" },
12+
"gap": { "value": "0.5rem" },
13+
"color": { "value": "{hof-van-twente.color.black.15}" },
14+
"background-color": { "value": "none" },
15+
"padding-inline-start": { "value": "18px" },
16+
"padding-inline-end": { "value": "18px" },
17+
"padding-block-start": { "value": "12px" },
18+
"padding-block-end": { "value": "12px" },
1919
"font-size": { "value": "{utrecht.document.font-size}" },
2020
"font-weight": { "value": "{hof-van-twente.typography.font-weight.normal}" },
2121
"font-family": { "value": "{utrecht.document.font-family}" },
2222
"border-width": {},
2323
"border-style": {},
2424
"border-color": {},
25-
"border-bottom-width": { "value": "2px" },
26-
"border-bottom-style": { "value": "solid" },
27-
"border-bottom-color": { "value": "{hof-van-twente.color.black.0}" },
28-
"border-radius": { "value": "0px" }
25+
"border-bottom-width": {},
26+
"border-bottom-style": {},
27+
"border-bottom-color": {},
28+
"border-radius": { "value": "{hof-van-twente.size.4xl}" }
2929
},
3030
"navigation-button": {
31-
"color": { "value": "{hof-van-twente.color.black.0}" },
32-
"background-color": { "value": "transparent" },
31+
"color": { "value": "{hof-van-twente.color.white.100}" },
32+
"background-color": { "value": "{hof-van-twente.color.primary}" },
3333
"border-width": {},
3434
"border-style": {},
3535
"border-color": {},
3636
"border-bottom-width": {},
3737
"border-bottom-style": {},
3838
"border-bottom-color": {},
3939
"border-radius": {},
40-
"padding-inline-start": { "value": "0" },
41-
"padding-inline-end": { "value": "0" },
42-
"padding-block-start": { "value": "0" },
43-
"padding-block-end": { "value": "0" },
40+
"padding-inline-start": { "value": "18px" },
41+
"padding-inline-end": { "value": "18px" },
42+
"padding-block-start": { "value": "12px" },
43+
"padding-block-end": { "value": "12px" },
4444
"disabled": {
45-
"color": { "value": "{hof-van-twente.color.black.0}" },
46-
"background-color": { "value": "transparent" },
45+
"color": { "value": "{hof-van-twente.color.black.15}" },
46+
"background-color": { "value": "{hof-van-twente.color.white.100}" },
4747
"border-width": {},
4848
"border-style": {},
4949
"border-color": {},
@@ -53,8 +53,8 @@
5353
"border-radius": {}
5454
},
5555
"hover": {
56-
"color": { "value": "{hof-van-twente.color.black.0}" },
57-
"background-color": {},
56+
"color": { "value": "{hof-van-twente.color.white.100}" },
57+
"background-color": { "value": "{hof-van-twente.color.primary}" },
5858
"border-width": {},
5959
"border-style": {},
6060
"border-color": {},
@@ -65,8 +65,8 @@
6565
}
6666
},
6767
"current-page": {
68-
"color": { "value": "{hof-van-twente.color.black.0}" },
69-
"background-color": { "value": "transparent" },
68+
"color": { "value": "{hof-van-twente.color.black.15}" },
69+
"background-color": { "value": "{hof-van-twente.color.white.100}" },
7070
"font-weight": { "value": "{hof-van-twente.typography.font-weight.normal}" },
7171
"text-decoration": { "value": "unset" },
7272
"border-width": {},
@@ -78,8 +78,8 @@
7878
},
7979
"page": {
8080
"hover": {
81-
"color": { "value": "{hof-van-twente.color.primary}" },
82-
"background-color": { "value": "{hof-van-twente.color.white.98}" },
81+
"color": { "value": "{hof-van-twente.color.black.15}" },
82+
"background-color": { "value": "{hof-van-twente.color.white.100}" },
8383
"text-decoration": { "value": "unset" },
8484
"text-decoration-thickness": { "value": "0px" },
8585
"border-width": {},

0 commit comments

Comments
 (0)