Skip to content

Commit

Permalink
Add px to Column.width and some other schema description updates (mic…
Browse files Browse the repository at this point in the history
…rosoft#3080)

* Add pixel widths to column

* Describe the pixel format of minHeight

* Update 1.2.0 schema descriptions

There's no actual schema validation changes, just description changes, so no need to bump the version number
  • Loading branch information
andrewleader authored Jun 18, 2019
1 parent 1636f37 commit 8efc5bc
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions schemas/1.2.0/adaptive-card.json
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@
},
"minHeight": {
"type": "string",
"description": "Specifies the minimum height of the column.",
"description": "Specifies the minimum height of the column in pixels, like `\"80px\"`.",
"examples": [
"50px"
],
Expand Down Expand Up @@ -399,7 +399,7 @@
"type": "number"
}
],
"description": "`\"auto\"`, `\"stretch\"`, or a number representing relative width of the column in the column group."
"description": "`\"auto\"`, `\"stretch\"`, a number representing relative width of the column in the column group, or in version 1.1 and higher, a specific pixel width, like `\"50px\"`."
},
"id": {},
"isVisible": {},
Expand Down Expand Up @@ -470,7 +470,7 @@
},
"minHeight": {
"type": "string",
"description": "Specifies the minimum height of the column set.",
"description": "Specifies the minimum height of the column set in pixels, like `\"80px\"`.",
"examples": [
"50px"
],
Expand Down Expand Up @@ -557,7 +557,7 @@
},
"minHeight": {
"type": "string",
"description": "Specifies the minimum height of the container.",
"description": "Specifies the minimum height of the container in pixels, like `\"80px\"`.",
"examples": [
"50px"
],
Expand Down
4 changes: 2 additions & 2 deletions schemas/src/elements/Column.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
"minHeight": {
"type": "string",
"description": "Specifies the minimum height of the column.",
"description": "Specifies the minimum height of the column in pixels, like `\"80px\"`.",
"examples": [
"50px"
],
Expand Down Expand Up @@ -67,7 +67,7 @@
},
"width": {
"type": "string|number",
"description": "`\"auto\"`, `\"stretch\"`, or a number representing relative width of the column in the column group."
"description": "`\"auto\"`, `\"stretch\"`, a number representing relative width of the column in the column group, or in version 1.1 and higher, a specific pixel width, like `\"50px\"`."
}
}
}
2 changes: 1 addition & 1 deletion schemas/src/elements/ColumnSet.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"minHeight": {
"type": "string",
"description": "Specifies the minimum height of the column set.",
"description": "Specifies the minimum height of the column set in pixels, like `\"80px\"`.",
"examples": [
"50px"
],
Expand Down
2 changes: 1 addition & 1 deletion schemas/src/elements/Container.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
},
"minHeight": {
"type": "string",
"description": "Specifies the minimum height of the container.",
"description": "Specifies the minimum height of the container in pixels, like `\"80px\"`.",
"examples": [
"50px"
],
Expand Down

0 comments on commit 8efc5bc

Please sign in to comment.