Skip to content

Commit

Permalink
Merge branch 'mdn:main' into 29786-ship-light-dark
Browse files Browse the repository at this point in the history
  • Loading branch information
dletorey authored Nov 13, 2023
2 parents 522137a + e68e09d commit 8da6399
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<!-- 🙌 Thanks for contributing! Adding details below will help us to merge your PR faster. -->

<!-- Commits need to adhere to conventional commits and only `fix:` and `feat:` commits are added to the release notes. -->
<!-- https://www.conventionalcommits.org/en/v1.0.0/#examples -->

### Description

<!-- ✍️ Summarize your changes in one or two sentences -->
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Changelog

## [2.3.0](https://github.com/mdn/data/compare/v2.2.0...v2.3.0) (2023-11-08)


### Features

* add data for [@scope](https://github.com/scope) ([#693](https://github.com/mdn/data/issues/693)) ([c607a85](https://github.com/mdn/data/commit/c607a85f66e4137e1790cdac8e39c3a09a038848))

## [2.2.0](https://github.com/mdn/data/compare/v2.1.0...v2.2.0) (2023-11-03)


### Features

* 28841 font synthesis position ([#691](https://github.com/mdn/data/issues/691)) ([5ced75f](https://github.com/mdn/data/commit/5ced75feb9c1c7096c3ce7b2844fa29104d5f3cb))

## [2.1.0](https://github.com/mdn/data/compare/v2.0.33...v2.1.0) (2023-08-29)


Expand Down
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ There are many ways you can help improve this repository! For example:
Let us know if these look good to you.
- **Localizing strings:** translations are in the [l10n folder](./l10n). You can add your locale.

**Note**: Commits need to adhere to [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/) and only `fix:` and `feat:` commits are considered.

### CSS data tasks

- **Updating CSS data**: familiarize yourself with the [CSS schema files](./css/README.md) and add missing CSS data. An additional guide is provided in the [How to update the CSS JSON DB](./docs/updating_css_json.md) document.
Expand Down
8 changes: 8 additions & 0 deletions css/at-rules.json
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,14 @@
"status": "experimental",
"mdn_url": "https://developer.mozilla.org/docs/Web/CSS/@property"
},
"@scope": {
"syntax": "@scope [(<scope-start>)]? [to (<scope-end>)]? {\n <rule-list>\n}",
"groups": [
"CSS Conditional Rules"
],
"status": "standard",
"mdn_url": "https://developer.mozilla.org/docs/Web/CSS/@scope"
},
"@scroll-timeline": {
"syntax": "@scroll-timeline <timeline-name> { <declaration-list> }",
"interfaces": [
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mdn-data",
"version": "2.1.0",
"version": "2.3.0",
"description": "Open Web data by the Mozilla Developer Network",
"main": "index.js",
"files": [
Expand Down

0 comments on commit 8da6399

Please sign in to comment.