Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion specification/v1_0/catalogs/basic/catalog.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"variant": {
"type": "string",
"description": "A hint for the base text style.",
"enum": ["h1", "h2", "h3", "h4", "h5", "caption", "body"],
"enum": ["caption", "body"],
Comment thread
ditman marked this conversation as resolved.
"default": "body"
}
},
Expand Down
28 changes: 14 additions & 14 deletions specification/v1_0/catalogs/basic/examples/01_flight-status.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@
"component": "Text",
"text": {
"path": "/flightNumber"
},
"variant": "h3"
}
},
{
"id": "date",
Expand All @@ -76,23 +75,26 @@
"id": "origin",
"component": "Text",
"text": {
"path": "/origin"
},
"variant": "h2"
"call": "formatString",
"args": {
"value": "## ${/origin}"

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahhh! I hadn't contemplated that formatString would become so much more important with this change, so you can inject static markdown into dynamic strings. I think it's okay though!

}
}
},
{
"id": "arrow",
"component": "Text",
"text": "\u2192",
"variant": "h2"
"text": "## \u2192"
},
{
"id": "destination",
"component": "Text",
"text": {
"path": "/destination"
},
"variant": "h2"
"call": "formatString",
"args": {
"value": "## ${/destination}"
}
}
},
{
"id": "divider",
Expand Down Expand Up @@ -127,8 +129,7 @@
},
"format": "h:mm a"
}
},
"variant": "h3"
}
},
{
"id": "status-col",
Expand Down Expand Up @@ -173,8 +174,7 @@
},
"format": "h:mm a"
}
},
"variant": "h3"
}
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@
},
"format": "d"
}
},
"variant": "h1"
}
},
{
"id": "events-col",
Expand Down
21 changes: 10 additions & 11 deletions specification/v1_0/catalogs/basic/examples/04_weather-current.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,29 +38,29 @@
"text": {
"call": "formatString",
"args": {
"value": "${/tempHigh}\u00b0"
"value": "# ${/tempHigh}°"
}
},
"variant": "h1"
}
},
{
"id": "temp-low",
"component": "Text",
"text": {
"call": "formatString",
"args": {
"value": "${/tempLow}\u00b0"
"value": "## ${/tempLow}°"
}
},
"variant": "h2"
}
},
{
"id": "location",
"component": "Text",
"text": {
"path": "/location"
},
"variant": "h3"
"call": "formatString",
"args": {
"value": "### ${/location}"
}
}
},
Comment thread
gspencergoog marked this conversation as resolved.
{
"id": "description",
Expand Down Expand Up @@ -104,8 +104,7 @@
"component": "Text",
"text": {
"path": "icon"
},
"variant": "h3"
}
},
{
"id": "day-temp",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@
"component": "Text",
"text": {
"path": "/name"
},
"variant": "h3"
}
},
{
"id": "rating-row",
Expand Down Expand Up @@ -88,8 +87,7 @@
},
"currency": "USD"
}
},
"variant": "h2"
}
},
{
"id": "original-price",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@
"component": "Text",
"text": {
"path": "/title"
},
"variant": "h3"
}
},
{
"id": "artist",
Expand Down
3 changes: 1 addition & 2 deletions specification/v1_0/catalogs/basic/examples/07_task-card.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@
"component": "Text",
"text": {
"path": "/title"
},
"variant": "h3"
}
},
{
"id": "description",
Expand Down
12 changes: 4 additions & 8 deletions specification/v1_0/catalogs/basic/examples/08_user-profile.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@
"component": "Text",
"text": {
"path": "/name"
},
"variant": "h2"
}
},
{
"id": "username",
Expand Down Expand Up @@ -87,8 +86,7 @@
"path": "/followers"
}
}
},
"variant": "h3"
}
},
{
"id": "followers-label",
Expand All @@ -112,8 +110,7 @@
"path": "/following"
}
}
},
"variant": "h3"
}
},
{
"id": "following-label",
Expand All @@ -137,8 +134,7 @@
"path": "/posts"
}
}
},
"variant": "h3"
}
},
{
"id": "posts-label",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@
{
"id": "title",
"component": "Text",
"text": "Welcome back",
"variant": "h2"
"text": "## Welcome back"
},
{
"id": "subtitle",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@
"component": "Text",
"text": {
"path": "/title"
},
"variant": "h3"
}
},
{
"id": "description",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@
{
"id": "title",
"component": "Text",
"text": "Purchase Complete",
"variant": "h2"
"text": "## Purchase Complete"
},
{
"id": "product-row",
Expand All @@ -68,8 +67,7 @@
"component": "Text",
"text": {
"path": "/productName"
},
"variant": "h4"
}
},
{
"id": "product-price",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@
"component": "Text",
"text": {
"path": "/channelName"
},
"variant": "h3"
}
},
{
"id": "divider",
Expand Down Expand Up @@ -88,8 +87,7 @@
"component": "Text",
"text": {
"path": "username"
},
"variant": "h4"
}
},
{
"id": "msg-time",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@
"component": "Text",
"text": {
"path": "/storeName"
},
"variant": "h3"
}
},
{
"id": "items-list",
Expand Down Expand Up @@ -164,8 +163,7 @@
{
"id": "total-label",
"component": "Text",
"text": "Total",
"variant": "h4"
"text": "#### Total"
},
{
"id": "total-value",
Expand All @@ -178,8 +176,7 @@
},
"currency": "USD"
}
},
"variant": "h4"
}
},
{
"id": "actions",
Expand Down
15 changes: 5 additions & 10 deletions specification/v1_0/catalogs/basic/examples/14_sports-player.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@
"component": "Text",
"text": {
"path": "/playerName"
},
"variant": "h2"
}
},
{
"id": "player-details",
Expand All @@ -59,8 +58,7 @@
"component": "Text",
"text": {
"path": "/number"
},
"variant": "h3"
}
},
{
"id": "player-team",
Expand Down Expand Up @@ -91,8 +89,7 @@
"component": "Text",
"text": {
"path": "/stat1/value"
},
"variant": "h3"
}
},
{
"id": "stat1-label",
Expand All @@ -113,8 +110,7 @@
"component": "Text",
"text": {
"path": "/stat2/value"
},
"variant": "h3"
}
},
{
"id": "stat2-label",
Expand All @@ -135,8 +131,7 @@
"component": "Text",
"text": {
"path": "/stat3/value"
},
"variant": "h3"
}
},
{
"id": "stat3-label",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@
"component": "Text",
"text": {
"path": "/accountName"
},
"variant": "h4"
}
},
{
"id": "balance",
Expand All @@ -55,8 +54,7 @@
},
"currency": "USD"
}
},
"variant": "h1"
}
},
{
"id": "updated",
Expand Down
Loading
Loading