Merge master

This commit is contained in:
Pieter Vander Vennet 2020-11-21 16:46:05 +01:00
commit d953dd4aa6
29 changed files with 348 additions and 83 deletions

View file

@ -45,10 +45,13 @@ export class FullScreenMessageBox extends UIElement {
return "";
}
this._content = State.state.fullScreenMessage.data;
const uielement = new Combine([this._content]).SetStyle(
"display:block;" +
const innerWrap = new Combine([this._content]).SetStyle(
"display: block;" +
"padding: 1em;" +
"padding-bottom:6em;" +
"padding-bottom: 6em; "
);
const uielement = new Combine([innerWrap]).SetStyle(
"display:block;" +
`margin-bottom: var(--return-to-the-map-height);` +
"box-sizing:border-box;" +
`height:calc(100vh - var(--return-to-the-map-height));` +

View file

@ -33,7 +33,7 @@ export default class EditableTagRendering extends UIElement {
this.dumbMode = false;
if (this._configuration.question !== undefined) {
if (State.state.featureSwitchUserbadge.data) {
if (State.state?.featureSwitchUserbadge?.data) {
// 2.3em total width
const self = this;
this._editButton =

View file

@ -44,9 +44,13 @@ export class FeatureInfoBox extends UIElement {
return new Combine([
new Combine([this._title, this._titleIcons])
.SetClass("featureinfobox-titlebar"),
...this._renderings,
this._questionBox,
]).Render();
new Combine([
...this._renderings,
this._questionBox
]
).SetClass("featureinfobox-content"),
]).SetClass("featureinfobox")
.Render();
}
}

View file

@ -109,7 +109,7 @@ export class UserBadge extends UIElement {
const userName = new Link(
new FixedUiElement(user.name),
`https://www.openstreetmap.org/user/${user.name}'`,
`https://www.openstreetmap.org/user/${user.name}`,
true);