Commit graph

8766 commits

Author SHA1 Message Date
Tobias
b55d976492 Apply twJoin, twMerge
Looking at https://github.com/dcastil/tailwind-merge/blob/v1.13.1/docs/when-and-how-to-use-it.md#how-to-use-it I placed the "winning" class at the end for twMerge
2023-06-15 05:38:52 +02:00
Tobias
9c96f6534f Add package tailwind-merge
Closes https://github.com/pietervdvn/MapComplete/issues/1461
2023-06-15 05:32:41 +02:00
Tobias
9ff70be981 ThemeButton: Make layoutToUse optional so SubtleLink is happy
SubtleLink did not provide layoutToUse. And in ThemeButton, it was guarded already ```

    if (layout.id === state?.layoutToUse?.id) {
      return undefined
    }
```
2023-06-15 05:03:52 +02:00
1e56eb5503 Usertests: add 'centermessage' again which indicates if data is loading or is present, see #1457 2023-06-15 02:42:12 +02:00
a55b84dba1 Fix: add dutch translation 2023-06-15 00:04:17 +02:00
6709a27f71 Usertests: explicitly mark the 'switch layers' button in special interactions, see #1316 2023-06-14 23:58:57 +02:00
c5c6bba731 Usertest: See #1315, add a 'confirm'-button on top of the precise-input location if the map is tapped; fix: make sure the dragInvitation doesn't consume the first map interaction, get's hidden by a change in map location 2023-06-14 23:21:19 +02:00
cc70e09e11 Themes: Add 'access=permissive' to charging stations, fixes #1255
Co-authored by: Thibault Molleman @thibaultmol
2023-06-14 22:20:39 +02:00
9e15353588 Themes: disable 'direction'-indicator for surveillance theme as it breaks selection, fix #1458 2023-06-14 20:45:25 +02:00
f0b007512b Chore: run prettier 2023-06-14 20:44:01 +02:00
6dc61ccb51
Merge pull request #1460 from pietervdvn/prettier-tailwind
Prettier: Introduce `prettier-plugin-tailwindcss`
2023-06-14 20:42:38 +02:00
d008dcb54d Chore: reformat all files with prettier 2023-06-14 20:39:36 +02:00
5757ae5dea
Merge pull request #1459 from pietervdvn/prettier
A bit of housekeeping, focus on Prettier
2023-06-14 20:38:44 +02:00
Tobias
474f71db3f Prettier: Introduce prettier-plugin-tailwindcss
Which is the official plugin that helps with auto sorting class names https://www.npmjs.com/package/prettier-plugin-tailwindcss

The config follows the recommendation from https://github.com/sveltejs/prettier-plugin-svelte#usage-with-tailwind-prettier-plugin
2023-06-14 15:55:57 +02:00
Tobias
1cf0f24d8e Prettier: Move config from cli to prettierrc file
This way they are applied globally and "on save"
2023-06-14 15:37:53 +02:00
Tobias
5a6f044055 Simplify npm run format
No `npx` required since we have prettier in our `package.json`.
2023-06-14 15:37:09 +02:00
Tobias
6e660b811b Update prettier, prettier svelte 2023-06-14 15:17:18 +02:00
Tobias
14ae7e3272 Cleanup .bg-red which does not exist anymore 2023-06-14 15:07:03 +02:00
2eabfea8af Fix: remove empty license files, fix #1135 2023-06-14 01:48:03 +02:00
239cb8f63d Refactoring: update conflate script 2023-06-14 01:06:15 +02:00
b37061fddf Chore: formatting 2023-06-14 01:03:37 +02:00
983db5e600 Usertesting: resolve some issues surfaced in #1457 2023-06-14 01:03:28 +02:00
cc20e946bb Usertest: small improvement to report 2023-06-14 00:57:31 +02:00
d465a272f2 Feature: add Americana background style, fix #1204 2023-06-14 00:47:09 +02:00
71110bb4f3
Merge pull request #1456 from weblate/weblate-mapcomplete-layers
Translations update from Hosted Weblate
2023-06-14 00:34:18 +02:00
Pieter Vander Vennet
2f63e8a840
Translated using Weblate (Catalan)
Currently translated at 59.4% (1682 of 2831 strings)

Translation: MapComplete/Layer translations
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layers/ca/
2023-06-14 00:18:28 +02:00
Pieter Vander Vennet
05ab947f7b
Translated using Weblate (Catalan)
Currently translated at 59.4% (1682 of 2831 strings)

Translation: MapComplete/Layer translations
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layers/ca/
2023-06-14 00:18:28 +02:00
Lucas
457ac96095
Translated using Weblate (French)
Currently translated at 60.9% (1725 of 2831 strings)

Translation: MapComplete/Layer translations
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layers/fr/
2023-06-14 00:18:28 +02:00
kjon
4d959035dd
Translated using Weblate (German)
Currently translated at 100.0% (2831 of 2831 strings)

Translation: MapComplete/Layer translations
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layers/de/
2023-06-14 00:18:28 +02:00
paunofu
e4067b7a98
Translated using Weblate (Catalan)
Currently translated at 59.4% (1682 of 2831 strings)

Translation: MapComplete/Layer translations
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layers/ca/
2023-06-14 00:18:28 +02:00
c795f2ee6f Usertest: add usertest, small fixes to test protocol 2023-06-14 00:18:10 +02:00
ec072f761c
Merge pull request #1455 from weblate/weblate-mapcomplete-core
Translations update from Hosted Weblate
2023-06-13 15:18:34 +02:00
Jiří Podhorecký
594482732c
Translated using Weblate (Czech)
Currently translated at 78.7% (505 of 641 strings)

Translation: MapComplete/Core
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/core/cs/
2023-06-13 13:15:17 +02:00
paunofu
f2aca2ee91
Translated using Weblate (Catalan)
Currently translated at 100.0% (89 of 89 strings)

Translation: MapComplete/shared-questions
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/shared-questions/ca/
2023-06-13 13:15:17 +02:00
kjon
6e5f5f73f8
Translated using Weblate (German)
Currently translated at 100.0% (406 of 406 strings)

Translation: MapComplete/themes
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/themes/de/
2023-06-13 13:15:17 +02:00
Robin van der Linde
5d8a47075e
Translated using Weblate (English)
Currently translated at 100.0% (406 of 406 strings)

Translation: MapComplete/themes
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/themes/en/
2023-06-13 13:15:17 +02:00
fc94c256f4 Bump version number 2023-06-13 13:15:10 +02:00
af447a948f Fix: enable rainbow question again, fix #1453 2023-06-13 13:13:27 +02:00
66e7d9face Fix upload 2023-06-13 13:07:18 +02:00
ef3cffea86 Fix upload 2023-06-13 13:06:45 +02:00
dc07386937 Version bump 2023-06-13 12:45:50 +02:00
f38f03b60d Fix changeset uploads 2023-06-13 12:45:35 +02:00
fca5e219db Fix changeset uploads 2023-06-13 12:44:27 +02:00
e2b0b10ca2 Fix changeset uploads 2023-06-13 12:43:34 +02:00
6f5c71ed5a Fix: multianswer would not accept last option 2023-06-12 10:17:13 +02:00
138b2ada2f Chore: remove some obsolete console.log-statements 2023-06-12 01:40:22 +02:00
6111e3083e
Merge pull request #1452 from weblate/weblate-mapcomplete-core
Translations update from Hosted Weblate
2023-06-12 01:33:53 +02:00
Pieter Vander Vennet
c9a8b4922b
Translated using Weblate (Dutch)
Currently translated at 97.7% (397 of 406 strings)

Translation: MapComplete/themes
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/themes/nl/
2023-06-12 01:32:02 +02:00
Pieter Vander Vennet
f692054d20
Translated using Weblate (English)
Currently translated at 100.0% (406 of 406 strings)

Translation: MapComplete/themes
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/themes/en/
2023-06-12 01:32:01 +02:00
5a6ed7bf21 Fix: #1093 2023-06-12 01:17:20 +02:00