Merge branch 'next' into fix/table-divider-color

digdir · Feb 3, 2025 · 025e1d4 · 025e1d4
2 parents f8284a2 + 05e27c2
commit 025e1d4
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/preview-comment.yml b/.github/workflows/preview-comment.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Create comment
-        uses: peter-evans/create-or-update-comment@v3
+        uses: peter-evans/create-or-update-comment@v4
         with:
           issue-number: ${{ env.PR_NUMBER }}
           body: |

diff --git a/.github/workflows/preview-storefront.yml b/.github/workflows/preview-storefront.yml
@@ -45,7 +45,7 @@ jobs:
         run: vercel alias --token=${{ secrets.VERCEL_TOKEN }} --scope=${{ secrets.VERCEL_TEAM }} set ${{ steps.deploy.outputs.url }} pr-${{ env.PR_NUMBER }}.designsystemet.no
 
       - name: Find Preview Comment
-        uses: peter-evans/find-comment@v2
+        uses: peter-evans/find-comment@v3
         id: fc
         with:
           issue-number: ${{ env.PR_NUMBER }}
@@ -77,7 +77,7 @@ jobs:
           timezone: Europe/Oslo
 
       - name: Update comment with deployment
-        uses: peter-evans/create-or-update-comment@v3
+        uses: peter-evans/create-or-update-comment@v4
         with:
           issue-number: ${{ env.PR_NUMBER }}
           comment-id: ${{ steps.fc.outputs.comment-id }}

diff --git a/.github/workflows/preview-storybook.yml b/.github/workflows/preview-storybook.yml
@@ -47,7 +47,7 @@ jobs:
         run: vercel alias --token=${{ secrets.VERCEL_TOKEN }} --scope=${{ secrets.VERCEL_TEAM }} set ${{ steps.deploy.outputs.url }} pr-${{ env.PR_NUMBER }}.storybook.designsystemet.no
 
       - name: Find Preview Comment
-        uses: peter-evans/find-comment@v2
+        uses: peter-evans/find-comment@v3
         id: fc
         with:
           issue-number: ${{ env.PR_NUMBER }}
@@ -79,7 +79,7 @@ jobs:
           timezone: Europe/Oslo
 
       - name: Update comment with deployment
-        uses: peter-evans/create-or-update-comment@v3
+        uses: peter-evans/create-or-update-comment@v4
         with:
           issue-number: ${{ env.PR_NUMBER }}
           comment-id: ${{ steps.fc.outputs.comment-id }}

diff --git a/.github/workflows/preview-theme.yml b/.github/workflows/preview-theme.yml
@@ -45,7 +45,7 @@ jobs:
         run: vercel alias --token=${{ secrets.VERCEL_TOKEN }} --scope=${{ secrets.VERCEL_TEAM }} set ${{ steps.deploy.outputs.url }} pr-${{ env.PR_NUMBER }}.theme.designsystemet.no
 
       - name: Find Preview comment
-        uses: peter-evans/find-comment@v2
+        uses: peter-evans/find-comment@v3
         id: fc
         with:
           issue-number: ${{ env.PR_NUMBER }}
@@ -77,7 +77,7 @@ jobs:
           timezone: Europe/Oslo
 
       - name: Update comment with deployment
-        uses: peter-evans/create-or-update-comment@v3
+        uses: peter-evans/create-or-update-comment@v4
         with:
           issue-number: ${{ env.PR_NUMBER }}
           comment-id: ${{ steps.fc.outputs.comment-id }}

diff --git a/apps/theme/public/img/color-tokens.png b/apps/theme/public/img/color-tokens.png
diff --git a/packages/cli/src/colors/utils.ts b/packages/cli/src/colors/utils.ts
@@ -272,13 +272,13 @@ export const getColorInfoFromPosition = (position: ColorNumber) => {
       group: 'base',
     },
     15: {
-      name: 'contrastSubtle',
-      displayName: 'Contrast Subtle',
+      name: 'baseContrastSubtle',
+      displayName: 'Base Contrast Subtle',
       group: 'base',
     },
     16: {
-      name: 'contrastDefault',
-      displayName: 'Contrast Default',
+      name: 'baseContrastDefault',
+      displayName: 'Base Contrast Default',
       group: 'base',
     },
   } as const;

diff --git a/renovate.json b/renovate.json
@@ -0,0 +1,4 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["local>digdir/renovate-config"]
+}