Skip to content

Commit

Permalink
Merge branch 'main' into feat/container-at-rule
Browse files Browse the repository at this point in the history
  • Loading branch information
bsmth authored Jan 15, 2025
2 parents 067b698 + 13074e5 commit 2e8f177
Show file tree
Hide file tree
Showing 14 changed files with 420 additions and 239 deletions.
62 changes: 42 additions & 20 deletions css/at-rules.json
Original file line number Diff line number Diff line change
Expand Up @@ -202,16 +202,6 @@
"status": "standard",
"mdn_url": "https://developer.mozilla.org/docs/Web/CSS/@font-face/font-feature-settings"
},
"font-variation-settings": {
"syntax": "normal | [ <string> <number> ]#",
"media": "all",
"initial": "normal",
"percentages": "no",
"computed": "asSpecified",
"order": "orderOfAppearance",
"status": "standard",
"mdn_url": "https://developer.mozilla.org/docs/Web/CSS/@font-face/font-variation-settings"
},
"font-stretch": {
"syntax": "<font-stretch-absolute>{1,2}",
"media": "all",
Expand All @@ -232,6 +222,16 @@
"status": "standard",
"mdn_url": "https://developer.mozilla.org/docs/Web/CSS/@font-face/font-style"
},
"font-variation-settings": {
"syntax": "normal | [ <string> <number> ]#",
"media": "all",
"initial": "normal",
"percentages": "no",
"computed": "asSpecified",
"order": "orderOfAppearance",
"status": "standard",
"mdn_url": "https://developer.mozilla.org/docs/Web/CSS/@font-face/font-variation-settings"
},
"font-weight": {
"syntax": "<font-weight-absolute>{1,2}",
"media": "all",
Expand Down Expand Up @@ -477,16 +477,6 @@
"CSS Houdini"
],
"descriptors": {
"syntax": {
"syntax": "<string>",
"media": "all",
"percentages": "no",
"initial": "n/a (required)",
"computed": "asSpecified",
"order": "uniqueOrder",
"status": "standard",
"mdn_url": "https://developer.mozilla.org/docs/Web/CSS/@property/syntax"
},
"inherits": {
"syntax": "true | false",
"media": "all",
Expand All @@ -506,6 +496,16 @@
"order": "uniqueOrder",
"status": "standard",
"mdn_url": "https://developer.mozilla.org/docs/Web/CSS/@property/initial-value"
},
"syntax": {
"syntax": "<string>",
"media": "all",
"percentages": "no",
"initial": "n/a (required)",
"computed": "asSpecified",
"order": "uniqueOrder",
"status": "standard",
"mdn_url": "https://developer.mozilla.org/docs/Web/CSS/@property/syntax"
}
},
"status": "standard",
Expand Down Expand Up @@ -542,5 +542,27 @@
],
"status": "standard",
"mdn_url": "https://developer.mozilla.org/docs/Web/CSS/@supports"
},
"@view-transition": {
"syntax": "@view-transition {\n <declaration-list>\n}",
"interfaces": [
"CSSViewTransitionRule"
],
"groups": [
"CSS View Transitions"
],
"descriptors": {
"navigation": {
"syntax": "auto | none",
"media": "all",
"initial": "none",
"percentages": "no",
"computed": "asSpecified",
"order": "uniqueOrder",
"status": "standard"
}
},
"status": "standard",
"mdn_url": "https://developer.mozilla.org/docs/Web/CSS/@view-transition"
}
}
2 changes: 1 addition & 1 deletion css/at-rules.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ The 3 properties seen above are all required:

* `syntax` (string): This is the formal syntax of the at-rule and is usually found in the specification.
* `groups` (array of strings): CSS is organized in modules like "CSS Fonts" or "CSS Animations". MDN organizes features in these groups as well — `groups` should contain the name of the module(s) the at-rule is defined in.
* `status` (enum string): This is either `standard`, `nonstandard`, or `experimental` depending on the standardization status of the feature.
* `status` (enum string): This is either `standard`, `nonstandard`, `experimental` or `obsolete` depending on the standardization status of the feature.

There are 3 more properties that are optional:
* `mdn_url` (string): a URL linking to the at-rule's page on MDN. This URL must omit the localization part of the URL (such as `en-US/`).
Expand Down
6 changes: 4 additions & 2 deletions css/at-rules.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@
"enum": [
"standard",
"nonstandard",
"experimental"
"experimental",
"obsolete"
]
},
"mdn_url": {
Expand All @@ -118,7 +119,8 @@
"enum": [
"standard",
"nonstandard",
"experimental"
"experimental",
"obsolete"
]
},
"mdn_url": {
Expand Down
5 changes: 2 additions & 3 deletions css/definitions.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"CSS Animations",
"CSS Backgrounds and Borders",
"CSS Basic User Interface",
"CSS Box Model",
"CSS Box Alignment",
"CSS Break",
"CSS Box Model",
"CSS Box Sizing",
"CSS Cascading and Inheritance",
"CSS Charsets",
"CSS Color",
Expand Down Expand Up @@ -40,7 +40,6 @@
"CSS Overflow",
"CSS Pages",
"CSS Positioning",
"CSS Regions",
"CSS Resolutions",
"CSS Ruby",
"CSS Scroll Anchoring",
Expand Down
52 changes: 34 additions & 18 deletions css/functions.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,22 @@
"status": "standard",
"mdn_url": "https://developer.mozilla.org/docs/Web/CSS/clamp"
},
"color()": {
"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": [
Expand Down Expand Up @@ -255,6 +271,14 @@
"status": "standard",
"mdn_url": "https://developer.mozilla.org/docs/Web/CSS/filter-function/hue-rotate"
},
"hwb()": {
"syntax": "hwb( [<hue> | none] [<percentage> | none] [<percentage> | none] [ / [<alpha-value> | none] ]? )",
"groups": [
"CSS Color"
],
"status": "standard",
"mdn_url": "https://developer.mozilla.org/docs/Web/CSS/color_value/hwb"
},
"hypot()": {
"syntax": "hypot( <calc-sum># )",
"groups": [
Expand All @@ -264,14 +288,6 @@
"status": "standard",
"mdn_url": "https://developer.mozilla.org/docs/Web/CSS/hypot"
},
"hwb()": {
"syntax": "hwb( [<hue> | none] [<percentage> | none] [<percentage> | none] [ / [<alpha-value> | none] ]? )",
"groups": [
"CSS Color"
],
"status": "standard",
"mdn_url": "https://developer.mozilla.org/docs/Web/CSS/color_value/hwb"
},
"image()": {
"syntax": "image( <image-tags>? [ <image-src>? , <color>? ]! )",
"groups": [
Expand Down Expand Up @@ -540,7 +556,7 @@
"CSS Color"
],
"status": "standard",
"mdn_url": "https://developer.mozilla.org/docs/Web/CSS/gradient/repeating-linear-gradient"
"mdn_url": "https://developer.mozilla.org/docs/Web/CSS/gradient/repeating-radial-gradient"
},
"rgb()": {
"syntax": "rgb( <percentage>{3} [ / <alpha-value> ]? ) | rgb( <number>{3} [ / <alpha-value> ]? ) | rgb( <percentage>#{3} , <alpha-value>? ) | rgb( <number>#{3} , <alpha-value>? )",
Expand Down Expand Up @@ -724,6 +740,15 @@
"status": "standard",
"mdn_url": "https://developer.mozilla.org/docs/Web/CSS/sqrt"
},
"tan()": {
"syntax": "tan( <calc-sum> )",
"groups": [
"CSS Units",
"CSS Lengths"
],
"status": "standard",
"mdn_url": "https://developer.mozilla.org/docs/Web/CSS/tan"
},
"target-counter()": {
"syntax": "target-counter( [ <string> | <url> ] , <custom-ident> , <counter-style>? )",
"groups": [
Expand All @@ -745,15 +770,6 @@
],
"status": "nonstandard"
},
"tan()": {
"syntax": "tan( <calc-sum> )",
"groups": [
"CSS Units",
"CSS Lengths"
],
"status": "standard",
"mdn_url": "https://developer.mozilla.org/docs/Web/CSS/tan"
},
"translate()": {
"syntax": "translate( <length-percentage> , <length-percentage>? )",
"groups": [
Expand Down
Loading

0 comments on commit 2e8f177

Please sign in to comment.