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

Styling tweaks

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-04-19 23:43:28 +02:00
parent bce8ae3e34
commit 9c6811b06e
5 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
UI/BigComponents/LicensePicker.ts
View file

@ -17,7 +17,10 @@ export default class LicensePicker extends DropDown<string> {
{value: LicensePicker.ccbysa, shown: Translations.t.image.ccbs.Clone()}, {value: LicensePicker.ccbysa, shown: Translations.t.image.ccbs.Clone()},
{value: LicensePicker.ccby, shown: Translations.t.image.ccb.Clone()} {value: LicensePicker.ccby, shown: Translations.t.image.ccb.Clone()}
], ],
state?.osmConnection?.GetPreference("pictures-license") ?? new UIEventSource<string>("CC0") state?.osmConnection?.GetPreference("pictures-license") ?? new UIEventSource<string>("CC0"),
{
select_class:"w-min bg-indigo-100 p-1 rounded hover:bg-indigo-200"
}
) )
this.SetClass("flex flex-col sm:flex-row").SetStyle("float:left"); this.SetClass("flex flex-col sm:flex-row").SetStyle("float:left");
} }

6
UI/Image/ImageUploadFlow.ts
View file

@ -138,16 +138,16 @@ export class ImageUploadFlow extends Toggle {
if (l == 0) { if (l == 0) {
return undefined return undefined
} }
return t.uploadFailed.Clone().SetClass("alert"); return new Loading(t.uploadFailed).SetClass("alert");
})), })),
new VariableUiElement(uploadedCount.map(l => { new VariableUiElement(uploadedCount.map(l => {
if (l == 0) { if (l == 0) {
return undefined; return undefined;
} }
if (l == 1) { if (l == 1) {
return t.uploadDone.Clone().SetClass("thanks"); return t.uploadDone.Clone().SetClass("thanks block");
} }
return t.uploadMultipleDone.Subs({count: l}).SetClass("thanks") return t.uploadMultipleDone.Subs({count: l}).SetClass("thanks block")
})), })),
fileSelector, fileSelector,

2
UI/Input/DropDown.ts
View file

@ -47,7 +47,7 @@ export class DropDown<T> extends InputElement<T> {
} }
options = options ?? {} options = options ?? {}
options.select_class = options.select_class ?? 'bg-indigo-100 p-1 rounded hover:bg-indigo-200' options.select_class = options.select_class ?? 'w-full bg-indigo-100 p-1 rounded hover:bg-indigo-200'
{ {

2
UI/Popup/ImportButton.ts
View file

@ -194,7 +194,7 @@ ${Utils.special_visualizations_importRequirementDocs}
importFlow, importFlow,
isImported isImported
), ),
t.zoomInMore.SetClass("alert"), t.zoomInMore.SetClass("alert block"),
state.locationControl.map(l => l.zoom >= 18) state.locationControl.map(l => l.zoom >= 18)
), ),
pleaseLoginButton, pleaseLoginButton,

6
UI/Popup/TagRenderingQuestion.ts
View file

@ -51,7 +51,7 @@ export default class TagRenderingQuestion extends Combine {
const applicableMappingsSrc = const applicableMappingsSrc =
UIEventSource.ListStabilized(tags.map(tags => { UIEventSource.ListStabilized(tags.map(tags => {
const applicableMappings: { if: TagsFilter, then: any, ifnot?: TagsFilter, addExtraTags: Tag[] }[] = [] const applicableMappings: { if: TagsFilter, icon?: string, then: any, ifnot?: TagsFilter, addExtraTags: Tag[] }[] = []
for (const mapping of configuration.mappings ?? []) { for (const mapping of configuration.mappings ?? []) {
if (mapping.hideInAnswer === true) { if (mapping.hideInAnswer === true) {
continue continue
@ -158,7 +158,7 @@ export default class TagRenderingQuestion extends Combine {
private static GenerateInputElement( private static GenerateInputElement(
state, state,
configuration: TagRenderingConfig, configuration: TagRenderingConfig,
applicableMappings: { if: TagsFilter, then: any, ifnot?: TagsFilter, addExtraTags: Tag[] }[], applicableMappings: { if: TagsFilter, then: any, icon?: string, ifnot?: TagsFilter, addExtraTags: Tag[] }[],
applicableUnit: Unit, applicableUnit: Unit,
tagsSource: UIEventSource<any>, tagsSource: UIEventSource<any>,
feedback: UIEventSource<Translation> feedback: UIEventSource<Translation>
@ -168,7 +168,7 @@ export default class TagRenderingQuestion extends Combine {
const ff = TagRenderingQuestion.GenerateFreeform(state, configuration, applicableUnit, tagsSource, feedback); const ff = TagRenderingQuestion.GenerateFreeform(state, configuration, applicableUnit, tagsSource, feedback);
const hasImages = applicableMappings.findIndex(mapping => mapping.then.icon !== undefined) >= 0 const hasImages = applicableMappings.findIndex(mapping => mapping.icon !== undefined) >= 0
let inputEls: InputElement<TagsFilter>[]; let inputEls: InputElement<TagsFilter>[];
const ifNotsPresent = applicableMappings.some(mapping => mapping.ifnot !== undefined) const ifNotsPresent = applicableMappings.some(mapping => mapping.ifnot !== undefined)