From 3afc91b3a5c0307a74945140121d91d7210decaa Mon Sep 17 00:00:00 2001 From: Arno Deceuninck Date: Mon, 19 Jul 2021 11:47:17 +0200 Subject: [PATCH] Small styling fixes --- Svg.ts | 2 +- UI/Popup/SplitRoadWizard.ts | 27 ++++++++-------- assets/svg/license_info.json | 10 ++++++ assets/svg/scissors.svg | 63 +++++++++++++++++++++++++++++++++++- 4 files changed, 87 insertions(+), 15 deletions(-) diff --git a/Svg.ts b/Svg.ts index ee1eb79556..f1d208983a 100644 --- a/Svg.ts +++ b/Svg.ts @@ -274,7 +274,7 @@ export default class Svg { public static ring_svg() { return new Img(Svg.ring, true);} public static ring_ui() { return new FixedUiElement(Svg.ring_img);} - public static scissors = "Created by basith ibrahimfrom the Noun Project" + public static scissors = " image/svg+xml" public static scissors_img = Img.AsImageElement(Svg.scissors) public static scissors_svg() { return new Img(Svg.scissors, true);} public static scissors_ui() { return new FixedUiElement(Svg.scissors_img);} diff --git a/UI/Popup/SplitRoadWizard.ts b/UI/Popup/SplitRoadWizard.ts index 962c55a4d5..f445263e38 100644 --- a/UI/Popup/SplitRoadWizard.ts +++ b/UI/Popup/SplitRoadWizard.ts @@ -84,10 +84,10 @@ export default class SplitRoadWizard extends Toggle { ) // Only show the splitButton if logged in, else show login prompt - const splitToggle = new Toggle( - splitButton, - t.loginToSplit.Clone().onClick(() => State.state.osmConnection.AttemptLogin()), - State.state.osmConnection.isLoggedIn) + const loginBtn = t.loginToSplit.Clone() + .onClick(() => State.state.osmConnection.AttemptLogin()) + .SetClass("login-button-friendly"); + const splitToggle = new Toggle(splitButton, loginBtn, State.state.osmConnection.isLoggedIn) // Save button const saveButton = new Button(t.split.Clone(), () => { @@ -113,19 +113,20 @@ export default class SplitRoadWizard extends Toggle { }); - saveButton.SetClass("block btn btn-primary"); - const disabledSaveButton = new Button("Split here", undefined); - disabledSaveButton.SetClass("block btn btn-disabled"); + saveButton.SetClass("btn btn-primary mr-3"); + const disabledSaveButton = new Button("Split", undefined); + disabledSaveButton.SetClass("btn btn-disabled mr-3"); // Only show the save button if there are split points defined const saveToggle = new Toggle(disabledSaveButton, saveButton, splitPoints.map((data) => data.length === 0)) - const cancelButton = new Button(Translations.t.general.cancel.Clone(), () => { - splitClicked.setData(false); - splitPoints.setData([]); - splitClicked.setData(false) - }); + const cancelButton = Translations.t.general.cancel.Clone() // Not using Button() element to prevent full width button + .SetClass("btn btn-secondary mr-3") + .onClick(() => { + splitPoints.setData([]); + splitClicked.setData(false); + }); - cancelButton.SetClass("block btn btn-secondary"); + cancelButton.SetClass("btn btn-secondary block"); const splitTitle = new Title(t.splitTitle); diff --git a/assets/svg/license_info.json b/assets/svg/license_info.json index 2d0848c432..4a1b0099d8 100644 --- a/assets/svg/license_info.json +++ b/assets/svg/license_info.json @@ -604,5 +604,15 @@ "sources": [ "https://commons.wikimedia.org/wiki/File:Media-floppy.svg" ] + }, + { + "authors": [ + "The noun project - Basith Ibrahi" + ], + "path": "scissors.svg", + "license": "CC-BY 3.0", + "sources": [ + "https://commons.wikimedia.org/wiki/File:Media-floppy.svg" + ] } ] \ No newline at end of file diff --git a/assets/svg/scissors.svg b/assets/svg/scissors.svg index be55cb4760..6868fe515f 100644 --- a/assets/svg/scissors.svg +++ b/assets/svg/scissors.svg @@ -1 +1,62 @@ -Created by basith ibrahimfrom the Noun Project \ No newline at end of file + +image/svg+xml \ No newline at end of file