Merge branch 'beta' into ts-refactor

# Conflicts: # data/tokens/components/container.json # data/tokens/components/feedback.json # data/tokens/components/form.json # data/tokens/components/popover.json # data/tokens/modes/dark.json # data/tokens/modes/light.json
Sage · Oct 8, 2024 · dcf065c · dcf065c
2 parents e608b0c + 4e79a99
commit dcf065c
Show file tree

Hide file tree

Showing 30 changed files with 10,586 additions and 13,116 deletions.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -35,3 +35,11 @@ jobs:
 
       - name: Run stylelint
         run: npm run stylelint:dist
+
+      - name: Download W3C Validator (vnu.jar)
+        run: wget https://github.com/validator/validator/releases/download/latest/vnu.jar
+
+      - name: Validate CSS
+        run: |
+          # Find all CSS files in dist directory and run validation
+          find ./dist -name "*.css" -print0 | xargs -0 java -jar vnu.jar --css
diff --git a/.stylelintrc.js b/.stylelintrc.js
@@ -18,5 +18,6 @@ module.exports = {
     "length-zero-no-unit": null, // Has no end user impact apart from affecting the size of the CSS file by a tiny amount
     "scss/comment-no-empty": null, // Ignoring as this is managed by `ts/descriptionToComment` transform and has no end user impact
     "scss/operator-no-unspaced": null, // Has no end user impact
+    "value-keyword-case": null, // Ignore to allow for correct casing of typography font names
   },
 };
diff --git a/data/tokens/$metadata.json b/data/tokens/$metadata.json
@@ -12,7 +12,6 @@
     "components/badge",
     "components/button",
     "components/container",
-    "components/feedback",
     "components/focus",
     "components/form",
     "components/link",
@@ -21,13 +20,14 @@
     "components/page",
     "components/popover",
     "components/progress",
+    "components/status",
     "components/profile",
     "components/tab",
     "components/table",
-    "screensize/small",
-    "screensize/large",
     "context/product",
     "context/frozenproduct",
-    "context/marketing"
+    "context/marketing",
+    "screensize/large",
+    "screensize/small"
   ]
 }
diff --git a/data/tokens/$themes.json b/data/tokens/$themes.json
diff --git a/data/tokens/components/badge.json b/data/tokens/components/badge.json
@@ -1,36 +1,18 @@
 {
   "badge": {
     "color": {
-      "inverse": {
-        "notification": {
-          "border-default": {
-            "value": "{modes.color.status.content.standard.withDefault}",
-            "type": "color"
-          },
-          "bg-default": {
-            "value": "{modes.color.status.negative.inverse.default}",
-            "type": "color"
-          },
-          "label-default": {
-            "value": "{modes.color.status.content.standard.withDefault}",
-            "type": "color"
-          }
-        }
-      },
-      "standard": {
-        "notification": {
-          "border-default": {
-            "value": "{modes.color.status.content.inverse.withDefault}",
-            "type": "color"
-          },
-          "bg-default": {
-            "value": "{modes.color.status.negative.standard.default}",
-            "type": "color"
-          },
-          "label-default": {
-            "value": "{modes.color.status.content.inverse.withDefault}",
-            "type": "color"
-          }
+      "notification": {
+        "border-default": {
+          "value": "{modes.color.generic.fg.nought}",
+          "type": "color"
+        },
+        "bg-default": {
+          "value": "{modes.color.status.negative.default}",
+          "type": "color"
+        },
+        "label-default": {
+          "value": "{modes.color.generic.fg.nought}",
+          "type": "color"
         }
       }
     },