Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

theme.json schema: Allow object type on style properties #45897

Merged
merged 13 commits into from
Dec 20, 2022
Merged

theme.json schema: Allow object type on style properties #45897

Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ae29bde
Allow objects on color properties
mikachan Nov 18, 2022
d1a0d8e
Add definition for ref property
mikachan Nov 18, 2022
6096487
Reduce repetition in property definitions
mikachan Nov 18, 2022
b914874
Move properties def to oneOf array
mikachan Nov 21, 2022
7992e54
Fix $ref path
mikachan Nov 21, 2022
0fd839b
Move ref def to global scope
mikachan Nov 21, 2022
5974460
Apply ref type to all style properties
mikachan Nov 21, 2022
1441c4e
Update docs
mikachan Nov 21, 2022
73236fb
Result of docs:build script
mikachan Nov 30, 2022
59e34ec
Merge branch 'trunk' into update/theme-json-schema-for-refs
mikachan Dec 16, 2022
b467666
Merge branch 'trunk' into update/theme-json-schema-for-refs
mikachan Dec 20, 2022
679ecbc
Run docs:build to update docs
mikachan Dec 20, 2022
ea9eb1c
Make ref logic more specific
mikachan Dec 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions schemas/json/theme.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,15 +1023,35 @@
"properties": {
"background": {
"description": "Sets the `background-color` CSS property.",
"type": "string"
"oneOf": [
{ "type": "string" },
{ "type": "object" }
],
"properties": {
mikachan marked this conversation as resolved.
Show resolved Hide resolved
"ref": {
"description": "A reference to another property value. e.g. `styles.color.text`",
"type": "string"
}
},
"additionalProperties": false
},
"gradient": {
"description": "Sets the `background` CSS property.",
"type": "string"
"oneOf": [
{ "type": "string" },
{ "type": "object" }
],
"$ref": "#/definitions/stylesProperties/properties/color/properties/background/properties",
mikachan marked this conversation as resolved.
Show resolved Hide resolved
"additionalProperties": false
},
"text": {
"description": "Sets the `color` CSS property.",
"type": "string"
"oneOf": [
{ "type": "string" },
{ "type": "object" }
],
"$ref": "#/definitions/stylesProperties/properties/color/properties/background/properties",
"additionalProperties": false
}
},
"additionalProperties": false
Expand Down