From 760a137ab2a676cf0f3c8246d5c424668dd524ec Mon Sep 17 00:00:00 2001 From: Alexander Shalamov Date: Mon, 25 Mar 2019 14:26:22 +0200 Subject: [PATCH] Update documentation --- docs/components/expression-metadata.js | 4 ++-- src/style-spec/reference/v8.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/components/expression-metadata.js b/docs/components/expression-metadata.js index e1672343a1c..efbd52cbd59 100644 --- a/docs/components/expression-metadata.js +++ b/docs/components/expression-metadata.js @@ -169,9 +169,9 @@ const types = { format: [{ type: 'formatted', parameters: [ - 'input_1: string, options_1: { "font-scale": number, "text-font": array }', + 'input_1: string, options_1: { "font-scale": number, "text-font": array, "text-color": color}', '...', - 'input_n: string, options_n: { "font-scale": number, "text-font": array }' + 'input_n: string, options_n: { "font-scale": number, "text-font": array, "text-color": color}' ] }], 'number-format': [{ diff --git a/src/style-spec/reference/v8.json b/src/style-spec/reference/v8.json index 3ce2a30d99c..a342ad714e5 100644 --- a/src/style-spec/reference/v8.json +++ b/src/style-spec/reference/v8.json @@ -2688,7 +2688,7 @@ } }, "format": { - "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.", + "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. If set, the `text-color` argument overrides the color specified by the paint properties for this layer.", "group": "Types", "sdk-support": { "basic functionality": {