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

More styling tweaks and bug fixes

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-02-01 19:02:46 +01:00
parent e6ac080019
commit aaaf0b8c36
10 changed files with 113 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
UI/Base/ScrollableFullScreen.ts
View file

@ -91,10 +91,8 @@ export default class ScrollableFullScreen extends UIElement {
private BuildComponent(title: BaseUIElement, content: BaseUIElement, isShown: UIEventSource<boolean>) {
const returnToTheMap =
new Combine([
new Img(Svg.back.replace(/#000000/g, "#cccccc"), true)
.SetClass("block md:hidden w-12 h-12 p-2"),
new Img(Svg.close.replace(/#000000/g, "#cccccc"), true)
.SetClass("hidden md:block w-12 h-12 p-3")
Svg.back_svg().SetClass("block md:hidden w-12 h-12 p-2 svg-foreground"),
Svg.close_svg() .SetClass("hidden md:block w-12 h-12 p-3 svg-foreground")
]).SetClass("rounded-full p-0 flex-shrink-0 self-center")
returnToTheMap.onClick(() => {

2
UI/BigComponents/UserBadge.ts
View file

@ -34,7 +34,7 @@ export default class UserBadge extends Toggle {
const homeButton = new VariableUiElement(
userDetails.map((userinfo) => {
if (userinfo.home) {
return Svg.home_ui();
return Svg.home_svg();
}
return " ";
})

11
UI/ImportFlow/RequestFile.ts
View file

@ -9,6 +9,7 @@ import BaseUIElement from "../BaseUIElement";
import FileSelectorButton from "../Input/FileSelectorButton";
import {FlowStep} from "./FlowStep";
import {parse} from "papaparse";
import {FixedUiElement} from "../Base/FixedUiElement";
class FileSelector extends InputElementMap<FileList, { name: string, contents: Promise<string> }> {
constructor(label: BaseUIElement) {
@ -139,7 +140,15 @@ export class RequestFile extends Combine implements FlowStep<any> {
if (v?.error === undefined) {
return undefined;
}
return v.error.Clone().SetClass("alert");
let err: BaseUIElement;
if(typeof v.error === "string"){
err = new FixedUiElement(v.error)
}else if(v.error.Clone !== undefined){
err = v.error.Clone()
}else{
err = v.error
}
return err.SetClass("alert");
}))
super([

8
UI/Input/RadioButton.ts
View file

@ -143,10 +143,10 @@ export class RadioButton<T> extends InputElement<T> {
block.classList.add(
"m-1",
"border",
"rounded-3xl",
"border-gray-400",
"border-gray-400"
)
}
block.style.borderRadius = "1.5rem"
wrappers.push(block);
form.appendChild(block);
@ -161,10 +161,10 @@ export class RadioButton<T> extends InputElement<T> {
if (input.checked) {
wrappers[i].classList.remove("border-gray-400");
wrappers[i].classList.add("border-black");
wrappers[i].classList.add("border-attention");
} else {
wrappers[i].classList.add("border-gray-400");
wrappers[i].classList.remove("border-black");
wrappers[i].classList.remove("border-attention");
}
}
});