Merge branch 'main' into chore/storefront-clean-components

digdir · Sep 29, 2023 · 2445512 · 2445512
2 parents c09b8c5 + d512ee2
commit 2445512
Show file tree

Hide file tree

Showing 61 changed files with 2,813 additions and 1,272 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -47,6 +47,8 @@ module.exports = {
     'react/display-name': 'off',
     'import/no-unresolved': 'error',
     'import/namespace': ['error', { allowComputed: true }],
+    'import/no-named-as-default': 'off',
+    '@next/next/no-html-link-for-pages': ['error', '/storefront/pages/'],
     'import/order': [
       'warn',
       {

diff --git a/README.md b/README.md
@@ -52,6 +52,11 @@
 
 ---
 
+## Quick links
+
+- [Storefront](https://designsystemet.no)
+- [Storybook](https://digdir.github.io/designsystem/)
+
 ## About the design system 📖
 
 The Common Designsystem is a collection of important design elements and building blocks that can be used when creating different services. It's like a toolbox that everyone can use to work together and create the best foundation for public services across the country. By using this Designsystem, we aim to create consistent and user-friendly experiences in digital solutions for public services, making them more efficient and reliable.

diff --git a/design-tokens/$themes.json b/design-tokens/$themes.json
diff --git a/design-tokens/Base/Semantic.json b/design-tokens/Base/Semantic.json
@@ -78,76 +78,6 @@
         "checked": {
           "value": "{colors.blue.700}",
           "type": "color"
-        },
-        "primary": {
-          "subtle": {
-            "value": "{colors.blue.100}",
-            "type": "color"
-          },
-          "subtle-hover": {
-            "value": "{colors.blue.200}",
-            "type": "color"
-          },
-          "default": {
-            "value": "{colors.blue.700}",
-            "type": "color"
-          },
-          "hover": {
-            "value": "{colors.blue.800}",
-            "type": "color"
-          },
-          "active": {
-            "value": "{colors.blue.900}",
-            "type": "color",
-            "description": "Standard farge for handlinger"
-          },
-          "no_fill": {
-            "value": "{colors.white}",
-            "type": "color"
-          },
-          "no_fill-hover": {
-            "value": "{colors.blue.100}",
-            "type": "color"
-          },
-          "no_fill-active": {
-            "value": "{colors.blue.200}",
-            "type": "color"
-          }
-        },
-        "secondary": {
-          "subtle": {
-            "value": "{colors.grey.100}",
-            "type": "color"
-          },
-          "subtle-hover": {
-            "value": "{colors.grey.200}",
-            "type": "color"
-          },
-          "default": {
-            "value": "{colors.blue.900}",
-            "type": "color"
-          },
-          "hover": {
-            "value": "rgba({colors.blue.900}, 0.9)",
-            "type": "color"
-          },
-          "active": {
-            "value": "rgba({colors.blue.900}, 0.8)",
-            "type": "color",
-            "description": "Standard farge for handlinger"
-          },
-          "no_fill": {
-            "value": "{colors.white}",
-            "type": "color"
-          },
-          "no_fill-hover": {
-            "value": "rgba({colors.blue.900}, 0.1)",
-            "type": "color"
-          },
-          "no_fill-active": {
-            "value": "rgba({colors.blue.900}, 0.2)",
-            "type": "color"
-          }
         }
       },
       "success": {
@@ -304,50 +234,6 @@
         "dark-hover": {
           "value": "{colors.blue.700}",
           "type": "color"
-        },
-        "primary": {
-          "subtle": {
-            "value": "{colors.blue.200}",
-            "type": "color"
-          },
-          "subtle-hover": {
-            "value": "{colors.blue.400}",
-            "type": "color"
-          },
-          "default": {
-            "value": "{colors.blue.700}",
-            "type": "color"
-          },
-          "hover": {
-            "value": "{colors.blue.800}",
-            "type": "color"
-          },
-          "active": {
-            "value": "{colors.blue.900}",
-            "type": "color"
-          }
-        },
-        "secondary": {
-          "subtle": {
-            "value": "{colors.grey.200}",
-            "type": "color"
-          },
-          "subtle-hover": {
-            "value": "{colors.grey.300}",
-            "type": "color"
-          },
-          "default": {
-            "value": "{colors.blue.900}",
-            "type": "color"
-          },
-          "hover": {
-            "value": "{colors.blue.900}",
-            "type": "color"
-          },
-          "active": {
-            "value": "{colors.blue.900}",
-            "type": "color"
-          }
         }
       },
       "neutral": {
@@ -490,42 +376,6 @@
         "on_action": {
           "value": "{colors.white}",
           "type": "color"
-        },
-        "primary": {
-          "default": {
-            "value": "{colors.blue.700}",
-            "type": "color"
-          },
-          "hover": {
-            "value": "#004e95",
-            "type": "color"
-          },
-          "active": {
-            "value": "#00315d",
-            "type": "color"
-          },
-          "on_action": {
-            "value": "{colors.white}",
-            "type": "color"
-          }
-        },
-        "secondary": {
-          "default": {
-            "value": "{colors.blue.900}",
-            "type": "color"
-          },
-          "hover": {
-            "value": "{colors.blue.900}",
-            "type": "color"
-          },
-          "active": {
-            "value": "{colors.blue.900}",
-            "type": "color"
-          },
-          "on_action": {
-            "value": "{colors.white}",
-            "type": "color"
-          }
         }
       },
       "warning": {