From ff81dab04b9214e2345c92423128653161caef4d Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Thu, 14 Oct 2021 17:38:00 +0200 Subject: [PATCH] Styling of move, delete and split-road buttons --- UI/Popup/DeleteWizard.ts | 4 ++-- UI/Popup/MoveWizard.ts | 7 ++++--- UI/Popup/SplitRoadWizard.ts | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/UI/Popup/DeleteWizard.ts b/UI/Popup/DeleteWizard.ts index fec675e84f..fb2bad1fde 100644 --- a/UI/Popup/DeleteWizard.ts +++ b/UI/Popup/DeleteWizard.ts @@ -93,12 +93,12 @@ export default class DeleteWizard extends Toggle { * The button which is shown first. Opening it will trigger the check for deletions */ const deleteButton = new SubtleButton( - Svg.delete_icon_ui().SetStyle("width: 2rem; height: 2rem;"), t.delete.Clone()).onClick( + Svg.delete_icon_ui().SetStyle("width: auto; height: 1.5rem;"), t.delete.Clone()).onClick( () => { deleteAbility.CheckDeleteability(true) confirm.setData(true); } - ).SetClass("w-1/2 float-right"); + ) const isShown = new UIEventSource(id.indexOf("-") < 0) diff --git a/UI/Popup/MoveWizard.ts b/UI/Popup/MoveWizard.ts index 6a5d4a07bf..4698d3743b 100644 --- a/UI/Popup/MoveWizard.ts +++ b/UI/Popup/MoveWizard.ts @@ -18,11 +18,12 @@ import LayoutConfig from "../../Models/ThemeConfig/LayoutConfig"; import MoveConfig from "../../Models/ThemeConfig/MoveConfig"; import AvailableBaseLayers from "../../Logic/Actors/AvailableBaseLayers"; import {ElementStorage} from "../../Logic/ElementStorage"; +import Img from "../Base/Img"; interface MoveReason { text: Translation | string, invitingText: Translation | string, - icon: string | BaseUIElement, + icon: BaseUIElement, changesetCommentValue: string, lockBounds: true | boolean, background: undefined | "map" | "photo" | string | string[], @@ -84,14 +85,14 @@ export default class MoveWizard extends Toggle { const reason = reasons[0] moveReason.setData(reason) moveButton = new SubtleButton( - reason.icon, + reason.icon.SetStyle("height: 1.5rem; width: auto;"), Translations.WT(reason.invitingText).Clone() ).onClick(() => { currentStep.setData("pick_location") }) }else{ moveButton = new SubtleButton( - Svg.move_ui(), + Svg.move_ui().SetStyle("height: 1.5rem; width: auto"), t.inviteToMove.generic.Clone() ).onClick(() => { currentStep.setData("reason") diff --git a/UI/Popup/SplitRoadWizard.ts b/UI/Popup/SplitRoadWizard.ts index 86e137fa3c..0127a865af 100644 --- a/UI/Popup/SplitRoadWizard.ts +++ b/UI/Popup/SplitRoadWizard.ts @@ -120,7 +120,7 @@ export default class SplitRoadWizard extends Toggle { })) // Toggle between splitmap - const splitButton = new SubtleButton(Svg.scissors_ui(), t.inviteToSplit.Clone().SetClass("text-lg font-bold")); + const splitButton = new SubtleButton(Svg.scissors_ui().SetStyle("height: 1.5rem; width: auto"), t.inviteToSplit.Clone().SetClass("text-lg font-bold")); splitButton.onClick( () => { splitClicked.setData(true)