midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Use '_svg' instead of '_ui' from the bundled svg classes

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-05-08 01:55:21 +02:00
parent 484906f08e
commit fa861bed5c
26 changed files with 116 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

6
UI/Popup/DeleteWizard.ts
View file

@ -134,7 +134,7 @@ export default class DeleteWizard extends Toggle {
new Toggle(
new Toggle(
deleteDialog,
new SubtleButton(Svg.envelope_ui(), t.readMessages),
new SubtleButton(Svg.envelope_svg(), t.readMessages),
state.osmConnection.userDetails.map(
(ud) =>
ud.csCount >
@ -192,12 +192,12 @@ export default class DeleteWizard extends Toggle {
): BaseUIElement {
const t = Translations.t.delete
const btn = new Combine([
Svg.delete_icon_ui().SetClass("w-6 h-6 mr-3 block"),
Svg.delete_icon_svg().SetClass("w-6 h-6 mr-3 block"),
t.delete,
]).SetClass("flex btn bg-red-500")
const btnNonActive = new Combine([
Svg.delete_icon_ui().SetClass("w-6 h-6 mr-3 block"),
Svg.delete_icon_svg().SetClass("w-6 h-6 mr-3 block"),
t.delete,
]).SetClass("flex btn btn-disabled bg-red-200")

2
UI/Popup/ExportAsGpxViz.ts
View file

@ -26,7 +26,7 @@ export class ExportAsGpxViz implements SpecialVisualization {
return undefined
}
return new SubtleButton(
Svg.download_ui(),
Svg.download_svg(),
new Combine([
t.downloadFeatureAsGpx.SetClass("font-bold text-lg"),
t.downloadGpxHelper.SetClass("subtle"),

4
UI/Popup/ImportButton.ts
View file

@ -161,7 +161,7 @@ ${Utils.special_visualizations_importRequirementDocs}
if (args.icon !== undefined && args.icon !== "") {
img = new Img(args.icon)
} else {
img = Svg.add_ui()
img = Svg.add_svg()
}
const inviteToImportButton = new SubtleButton(img, args.text)
@ -318,7 +318,7 @@ ${Utils.special_visualizations_importRequirementDocs}
}
})
const cancel = new SubtleButton(Svg.close_ui(), Translations.t.general.cancel).onClick(
const cancel = new SubtleButton(Svg.close_svg(), Translations.t.general.cancel).onClick(
onCancel
)
return new Combine([confirmationMap, confirmButton, cancel]).SetClass("flex flex-col")

2
UI/Popup/LoginButton.ts
View file

@ -17,7 +17,7 @@ class LoginButton extends SubtleButton {
},
icon?: BaseUIElement | string
) {
super(icon ?? Svg.login_ui(), text)
super(icon ?? Svg.login_svg(), text)
this.onClick(() => {
state.osmConnection?.AttemptLogin()
})

4
UI/Popup/MoveWizard.ts
View file

@ -95,14 +95,14 @@ export default class MoveWizard extends Toggle {
})
} else {
moveButton = new SubtleButton(
Svg.move_ui().SetStyle("width: 1.5rem; height: 1.5rem"),
Svg.move_svg().SetStyle("width: 1.5rem; height: 1.5rem"),
t.inviteToMove.generic
).onClick(() => {
currentStep.setData("reason")
})
}
const moveAgainButton = new SubtleButton(Svg.move_ui(), t.inviteToMoveAgain).onClick(() => {
const moveAgainButton = new SubtleButton(Svg.move_svg(), t.inviteToMoveAgain).onClick(() => {
currentStep.setData("reason")
})

2
UI/Popup/SaveButton.ts
View file

@ -9,7 +9,7 @@ import Svg from "../../Svg"
export class EditButton extends Toggle {
constructor(osmConnection: OsmConnection, onClick: () => void) {
super(
new Combine([Svg.pencil_ui()])
new Combine([Svg.pencil_svg()])
.SetClass("block relative h-10 w-10 p-2 float-right")
.SetStyle("border: 1px solid black; border-radius: 0.7em")
.onClick(onClick),

2
UI/Popup/SplitRoadWizard.ts
View file

@ -68,7 +68,7 @@ export default class SplitRoadWizard extends Combine {
// Toggle between splitmap
const splitButton = new SubtleButton(
Svg.scissors_ui().SetStyle("height: 1.5rem; width: auto"),
Svg.scissors_svg().SetStyle("height: 1.5rem; width: auto"),
new Toggle(
t.splitAgain.Clone().SetClass("text-lg font-bold"),
t.inviteToSplit.Clone().SetClass("text-lg font-bold"),