Commit graph

8549 commits

Author SHA1 Message Date
069767b9c7 Studio: first draft of layer editing 2023-06-16 02:36:11 +02:00
9661ade80c Chore: run prettier 2023-06-15 16:12:46 +02:00
147c3db957
Merge pull request #1464 from pietervdvn/prettier-brackets
Prettier: Fix new line setting
2023-06-15 16:12:14 +02:00
1b99be524f Usertest: add 'back to theme overview'-button on theme intro page, fix #1457 2023-06-15 16:11:36 +02:00
6d337e8775 Fix: precise location input picks correct location (and not the previous click) 2023-06-15 15:49:49 +02:00
b2a10e7af9 UX: move confirm button away from close-button 2023-06-15 14:31:17 +02:00
19ab941287
Merge pull request #1463 from pietervdvn/clsx
Introduce tailwind merge package
2023-06-15 10:33:05 +02:00
Tobias
f5bcc35bc9 Prettier: Fix new line setting
https://github.com/sveltejs/prettier-plugin-svelte#svelte-bracket-new-line states
> Deprecated since 2.5.0. Use Prettier 2.4.0 and bracketSameLine instead.

The new setting bracketSameLine=false is in line with how the pages are formatted mostly ATM, so it causes the least amount of change on save.
2023-06-15 06:04:39 +02:00
Tobias
bca6785aa8 Linter: no target attribute on button elements 2023-06-15 05:48:10 +02:00
Tobias
dfa3315e21 Linter: Use const
VS Code told me so…
2023-06-15 05:48:00 +02:00
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
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
d465a272f2 Feature: add Americana background style, fix #1204 2023-06-14 00:47:09 +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
5a6ed7bf21 Fix: #1093 2023-06-12 01:17:20 +02:00
87e79b8e8c Fix: alias 'urls' as 'website', fix #246 2023-06-12 00:57:01 +02:00
efd6b30e1b Fix: uploads were broken 2023-06-12 00:56:29 +02:00
e275aaf619
Merge pull request #1448 from pietervdvn/feature/maplibre
Feature/maplibre
2023-06-11 23:32:10 +02:00
0d1a91dbab Merge develop 2023-06-11 23:12:10 +02:00
5b291777be Fix: fix rainbow crossings theme 2023-06-11 22:52:22 +02:00
c5300a3fd5 Fix: add missing tag 2023-06-11 19:08:06 +02:00
c2c937a003 Merge remote-tracking branch 'bxl-forever/develop' into develop 2023-06-11 19:04:57 +02:00
d4cef78325 Finish conflate script 2023-06-11 19:04:40 +02:00
dbf47ec121 Expose some validatedTextFields 2023-06-11 16:58:07 +02:00
99cb879cfe Some more experimentation with the conflation script 2023-06-11 16:58:07 +02:00
8eda65a24f Conflation script 2023-06-11 16:58:07 +02:00
6f7437aa46 Chore: move one-off import script to directory 2023-06-11 16:57:52 +02:00
bxl-forever
7dd3b4be4d Updated rainbow crossing theme to use surface:colour on footways instead of crossing:marking (deprecated) 2023-06-11 14:43:15 +02:00
0b826612e9 Fix: show tags that will be applied if setting is 'full' 2023-06-11 11:50:35 +02:00
41aa6e871f Docs: write down test protocol 2023-06-11 11:42:41 +02:00