diff --git a/Models/Constants.ts b/Models/Constants.ts index 34dfedc44..b10e8b872 100644 --- a/Models/Constants.ts +++ b/Models/Constants.ts @@ -2,7 +2,7 @@ import {Utils} from "../Utils"; export default class Constants { - public static vNumber = "0.22git .0"; + public static vNumber = "0.22.1"; public static ImgurApiKey = '7070e7167f0a25a' public static readonly mapillary_client_token_v4 = "MLY|4441509239301885|b40ad2d3ea105435bd40c7e76993ae85" diff --git a/UI/Base/ScrollableFullScreen.ts b/UI/Base/ScrollableFullScreen.ts index c6dc803a5..68d3c4944 100644 --- a/UI/Base/ScrollableFullScreen.ts +++ b/UI/Base/ScrollableFullScreen.ts @@ -110,8 +110,9 @@ export default class ScrollableFullScreen extends UIElement { title = new Title(title, 2) title.SetClass("text-l sm:text-xl md:text-2xl w-full p-0 max-h-20vh overflow-y-auto self-center") + const contentWrapper = new Combine([content]) - .SetClass("block p-2 md:pt-4 w-full h-full overflow-y-auto md:max-h-65vh") + .SetClass("block p-2 md:pt-4 w-full h-full overflow-y-auto desktop:max-h-65vh") this._resetScrollSignal.addCallback(_ => { contentWrapper.ScrollToTop(); @@ -124,7 +125,7 @@ export default class ScrollableFullScreen extends UIElement { contentWrapper , // We add an ornament which takes around 5em. This is in order to make sure the Web UI doesn't hide ]).SetClass("flex flex-col h-full relative bg-white") - ]).SetClass("fixed top-0 left-0 right-0 h-screen w-screen md:max-h-65vh md:w-auto md:relative z-above-controls md:rounded-xl overflow-hidden"); + ]).SetClass("fixed top-0 left-0 right-0 h-screen w-screen desktop:max-h-65vh md:w-auto md:relative z-above-controls md:rounded-xl overflow-hidden"); } diff --git a/css/index-tailwind-output.css b/css/index-tailwind-output.css index 9cc68c626..6bef61478 100644 --- a/css/index-tailwind-output.css +++ b/css/index-tailwind-output.css @@ -1086,10 +1086,6 @@ video { height: 0px; } -.h-40 { - height: 10rem; -} - .h-64 { height: 16rem; } @@ -2672,10 +2668,6 @@ input { height: 3rem; } - .md\:max-h-65vh { - max-height: 65vh; - } - .md\:w-2\/6 { width: 33.333333%; } @@ -2789,3 +2781,4 @@ input { display: inline; } } + diff --git a/css/mobile.css b/css/mobile.css index 7164b7506..de0babf2c 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -2,11 +2,16 @@ Contains tweaks for small screens */ -@media only screen and (min-width: 769px) { +@media only screen and (min-width: 769px) and (min-height: 700px) { .only-on-mobile { display: none !important; } + + .desktop\:max-h-65vh { + max-height: 65vh; + } + } @@ -32,7 +37,7 @@ Contains tweaks for small screens } -@media only screen and (max-width: 768px), only screen and (max-height: 768px) { +@media only screen and (max-width: 768px), only screen and (max-height: 700px) { .hidden-on-mobile { diff --git a/index.css b/index.css index e70d93b25..7e8799923 100644 --- a/index.css +++ b/index.css @@ -647,3 +647,4 @@ input { } + diff --git a/index.html b/index.html index 75df76cba..7a9be9a70 100644 --- a/index.html +++ b/index.html @@ -55,26 +55,19 @@ -
-
-
-
-
Loading MapComplete, hang on...
-Below -
diff --git a/theme.html b/theme.html index d76b905a7..acbfb7cdf 100644 --- a/theme.html +++ b/theme.html @@ -48,7 +48,7 @@
- +