Merge branch 'develop' of github.com:Amsterdam/design-system into fea…

…t/DES-769-eslint-v9-upgrade
Amsterdam · Nov 29, 2024 · ee60102 · ee60102
2 parents 1e1acc3 + 9071d88
commit ee60102
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 26 deletions.
diff --git a/packages/css/src/components/alert/alert.scss b/packages/css/src/components/alert/alert.scss
@@ -5,6 +5,7 @@
 
 .ams-alert {
   align-items: flex-start;
+  background-color: var(--ams-alert-background-color);
   border-style: var(--ams-alert-border-style);
   border-width: var(--ams-alert-border-width);
   display: flex;

diff --git a/proprietary/tokens/src/brand/ams/color.tokens.json b/proprietary/tokens/src/brand/ams/color.tokens.json
@@ -1,21 +1,45 @@
 {
   "ams": {
-    "color": {
-      "primary-black": { "value": "#000000" },
-      "primary-white": { "value": "#FFFFFF" },
-      "primary-blue": { "value": "#004699" },
-      "primary-red": { "value": "#EC0000" },
-      "dark-blue": { "value": "#102E62" },
-      "orange": { "value": "#FF9100" },
-      "yellow": { "value": "#FFE600" },
-      "green": { "value": "#BED200" },
-      "dark-green": { "value": "#00A03C" },
-      "blue": { "value": "#009DE6" },
-      "purple": { "value": "#A00078" },
-      "magenta": { "value": "#E50082" },
-      "neutral-grey1": { "value": "#E8E8E8" },
-      "neutral-grey2": { "value": "#BEBEBE" },
-      "neutral-grey3": { "value": "#767676" }
+    "brand": {
+      "color": {
+        "azure": {
+          "60": { "value": "#009DE6" }
+        },
+        "blue": {
+          "60": { "value": "#004699" },
+          "80": { "value": "#003677" }
+        },
+        "green": {
+          "60": { "value": "#00A03C" }
+        },
+        "lime": {
+          "60": { "value": "#BED200" }
+        },
+        "magenta": {
+          "60": { "value": "#E50082" }
+        },
+        "neutral": {
+          "0": { "value": "#FFFFFF" },
+          "20": { "value": "#D1D1D1" },
+          "40": { "value": "#A4A4A4" },
+          "60": { "value": "#767676" },
+          "80": { "value": "#474747" },
+          "100": { "value": "#181818" }
+        },
+        "orange": {
+          "60": { "value": "#FF9100" }
+        },
+        "purple": {
+          "60": { "value": "#A00078" }
+        },
+        "red": {
+          "60": { "value": "#EC0000" },
+          "80": { "value": "#B70000" }
+        },
+        "yellow": {
+          "60": { "value": "#FFE600" }
+        }
+      }
     }
   }
 }
diff --git a/proprietary/tokens/src/components/ams/alert.tokens.json b/proprietary/tokens/src/components/ams/alert.tokens.json
@@ -1,28 +1,23 @@
 {
   "ams": {
     "alert": {
+      "background-color": { "value": "{ams.brand.color.neutral.0}" },
       "border-width": { "value": "{ams.border.width.xl}" },
       "border-style": { "value": "solid" },
       "gap": { "value": "{ams.space.sm}" },
       "padding-block": { "value": "{ams.space.md}" },
       "padding-inline": { "value": "{ams.space.lg}" },
       "error": {
-        "border-color": { "value": "{ams.color.primary-red}" }
+        "border-color": { "value": "{ams.brand.color.red.60}" }
       },
       "info": {
-        "border-color": { "value": "{ams.color.primary-blue}" }
+        "border-color": { "value": "{ams.brand.color.azure.60}" }
       },
       "success": {
-        "border-color": { "value": "{ams.color.dark-green}" }
+        "border-color": { "value": "{ams.brand.color.green.60}" }
       },
       "warning": {
-        "border-color": { "value": "{ams.color.orange}" }
-      },
-      "close": {
-        "fill": { "value": "{ams.color.primary-black}" },
-        "hover": {
-          "fill": { "value": "{ams.color.primary-blue}" }
-        }
+        "border-color": { "value": "{ams.brand.color.orange.60}" }
       },
       "content": {
         "gap": { "value": "{ams.space.sm}" }