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

Merge master

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-01-30 19:06:41 +01:00
commit 74489d5e3f
40 changed files with 1738 additions and 821 deletions
Download patch file Download diff file Expand all files Collapse all files

2
UI/CenterMessageBox.ts
View file

@ -27,7 +27,7 @@ export default class CenterMessageBox extends VariableUiElement {
super(message.map(toShow => toShow.el))
this.SetClass("flex justify-around " +
this.SetClass("flex justify-center " +
"rounded-3xl bg-white text-xl font-bold pointer-events-none p-4")
this.SetStyle("transition: opacity 750ms linear")

2
UI/ImportFlow/ImportViewerGui.ts
View file

@ -300,7 +300,7 @@ class ImportViewerGui extends Combine {
const display_name = displayNameParam.data;
const search = searchParam.data;
if (display_name !== "" && search !== "") {
return new ImportInspector({display_name, search}, state);
return new ImportInspector({display_name, search}, undefined);
}
if (ud === undefined || ud.loggedIn === false) {

9
UI/Popup/EditableTagRendering.ts
View file

@ -10,6 +10,7 @@ import TagRenderingConfig from "../../Models/ThemeConfig/TagRenderingConfig";
import {Unit} from "../../Models/Unit";
import Lazy from "../Base/Lazy";
import {OsmConnection} from "../../Logic/Osm/OsmConnection";
import {FixedUiElement} from "../Base/FixedUiElement";
export default class EditableTagRendering extends Toggle {
@ -33,8 +34,14 @@ export default class EditableTagRendering extends Toggle {
super(
new Lazy(() => {
const editMode = options.editMode ?? new UIEventSource<boolean>(false)
const rendering = EditableTagRendering.CreateRendering(state, tags, configuration, units, editMode);
let rendering = EditableTagRendering.CreateRendering(state, tags, configuration, units, editMode);
rendering.SetClass(options.innerElementClasses)
if(state.featureSwitchIsDebugging.data){
rendering = new Combine([
new FixedUiElement(configuration.id).SetClass("self-end subtle"),
rendering
]).SetClass("flex flex-col")
}
return rendering
}),
undefined,