From e09da9166a871965a8e692e1b5995a5d09b6c29c Mon Sep 17 00:00:00 2001 From: CTomlyn Date: Wed, 31 Jul 2024 13:24:29 -0700 Subject: [PATCH] #2083 With WYSIWYG comments IBM Plex Condensed font display incorrectly (#2084) Signed-off-by: CTomlyn --- .../common-canvas/locales/common-canvas/locales/en.json | 2 +- .../common-canvas/locales/common-canvas/locales/eo.json | 2 +- .../common-canvas/src/common-canvas/cc-text-toolbar.jsx | 2 +- .../common-canvas/src/common-canvas/common-canvas-utils.js | 2 +- .../custom-canvases/wysiwyg-comments/wysiwyg-comments-flow.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/canvas_modules/common-canvas/locales/common-canvas/locales/en.json b/canvas_modules/common-canvas/locales/common-canvas/locales/en.json index cbb0ed2f81..2a78f76182 100644 --- a/canvas_modules/common-canvas/locales/common-canvas/locales/en.json +++ b/canvas_modules/common-canvas/locales/common-canvas/locales/en.json @@ -56,7 +56,7 @@ "texttoolbar.fontAction": "Font", "texttoolbar.fontIBMPlexSans": "IBM Plex Sans", "texttoolbar.fontIBMPlexSerif": "IBM Plex Serif", - "texttoolbar.fontIBMPlexCon": "IBM Plex Condensed", + "texttoolbar.fontIBMPlexSansCon": "IBM Plex Sans Condensed", "texttoolbar.fontIBMPlexMono": "IBM Plex Mono", "texttoolbar.fontArial": "Arial", "texttoolbar.fontComicSansMS": "Comic Sans MS", diff --git a/canvas_modules/common-canvas/locales/common-canvas/locales/eo.json b/canvas_modules/common-canvas/locales/common-canvas/locales/eo.json index bef063df5e..8cd7a39ed5 100644 --- a/canvas_modules/common-canvas/locales/common-canvas/locales/eo.json +++ b/canvas_modules/common-canvas/locales/common-canvas/locales/eo.json @@ -56,7 +56,7 @@ "texttoolbar.fontAction": "[Esperanto~Font~~eo]", "texttoolbar.fontIBMPlexSans": "[Esperanto~IBM Plex Sans~~eo]", "texttoolbar.fontIBMPlexSerif": "[Esperanto~IBM Plex Serif~~eo]", - "texttoolbar.fontIBMPlexCon": "[Esperanto~IBM Plex Condensed~~eo]", + "texttoolbar.fontIBMPlexSansCon": "[Esperanto~IBM Plex Sans Condensed~~eo]", "texttoolbar.fontIBMPlexMono": "[Esperanto~IBM Plex Mono~~eo]", "texttoolbar.fontArial": "[Esperanto~Arial~~eo]", "texttoolbar.fontComicSansMS": "[Esperanto~Comic Sans MS~~eo]", diff --git a/canvas_modules/common-canvas/src/common-canvas/cc-text-toolbar.jsx b/canvas_modules/common-canvas/src/common-canvas/cc-text-toolbar.jsx index 6f0551e142..48fb10bf05 100644 --- a/canvas_modules/common-canvas/src/common-canvas/cc-text-toolbar.jsx +++ b/canvas_modules/common-canvas/src/common-canvas/cc-text-toolbar.jsx @@ -105,7 +105,7 @@ class CommonCanvasTextToolbar extends React.Component { const subMenuFont = [ { action: "font-ibm-plex-sans", label: this.getLabel("texttoolbar.fontIBMPlexSans"), enable: true }, { action: "font-ibm-plex-serif", label: this.getLabel("texttoolbar.fontIBMPlexSerif"), enable: true }, - { action: "font-ibm-plex-condensed", label: this.getLabel("texttoolbar.fontIBMPlexCon"), enable: true }, + { action: "font-ibm-plex-sans-condensed", label: this.getLabel("texttoolbar.fontIBMPlexSansCon"), enable: true }, { action: "font-ibm-plex-mono", label: this.getLabel("texttoolbar.fontIBMPlexMono"), enable: true }, { action: "font-arial", label: this.getLabel("texttoolbar.fontArial"), enable: true }, { action: "font-comic-sans-ms", label: this.getLabel("texttoolbar.fontComicSansMS"), enable: true }, diff --git a/canvas_modules/common-canvas/src/common-canvas/common-canvas-utils.js b/canvas_modules/common-canvas/src/common-canvas/common-canvas-utils.js index 2778f518cf..d2c9a94309 100644 --- a/canvas_modules/common-canvas/src/common-canvas/common-canvas-utils.js +++ b/canvas_modules/common-canvas/src/common-canvas/common-canvas-utils.js @@ -1423,7 +1423,7 @@ export default class CanvasUtils { default: case ("font-ibm-plex-sans"): return "\"IBM Plex Sans\", sans-serif"; case ("font-ibm-plex-serif"): return "\"IBM Plex Serif\", serif"; - case ("font-ibm-plex-condensed"): return "IBM Plex Condensed"; + case ("font-ibm-plex-sans-condensed"): return "IBM Plex Sans Condensed"; case ("font-ibm-plex-mono"): return "\"IBM Plex Mono\", monospace"; case ("font-arial"): return "\"Arial\", sans-serif"; case ("font-comic-sans-ms"): return "\"Comic Sans MS\", sans-serif"; diff --git a/canvas_modules/harness/src/client/components/custom-canvases/wysiwyg-comments/wysiwyg-comments-flow.json b/canvas_modules/harness/src/client/components/custom-canvases/wysiwyg-comments/wysiwyg-comments-flow.json index 028976dabc..ce77c136b4 100644 --- a/canvas_modules/harness/src/client/components/custom-canvases/wysiwyg-comments/wysiwyg-comments-flow.json +++ b/canvas_modules/harness/src/client/components/custom-canvases/wysiwyg-comments/wysiwyg-comments-flow.json @@ -61,7 +61,7 @@ "formats": [ { "type": "fontType", - "value": "font-ibm-plex-condensed" + "value": "font-ibm-plex-sans-condensed" }, { "type": "textSize",