From 5eee18c20624f6cd3e5d8b1ce6be2543067cae07 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Thu, 6 Jan 2022 21:35:52 +0100 Subject: [PATCH] Fix layout and color issues --- Models/ThemeConfig/PointRenderingConfig.ts | 2 +- UI/BigComponents/FilterView.ts | 4 ++-- UI/ShowDataLayer/ShowDataLayer.ts | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Models/ThemeConfig/PointRenderingConfig.ts b/Models/ThemeConfig/PointRenderingConfig.ts index 7ecb713e70..650dd50660 100644 --- a/Models/ThemeConfig/PointRenderingConfig.ts +++ b/Models/ThemeConfig/PointRenderingConfig.ts @@ -89,7 +89,7 @@ export default class PointRenderingConfig extends WithContextLoader { if (match !== null && Svg.All[match[1] + ".svg"] !== undefined) { const svg = (Svg.All[match[1] + ".svg"] as string) const targetColor = match[2] - const img = new Img(svg.replace(/#000000/g, targetColor), true) + const img = new Img(svg.replace(/rgb\(0%,0%,0%\)/g, targetColor), true) .SetStyle(style) if (isBadge) { img.SetClass("badge") diff --git a/UI/BigComponents/FilterView.ts b/UI/BigComponents/FilterView.ts index 8842897145..011083a3f0 100644 --- a/UI/BigComponents/FilterView.ts +++ b/UI/BigComponents/FilterView.ts @@ -196,8 +196,8 @@ export default class FilterView extends VariableUiElement { if (filterConfig.options.length === 1) { let option = filterConfig.options[0]; - const icon = Svg.checkbox_filled_svg().SetClass("block mr-2"); - const iconUnselected = Svg.checkbox_empty_svg().SetClass("block mr-2"); + const icon = Svg.checkbox_filled_svg().SetClass("block mr-2 w-6"); + const iconUnselected = Svg.checkbox_empty_svg().SetClass("block mr-2 w-6"); const toggle = new Toggle( new Combine([icon, option.question.Clone().SetClass("block")]).SetClass("flex"), diff --git a/UI/ShowDataLayer/ShowDataLayer.ts b/UI/ShowDataLayer/ShowDataLayer.ts index 7e372e7a79..0640c22044 100644 --- a/UI/ShowDataLayer/ShowDataLayer.ts +++ b/UI/ShowDataLayer/ShowDataLayer.ts @@ -153,7 +153,6 @@ export default class ShowDataLayer { if (mp === undefined) { return; } - console.trace("Updating... " + mp["_container"]?.id +" for layer "+this._layerToShow.id) this._cleanCount++ // clean all the old stuff away, if any if (this.geoLayer !== undefined) {