Skip to content

Commit

Permalink
Basic docs for "formatted"
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisLoer committed Jul 24, 2018
1 parent 1c43c07 commit ab97b1f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/style-spec/reference/v8.json
Original file line number Diff line number Diff line change
Expand Up @@ -1505,7 +1505,7 @@
"property-type": "data-constant"
},
"text-field": {
"type": "string",
"type": "string | formatted",
"default": "",
"tokens": true,
"doc": "Value to use for a text label.",
Expand Down Expand Up @@ -2506,7 +2506,7 @@
}
},
"formatted": {
"doc": "Formatted text.",
"doc": "Returns `formatted` text containing annotations for use in mixed-format `text-field` entries. If set, the `text-font` argument overrides the font specified by the root layout properties. If set, the `font-scale` argument specifies a scaling factor relative to the `text-size` specified in the root layout properties.",
"group": "Types",
"sdk-support": {
"basic functionality": {
Expand Down Expand Up @@ -3108,7 +3108,7 @@
}
},
"concat": {
"doc": "Returns a string consisting of the concatenation of the inputs.",
"doc": "Returns a `string` consisting of the concatenation of the inputs. If any inputs are `formatted`, returns a `formatted` with default formatting options for all unformatted inputs.",
"group": "String",
"sdk-support": {
"basic functionality": {
Expand Down

0 comments on commit ab97b1f

Please sign in to comment.