Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into select-null
Browse files Browse the repository at this point in the history
Conflicts:
	vocabularies/UI.md
  • Loading branch information
HeikoTheissen committed Oct 18, 2021
2 parents ac3b1dc + bded5d8 commit 7dc3d74
Show file tree
Hide file tree
Showing 4 changed files with 245 additions and 209 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:

strategy:
matrix:
node-version: [12.x]
node-version: [12.x, 14.x, 16.x]

steps:
- uses: actions/checkout@v2
Expand Down
8 changes: 6 additions & 2 deletions vocabularies/UI.json
Original file line number Diff line number Diff line change
Expand Up @@ -1126,6 +1126,9 @@
"$Kind": "ComplexType",
"$Abstract": true,
"@Core.Description": "Abstract base type for facets",
"@Validation.ApplicableTerms": [
"UI.PartOfPreview"
],
"Label": {
"$Nullable": true,
"@Core.IsLanguageDependent": true,
Expand Down Expand Up @@ -1503,8 +1506,8 @@
"$AppliesTo": [
"Record"
],
"@Core.Description": "This Facet and all included Facets are part of the Thing preview",
"@Core.RequiresType": "UI.Facet"
"@Core.Description": "This record and all included structural elements are part of the Thing preview",
"@Core.LongDescription": "This term can be applied e.g. to UI.Facet and UI.DataField"
},
"Map": {
"$Kind": "Term",
Expand Down Expand Up @@ -1687,6 +1690,7 @@
"@Validation.ApplicableTerms": [
"UI.Hidden",
"UI.Importance",
"UI.PartOfPreview",
"HTML5.CssDefaults"
],
"Label": {
Expand Down
Loading

0 comments on commit 7dc3d74

Please sign in to comment.