Skip to content

Commit ec4021e

Browse files
unekinnunekinn
committed
update digdir themes
1 parent f4386a1 commit ec4021e

File tree

10 files changed

+270
-364
lines changed

10 files changed

+270
-364
lines changed

‎internal/design-tokens/$metadata.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{
22
"tokenSetOrder": [
33
"primitives/globals",
4+
"primitives/modes/size/global",
45
"primitives/modes/size/small",
56
"primitives/modes/size/medium",
67
"primitives/modes/size/large",
7-
"primitives/modes/size/global",
8+
"primitives/modes/typography/size/global",
89
"primitives/modes/typography/size/small",
910
"primitives/modes/typography/size/medium",
1011
"primitives/modes/typography/size/large",

‎internal/design-tokens/$themes.json‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"selectedTokenSets": {
77
"primitives/modes/size/medium": "source",
88
"primitives/modes/size/global": "enabled",
9-
"primitives/modes/typography/size/medium": "enabled"
9+
"primitives/modes/typography/size/medium": "enabled",
10+
"primitives/modes/typography/size/global": "enabled"
1011
},
1112
"$figmaCollectionId": "VariableCollectionId:36248:20757",
1213
"$figmaModeId": "41630:1",
@@ -55,7 +56,8 @@
5556
"selectedTokenSets": {
5657
"primitives/modes/size/large": "source",
5758
"primitives/modes/size/global": "enabled",
58-
"primitives/modes/typography/size/large": "enabled"
59+
"primitives/modes/typography/size/large": "enabled",
60+
"primitives/modes/typography/size/global": "enabled"
5961
},
6062
"$figmaCollectionId": "VariableCollectionId:36248:20757",
6163
"$figmaModeId": "41630:2",
@@ -104,7 +106,8 @@
104106
"selectedTokenSets": {
105107
"primitives/modes/size/small": "source",
106108
"primitives/modes/size/global": "enabled",
107-
"primitives/modes/typography/size/small": "enabled"
109+
"primitives/modes/typography/size/small": "enabled",
110+
"primitives/modes/typography/size/global": "enabled"
108111
},
109112
"$figmaCollectionId": "VariableCollectionId:36248:20757",
110113
"$figmaModeId": "41630:3",

‎internal/design-tokens/primitives/modes/typography/size/global.json‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
{
2+
"line-height": {
3+
"sm": {
4+
"$type": "lineHeights",
5+
"$value": "130%"
6+
},
7+
"md": {
8+
"$type": "lineHeights",
9+
"$value": "150%"
10+
},
11+
"lg": {
12+
"$type": "lineHeights",
13+
"$value": "170%"
14+
}
15+
},
16+
"font-size": {
17+
"1": {
18+
"$type": "fontSizes",
19+
"$value": "roundTo({font-scale._base} / pow({font-scale._ratio}, 3), 0)"
20+
},
21+
"2": {
22+
"$type": "fontSizes",
23+
"$value": "roundTo({font-scale._base} / pow({font-scale._ratio}, 2), 0)"
24+
},
25+
"3": {
26+
"$type": "fontSizes",
27+
"$value": "roundTo({font-scale._base} / pow({font-scale._ratio}, 1), 0)"
28+
},
29+
"4": {
30+
"$type": "fontSizes",
31+
"$value": "roundTo({font-scale._base} * pow({font-scale._ratio}, 0), 0)"
32+
},
33+
"5": {
34+
"$type": "fontSizes",
35+
"$value": "roundTo({font-scale._base} * pow({font-scale._ratio}, 1), 0)"
36+
},
37+
"6": {
38+
"$type": "fontSizes",
39+
"$value": "roundTo({font-scale._base} * pow({font-scale._ratio}, 2), 0)"
40+
},
41+
"7": {
42+
"$type": "fontSizes",
43+
"$value": "roundTo({font-scale._base} * pow({font-scale._ratio}, 3), 0)"
44+
},
45+
"8": {
46+
"$type": "fontSizes",
47+
"$value": "roundTo({font-scale._base} * pow({font-scale._ratio}, 5), 0)"
48+
},
49+
"9": {
50+
"$type": "fontSizes",
51+
"$value": "roundTo({font-scale._base} * pow({font-scale._ratio}, 7), 0)"
52+
},
53+
"10": {
54+
"$type": "fontSizes",
55+
"$value": "roundTo({font-scale._base} * pow({font-scale._ratio}, 9), 0)"
56+
}
57+
},
58+
"letter-spacing": {
59+
"1": {
60+
"$type": "letterSpacing",
61+
"$value": "-1%"
62+
},
63+
"2": {
64+
"$type": "letterSpacing",
65+
"$value": "-0.5%"
66+
},
67+
"3": {
68+
"$type": "letterSpacing",
69+
"$value": "-0.25%"
70+
},
71+
"4": {
72+
"$type": "letterSpacing",
73+
"$value": "-0.15%"
74+
},
75+
"5": {
76+
"$type": "letterSpacing",
77+
"$value": "0%"
78+
},
79+
"6": {
80+
"$type": "letterSpacing",
81+
"$value": "0.15%"
82+
},
83+
"7": {
84+
"$type": "letterSpacing",
85+
"$value": "0.25%"
86+
},
87+
"8": {
88+
"$type": "letterSpacing",
89+
"$value": "0.5%"
90+
},
91+
"9": {
92+
"$type": "letterSpacing",
93+
"$value": "1.5%"
94+
}
95+
}
96+
}

‎internal/design-tokens/primitives/modes/typography/size/large.json‎

Lines changed: 10 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,14 @@
11
{
2-
"line-height": {
3-
"sm": {
4-
"$type": "lineHeights",
5-
"$value": "130%"
6-
},
7-
"md": {
8-
"$type": "lineHeights",
9-
"$value": "150%"
10-
},
11-
"lg": {
12-
"$type": "lineHeights",
13-
"$value": "170%"
14-
}
15-
},
16-
"font-size": {
17-
"1": {
18-
"$type": "fontSizes",
19-
"$value": "13"
20-
},
21-
"2": {
22-
"$type": "fontSizes",
23-
"$value": "16"
24-
},
25-
"3": {
26-
"$type": "fontSizes",
27-
"$value": "18"
28-
},
29-
"4": {
30-
"$type": "fontSizes",
31-
"$value": "21"
32-
},
33-
"5": {
34-
"$type": "fontSizes",
35-
"$value": "24"
36-
},
37-
"6": {
38-
"$type": "fontSizes",
39-
"$value": "30"
40-
},
41-
"7": {
42-
"$type": "fontSizes",
43-
"$value": "36"
44-
},
45-
"8": {
46-
"$type": "fontSizes",
47-
"$value": "48"
48-
},
49-
"9": {
50-
"$type": "fontSizes",
51-
"$value": "60"
52-
},
53-
"10": {
54-
"$type": "fontSizes",
55-
"$value": "72"
56-
}
57-
},
58-
"letter-spacing": {
59-
"1": {
60-
"$type": "letterSpacing",
61-
"$value": "-1%"
62-
},
63-
"2": {
64-
"$type": "letterSpacing",
65-
"$value": "-0.5%"
66-
},
67-
"3": {
68-
"$type": "letterSpacing",
69-
"$value": "-0.25%"
70-
},
71-
"4": {
72-
"$type": "letterSpacing",
73-
"$value": "-0.15%"
74-
},
75-
"5": {
76-
"$type": "letterSpacing",
77-
"$value": "0%"
78-
},
79-
"6": {
80-
"$type": "letterSpacing",
81-
"$value": "0.15%"
82-
},
83-
"7": {
84-
"$type": "letterSpacing",
85-
"$value": "0.25%"
86-
},
87-
"8": {
88-
"$type": "letterSpacing",
89-
"$value": "0.5%"
90-
},
91-
"9": {
92-
"$type": "letterSpacing",
93-
"$value": "1.5%"
2+
"font-scale": {
3+
"_base": {
4+
"$type": "number",
5+
"$value": "21",
6+
"$description": "The font size (in px) to use as the basis for the scale. Is used as font-size.4."
7+
},
8+
"_ratio": {
9+
"$type": "number",
10+
"$value": "1.146",
11+
"$description": "The ratio used to calculate each step in the scale. Must be larger than 1 (a ratio of 1 would make all font sizes the same, while a number between 0 and 1 effectively inverts the scale). Larger numbers result in a larger font-size.10 and a smaller font-size.1."
9412
}
9513
}
9614
}

‎internal/design-tokens/primitives/modes/typography/size/medium.json‎

Lines changed: 10 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,14 @@
11
{
2-
"line-height": {
3-
"sm": {
4-
"$type": "lineHeights",
5-
"$value": "130%"
6-
},
7-
"md": {
8-
"$type": "lineHeights",
9-
"$value": "150%"
10-
},
11-
"lg": {
12-
"$type": "lineHeights",
13-
"$value": "170%"
14-
}
15-
},
16-
"font-size": {
17-
"1": {
18-
"$type": "fontSizes",
19-
"$value": "12"
20-
},
21-
"2": {
22-
"$type": "fontSizes",
23-
"$value": "14"
24-
},
25-
"3": {
26-
"$type": "fontSizes",
27-
"$value": "16"
28-
},
29-
"4": {
30-
"$type": "fontSizes",
31-
"$value": "18"
32-
},
33-
"5": {
34-
"$type": "fontSizes",
35-
"$value": "21"
36-
},
37-
"6": {
38-
"$type": "fontSizes",
39-
"$value": "24"
40-
},
41-
"7": {
42-
"$type": "fontSizes",
43-
"$value": "30"
44-
},
45-
"8": {
46-
"$type": "fontSizes",
47-
"$value": "36"
48-
},
49-
"9": {
50-
"$type": "fontSizes",
51-
"$value": "48"
52-
},
53-
"10": {
54-
"$type": "fontSizes",
55-
"$value": "60"
56-
}
57-
},
58-
"letter-spacing": {
59-
"1": {
60-
"$type": "letterSpacing",
61-
"$value": "-1%"
62-
},
63-
"2": {
64-
"$type": "letterSpacing",
65-
"$value": "-0.5%"
66-
},
67-
"3": {
68-
"$type": "letterSpacing",
69-
"$value": "-0.25%"
70-
},
71-
"4": {
72-
"$type": "letterSpacing",
73-
"$value": "-0.15%"
74-
},
75-
"5": {
76-
"$type": "letterSpacing",
77-
"$value": "0%"
78-
},
79-
"6": {
80-
"$type": "letterSpacing",
81-
"$value": "0.15%"
82-
},
83-
"7": {
84-
"$type": "letterSpacing",
85-
"$value": "0.25%"
86-
},
87-
"8": {
88-
"$type": "letterSpacing",
89-
"$value": "0.5%"
90-
},
91-
"9": {
92-
"$type": "letterSpacing",
93-
"$value": "1.5%"
2+
"font-scale": {
3+
"_base": {
4+
"$type": "number",
5+
"$value": "18",
6+
"$description": "The font size (in px) to use as the basis for the scale. Is used as font-size.4."
7+
},
8+
"_ratio": {
9+
"$type": "number",
10+
"$value": "1.143",
11+
"$description": "The ratio used to calculate each step in the scale. Must be larger than 1 (a ratio of 1 would make all font sizes the same, while a number between 0 and 1 effectively inverts the scale). Larger numbers result in a larger font-size.10 and a smaller font-size.1."
9412
}
9513
}
9614
}

0 commit comments

Comments
 (0)