From c2ee0586827500a8ae99707cf6f83118d57071bb Mon Sep 17 00:00:00 2001 From: Tobias Date: Sun, 17 Jan 2021 21:04:37 +0100 Subject: [PATCH] Remove a few empty spaces and line breaks Most it is done by my editor automatically. --- UI/Base/FixedUiElement.ts | 1 - UI/Base/SubtleButton.ts | 6 +++--- UI/BigComponents/MoreScreen.ts | 8 ++++---- UI/Input/DropDown.ts | 4 ++-- assets/translations.json | 6 +++--- css/mobile.css | 10 +++++----- index.css | 2 -- scripts/createLayouts.ts | 6 ++---- 8 files changed, 19 insertions(+), 24 deletions(-) diff --git a/UI/Base/FixedUiElement.ts b/UI/Base/FixedUiElement.ts index 0579092..a0941e5 100644 --- a/UI/Base/FixedUiElement.ts +++ b/UI/Base/FixedUiElement.ts @@ -12,5 +12,4 @@ export class FixedUiElement extends UIElement { return this._html; } - } \ No newline at end of file diff --git a/UI/Base/SubtleButton.ts b/UI/Base/SubtleButton.ts index 1fd801d..c60d08d 100644 --- a/UI/Base/SubtleButton.ts +++ b/UI/Base/SubtleButton.ts @@ -14,7 +14,7 @@ export class SubtleButton extends UIElement{ this.linkTo = linkTo; this.message = Translations.W(message); if(this.message !== null){ - this.message.dumbMode = false; + this.message.dumbMode = false; } if ((imageUrl ?? "") === "") { this.image = new FixedUiElement(""); @@ -27,7 +27,7 @@ export class SubtleButton extends UIElement{ } InnerRender(): string { - + if(this.message !== null && this.message.IsEmpty()){ // Message == null: special case to force empty text return ""; @@ -41,7 +41,7 @@ export class SubtleButton extends UIElement{ '' ]).Render(); } - + return new Combine([ '', this.image, diff --git a/UI/BigComponents/MoreScreen.ts b/UI/BigComponents/MoreScreen.ts index cc68b85..1aa24fb 100644 --- a/UI/BigComponents/MoreScreen.ts +++ b/UI/BigComponents/MoreScreen.ts @@ -14,10 +14,10 @@ import LanguagePicker from "../LanguagePicker"; export default class MoreScreen extends UIElement { private readonly _onMainScreen: boolean; - + private _component: UIElement; - + constructor(onMainScreen: boolean = false) { super(State.state.locationControl); this._onMainScreen = onMainScreen; @@ -111,7 +111,7 @@ export default class MoreScreen extends UIElement { const customThemesNames = State.state.installedThemes.data ?? []; - + if (customThemesNames.length > 0) { els.push(Translations.t.general.customThemeIntro) @@ -123,7 +123,7 @@ export default class MoreScreen extends UIElement { let intro : UIElement= tr.intro; if(this._onMainScreen){ intro = new Combine([ - + LanguagePicker.CreateLanguagePicker(Translations.t.general.index.SupportedLanguages()) .SetStyle("position: absolute; right: 1.5em; top: 1.5em;"), Translations.t.general.index.SetStyle("margin-top: 2em;display:block; margin-bottom: 1em;") diff --git a/UI/Input/DropDown.ts b/UI/Input/DropDown.ts index cc919bd..86efd04 100644 --- a/UI/Input/DropDown.ts +++ b/UI/Input/DropDown.ts @@ -52,15 +52,15 @@ export class DropDown extends InputElement { if(this._values.length <=1){ return ""; } - + let options = ""; for (let i = 0; i < this._values.length; i++) { options += "" } - return "
" + "" + "" + "
"; diff --git a/assets/translations.json b/assets/translations.json index db81888..3edb7cc 100644 --- a/assets/translations.json +++ b/assets/translations.json @@ -167,8 +167,8 @@ "en": "

Welcome to MapComplete

MapComplete is an OpenStreetMap-viewer and editor, which shows you information about a specific theme.

Pick a theme below to get started.

", "nl": "

Welkom bij MapComplete

MapComplete is een OpenStreetMap applicatie waar informatie over een specifiek thema bekeken en aangepast kan worden.

Kies hieronder een thema om te beginnen." }, - - + + "loginWithOpenStreetMap": { "en": "Login with OpenStreetMap", "ca": "Entra a OpenStreetMap", @@ -775,7 +775,7 @@ "nl": "Selecteer lagen" } }, - + "weekdays": { "abbreviations": { "monday": { diff --git a/css/mobile.css b/css/mobile.css index f2986b7..75773a7 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -11,11 +11,11 @@ Contains tweaks for small screens @media only screen and (max-width: 600px), only screen and (max-height: 600px) { .only-on-mobile { - display: unset !important; + display: unset !important; background-color: var(--background-color); color: var(--foreground-color); } - + .hidden-on-mobile { display: none !important; } @@ -39,7 +39,7 @@ Contains tweaks for small screens #geolocate-button { display: block; } - + .leaflet-popup { /* On mobile, the popups are shown as a full-screen element */ display: none; @@ -52,7 +52,7 @@ Contains tweaks for small screens width: 60%; } - + .add-popup-all-buttons { /* Buttons in the 'add new point' have a default of 50vh maxheight which is ugly in the new context*/ max-height: unset !important; @@ -60,7 +60,7 @@ Contains tweaks for small screens #messagesboxmobile { display: block; - + position: absolute; z-index: 10000; width: 100vw; diff --git a/index.css b/index.css index 6003740..9fbd083 100644 --- a/index.css +++ b/index.css @@ -387,10 +387,8 @@ a { background-color: var(--background-color); color: var(--foreground-color); - transition: opacity 500ms linear; - text-align: center; horiz-align: center; font-weight: bold; diff --git a/scripts/createLayouts.ts b/scripts/createLayouts.ts index c5cb73e..0ca6a90 100644 --- a/scripts/createLayouts.ts +++ b/scripts/createLayouts.ts @@ -150,16 +150,14 @@ function createManifest(layout: LayoutConfig, relativePath: string) { let icon = layout.icon; if (icon.endsWith(".svg") || icon.startsWith("