Merge branch 'main' into interfaces_at-rules

mdn · Jan 15, 2025 · bf14599 · bf14599
2 parents 04371c7 + 13074e5
commit bf14599
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/css/functions.json b/css/functions.json
@@ -120,13 +120,21 @@
     "mdn_url": "https://developer.mozilla.org/docs/Web/CSS/clamp"
   },
   "color()": {
-    "syntax": "color( [from <color>]? <colorspace-params> [ / [ <alpha-value> | none ] ]? )",
+    "syntax": "color( [ from <color> ]? <colorspace-params> [ / [ <alpha-value> | none ] ]? )",
     "groups": [
       "CSS Color"
     ],
     "status": "standard",
     "mdn_url": "https://developer.mozilla.org/docs/Web/CSS/color_value/color"
   },
+  "color-mix()": {
+    "syntax": "color-mix( <color-interpolation-method> , [ <color> && <percentage [0,100]>? ]#{2})",
+    "groups": [
+      "CSS Color"
+    ],
+    "status": "standard",
+    "mdn_url": "https://developer.mozilla.org/docs/Web/CSS/color_value/color-mix"
+  },
   "conic-gradient()": {
     "syntax": "conic-gradient( [ from <angle> ]? [ at <position> ]?, <angular-color-stop-list> )",
     "groups": [

diff --git a/css/properties.json b/css/properties.json
@@ -10105,7 +10105,7 @@
     "mdn_url": "https://developer.mozilla.org/docs/Web/CSS/text-size-adjust"
   },
   "text-spacing-trim": {
-    "syntax": "space-all | normal | space-first | trim-start | trim-both | trim-all | auto",
+    "syntax": "space-all | normal | space-first | trim-start",
     "media": "visual",
     "inherited": true,
     "animationType": "discrete",
@@ -10665,7 +10665,7 @@
     "mdn_url": "https://developer.mozilla.org/docs/Web/CSS/white-space"
   },
   "white-space-collapse": {
-    "syntax": "collapse | discard | preserve | preserve-breaks | preserve-spaces | break-spaces",
+    "syntax": "collapse | preserve | preserve-breaks | preserve-spaces | break-spaces",
     "media": "visual",
     "inherited": true,
     "animationType": "discrete",

diff --git a/css/syntaxes.json b/css/syntaxes.json
@@ -150,7 +150,10 @@
     "syntax": "color( [from <color>]? <colorspace-params> [ / [ <alpha-value> | none ] ]? )"
   },
   "color-interpolation-method": {
-    "syntax": "in [ <rectangular-color-space> | <polar-color-space> <hue-interpolation-method>? ]"
+    "syntax": "in [ <rectangular-color-space> | <polar-color-space> <hue-interpolation-method>? | <custom-color-space> ]"
+  },
+  "color-mix()": {
+    "syntax": "color-mix( <color-interpolation-method> , [ <color> && <percentage [0,100]>? ]#{2})"
   },
   "color-stop": {
     "syntax": "<color-stop-length> | <color-stop-angle>"
@@ -245,6 +248,9 @@
   "cubic-bezier-timing-function": {
     "syntax": "ease | ease-in | ease-out | ease-in-out | cubic-bezier(<number [0,1]>, <number>, <number [0,1]>, <number>)"
   },
+  "custom-color-space": {
+    "syntax": "<dashed-ident>"
+  },
   "custom-params": {
     "syntax": "<dashed-ident> [ <number> | <percentage> | none ]+"
   },