Commit graph

8576 commits

Author SHA1 Message Date
c229b92221 Merge branch 'develop' into feature/studio 2023-06-20 22:50:47 +02:00
85536017d7 Docs: add link to GeoOperations 2023-06-20 22:50:30 +02:00
1a7acc80c1 Themes: add statistics on used version 2023-06-20 22:50:16 +02:00
a1bbc4e689 Scripts: fix generateStatistics-script 2023-06-20 22:49:58 +02:00
83fc189fd3 Themes: make the selected note pulsate and have a different border when selected 2023-06-20 22:48:50 +02:00
238de89ad5 Fix: tests 2023-06-20 10:40:27 +02:00
39024eb5f3 Fix: charging station theme uses anchor too 2023-06-20 03:55:18 +02:00
beea00cbf0 Fix: move lastClick to bottom anchor 2023-06-20 03:52:15 +02:00
4a6457f146 Refactoring: More fixes to the themes 2023-06-20 03:49:16 +02:00
c260d16159 Refactoring: move more anchor specifications out of iconsize 2023-06-20 03:49:16 +02:00
e86f7d863e Refactoring: further cleanup of the themes 2023-06-20 03:49:16 +02:00
2f5091a8cb Fix: only show fixmes on high zoom level (performance), add the option to remove a fixme 2023-06-20 02:57:46 +02:00
36cdcf0648 Refactoring: add 'anchor'-field instead of using the iconSize to determine the anchor 2023-06-20 02:48:42 +02:00
f4b7e7eb88 Refactoring: cleanup of last incorrect iconSize fields 2023-06-20 02:48:42 +02:00
140c813151 Refactoring: move anchor out of iconSize 2023-06-20 02:48:42 +02:00
3e49929f25 Fix: crash in new note flow, spotted by @thibaultmolleman 2023-06-20 02:09:54 +02:00
d9417f4937 Merge branch 'develop' into feature/studio 2023-06-20 01:52:29 +02:00
a6f7b1300a Refactoring: move 'snapToLayer' from 'preciseInput' into the preset, remove 'preferredBackground'. The addNewPointFlow _always_ shows the precise input flow with the basic map; so the preferredBackground became irrelevant 2023-06-20 01:52:15 +02:00
4c59f4482d Studio: fix presets 2023-06-20 01:32:24 +02:00
ecf5c3cbe5
Merge pull request #1473 from djm93dev/typo-fix
fixed typo in docs 'unchangeble' -> 'unchangeable'
2023-06-19 19:25:08 +02:00
Daniel McDonald
a7811086aa fixed typo in docs 'unchangeble' -> 'unchangeable' 2023-06-19 13:04:07 -04:00
790c2767e2 Fix: pass along initial coordinates with the location input, prevents flashing of the ocean; fix #1469 2023-06-18 00:52:26 +02:00
102892ec77 Fix: direction input does not scroll anymore when dragged, fix #1468 2023-06-18 00:48:28 +02:00
223acee29c Studio: add more metainformation to layerConfig.json 2023-06-18 00:44:57 +02:00
92b3ee4bae
Update atm.json: increase merge range 2023-06-16 23:55:02 +02:00
5b33d88ffb
themes: bench.json: decrease minzoom 2023-06-16 23:50:57 +02:00
069767b9c7 Studio: first draft of layer editing 2023-06-16 02:36:11 +02:00
1a2e6f49f2 Refactoring: revive statistics GUI 2023-06-15 16:31:07 +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