Skip to content

Commit

Permalink
refactor: new theme naming (#885)
Browse files Browse the repository at this point in the history
  • Loading branch information
mrosvik authored and Barsnes committed Oct 3, 2023
1 parent 2550829 commit 4270d90
Show file tree
Hide file tree
Showing 5 changed files with 159 additions and 156 deletions.
13 changes: 8 additions & 5 deletions design-tokens/$themes.json
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,8 @@
"selectedTokenSets": {
"Brand/Altinn": "enabled",
"Base/Core": "source",
"Base/Semantic": "enabled"
"Base/Semantic": "enabled",
"Density/Default": "enabled"
},
"$figmaCollectionId": "VariableCollectionId:6324:1609",
"$figmaModeId": "6324:2",
Expand Down Expand Up @@ -871,7 +872,8 @@
"selectedTokenSets": {
"Brand/Tilsynet": "enabled",
"Base/Core": "source",
"Base/Semantic": "enabled"
"Base/Semantic": "enabled",
"Density/Default": "enabled"
},
"$figmaStyleReferences": {},
"$figmaCollectionId": "VariableCollectionId:6324:1609",
Expand Down Expand Up @@ -1103,7 +1105,8 @@
"selectedTokenSets": {
"Base/Core": "source",
"Base/Semantic": "enabled",
"Brand/Brreg": "enabled"
"Brand/Brreg": "enabled",
"Density/Default": "enabled"
},
"$figmaVariableReferences": {
"brand.alt1.50": "741f3f885aa3f266feda96defb70e59752495075",
Expand Down Expand Up @@ -1329,9 +1332,9 @@
"border_width.active": "82d06b8c6fdeea622611fa744ff261661a211760",
"border_width.tab_focus": "3ddf887f27c7dff953b8399c667e16448ae252d7"
},
"group": "Brand",
"$figmaCollectionId": "VariableCollectionId:6324:1609",
"$figmaModeId": "6324:4"
"$figmaModeId": "6324:4",
"group": "Brand"
},
{
"id": "33e1200e221c81b1bd3439e6f7413a9ac3af9aa4",
Expand Down
72 changes: 36 additions & 36 deletions design-tokens/Brand/Altinn.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"brand": {
"first": {
"alt1": {
"100": {
"value": "#E6EFF8",
"type": "color",
Expand Down Expand Up @@ -47,7 +47,7 @@
"description": "AA 4.7 on white"
}
},
"second": {
"alt2": {
"100": {
"value": "#DCD6EA",
"type": "color",
Expand Down Expand Up @@ -94,7 +94,7 @@
"description": "AA18 4.4 on grey 800\nAA18 3.2 on white"
}
},
"third": {
"alt3": {
"100": {
"value": "#F9D5DB",
"type": "color",
Expand Down Expand Up @@ -144,62 +144,62 @@
},
"semantic": {
"surface": {
"alt1": {
"first": {
"light": {
"value": "{brand.first.200}",
"value": "{brand.alt1.200}",
"type": "color"
},
"light-hover": {
"value": "{brand.first.300}",
"value": "{brand.alt1.300}",
"type": "color"
},
"light-active": {
"value": "{brand.first.400}",
"value": "{brand.alt1.400}",
"type": "color"
},
"dark": {
"value": "{brand.first.800}",
"value": "{brand.alt1.800}",
"type": "color"
}
},
"alt2": {
"second": {
"light": {
"value": "{brand.second.200}",
"value": "{brand.alt2.200}",
"type": "color"
},
"light-hover": {
"value": "{brand.second.300}",
"value": "{brand.alt2.300}",
"type": "color"
},
"light-active": {
"value": "{brand.second.400}",
"value": "{brand.alt2.400}",
"type": "color"
},
"dark": {
"value": "{brand.second.900}",
"value": "{brand.alt2.900}",
"type": "color"
}
},
"alt3": {
"third": {
"light": {
"value": "{brand.third.200}",
"value": "{brand.alt3.200}",
"type": "color"
},
"light-hover": {
"value": "{brand.third.300}",
"value": "{brand.alt3.300}",
"type": "color"
},
"light-active": {
"value": "{brand.third.400}",
"value": "{brand.alt3.400}",
"type": "color"
},
"dark": {
"value": "{brand.third.800}",
"value": "{brand.alt3.800}",
"type": "color"
}
},
"action": {
"alt1": {
"first": {
"subtle": {
"value": "{colors.blue.100}",
"type": "color"
Expand Down Expand Up @@ -234,7 +234,7 @@
"type": "color"
}
},
"alt2": {
"second": {
"subtle": {
"value": "{colors.grey.100}",
"type": "color"
Expand Down Expand Up @@ -272,50 +272,50 @@
}
},
"border": {
"alt1": {
"first": {
"default": {
"value": "{brand.first.600}",
"value": "{brand.alt1.600}",
"type": "color"
},
"hover": {
"value": "{brand.first.700}",
"value": "{brand.alt1.700}",
"type": "color"
},
"active": {
"value": "{brand.first.800}",
"value": "{brand.alt1.800}",
"type": "color"
}
},
"alt2": {
"second": {
"default": {
"value": "{brand.second.600}",
"value": "{brand.alt2.600}",
"type": "color"
},
"hover": {
"value": "{brand.second.700}",
"value": "{brand.alt2.700}",
"type": "color"
},
"active": {
"value": "{brand.second.800}",
"value": "{brand.alt2.800}",
"type": "color"
}
},
"alt3": {
"third": {
"default": {
"value": "{brand.third.600}",
"value": "{brand.alt3.600}",
"type": "color"
},
"hover": {
"value": "{brand.third.700}",
"value": "{brand.alt3.700}",
"type": "color"
},
"active": {
"value": "{brand.third.800}",
"value": "{brand.alt3.800}",
"type": "color"
}
},
"action": {
"alt1": {
"first": {
"subtle": {
"value": "{colors.grey.200}",
"type": "color"
Expand All @@ -337,7 +337,7 @@
"type": "color"
}
},
"alt2": {
"second": {
"subtle": {
"value": "{colors.grey.200}",
"type": "color"
Expand All @@ -363,7 +363,7 @@
},
"text": {
"action": {
"alt1": {
"first": {
"default": {
"value": "{colors.blue.700}",
"type": "color"
Expand All @@ -381,7 +381,7 @@
"type": "color"
}
},
"alt2": {
"second": {
"default": {
"value": "{colors.blue.900}",
"type": "color"
Expand Down
Loading

0 comments on commit 4270d90

Please sign in to comment.