Commit graph

6372 commits

Author SHA1 Message Date
Anton Khorev
c87379ba69 Remove 'Hide' button from hidden note page 2022-09-29 01:27:51 +03:00
Anton Khorev
cf3fa3bb2d Use jquery interface for enabling/disabling tooltips 2022-09-23 13:34:40 +03:00
Anton Khorev
9657b92fad Merge branch 'master' into tooltips-enable-disable 2022-09-23 12:43:31 +03:00
Robbendebiene
ed1112bcef Allow setting HTTP ACCEPT header for notes API
Previously the notes API return type could only be specified by appending the file extension like .json or .rss
2022-09-23 11:40:19 +02:00
Tom Hughes
d600423351 Merge remote-tracking branch 'upstream/pull/3710' 2022-09-22 18:04:28 +01:00
Tom Hughes
19a014bde6 Merge remote-tracking branch 'upstream/pull/3711' 2022-09-22 18:02:46 +01:00
danieldegroot2
6e7fbc9a87
Fix margin
Fix unexpected margin
2022-09-22 17:46:32 +02:00
Anton Khorev
c02b131a29 Pan map when showing/hiding sidebars depending on ltr/rtl 2022-09-22 16:33:28 +03:00
Anton Khorev
01d48694b4 Don't show 'Download XML' link for deleted elements 2022-09-22 14:51:31 +03:00
Tom Hughes
09263bc4a1 Cancel running queries when a timeout occurs 2022-09-21 22:47:16 +01:00
Tom Hughes
4677b58d33 Merge remote-tracking branch 'upstream/pull/3705' 2022-09-21 18:48:25 +01:00
Anton Khorev
cfc9a8fe03 Change map ui sidebar height together with map height 2022-09-21 16:50:14 +03:00
Anton Khorev
58f0eea2a4 Remove unnecessary wrapper divs 2022-09-20 10:15:19 +03:00
Tom Hughes
cb143bb5f1 Merge remote-tracking branch 'upstream/pull/3703' 2022-09-19 17:46:46 +01:00
Tom Hughes
a685b3a6fc Merge remote-tracking branch 'upstream/pull/3702' 2022-09-19 17:46:04 +01:00
Anton Khorev
3f5c3a9d92 Specify border/spacing values in stylesheet 2022-09-19 19:10:46 +03:00
Anton Khorev
6acb032d4c Set borders and spacing for control groups directly in js
Previous stylesheet code is more complicated.
2022-09-19 18:50:04 +03:00
Anton Khorev
7904b49bb1 Group map controls 2022-09-19 18:20:34 +03:00
Anton Khorev
12a7c9d023 Create osm-specific locate control class 2022-09-19 18:07:37 +03:00
Anton Khorev
bb99ba3977 Remove unused icon list css from welcome pages 2022-09-19 14:38:56 +03:00
Anton Khorev
ec3dad11d5 Remove unused tooltips css 2022-09-19 12:21:13 +03:00
Anton Khorev
7c4dff7445 Vertically center about page icons with flex align-items 2022-09-19 11:48:57 +03:00
Anton Khorev
21cc9f3af1 Replace <h5> used to set the font size with Bootstrap class h5 2022-09-19 08:20:01 +03:00
Tom Hughes
3e46c7c87d Merge remote-tracking branch 'upstream/pull/3695' 2022-09-18 18:38:57 +01:00
Tom Hughes
79f0796325 Merge remote-tracking branch 'upstream/pull/3699' 2022-09-18 18:35:58 +01:00
Tom Hughes
364a56dfc3 Merge remote-tracking branch 'upstream/pull/3698' 2022-09-18 18:34:51 +01:00
Tom Hughes
e24b624547 Merge remote-tracking branch 'upstream/pull/3697' 2022-09-18 18:32:12 +01:00
Anton Khorev
a22094c5cf Remove old map sidebar close button css 2022-09-17 13:53:21 +03:00
Anton Khorev
10babd39b0 Remove background image-related css from about page
Background images are no longer used on the page so these properties are not required.
2022-09-17 13:09:41 +03:00
Anton Khorev
e5002d9c70 Remove buttons css class used only on new note page 2022-09-17 11:03:04 +03:00
Anton Khorev
7d31a659ab Remove unused pager secondary nav css 2022-09-17 10:09:35 +03:00
Anton Khorev
7702035963 Remove unnecessary appendTo() that is undone by append() right away 2022-09-17 09:14:46 +03:00
Anton Khorev
e60282da09 Remove share-tabs css class 2022-09-17 08:47:22 +03:00
Anton Khorev
79c524832e Use button group for share tabs 2022-09-17 08:34:53 +03:00
Harry Wood
e057e1c479 Define a DEFAULT_FRESHLY_CLOSED_LIMIT constant
Define DEFAULT_FRESHLY_CLOSED_LIMIT in the Note model to allow the 7 day limit to be referenced in the API controller and in the new `freshy_closed_until` logic. The default value is `7.days`. API users can still override this, but the website uses that default for the duration of the green "freshly closed" notes markers.
2022-09-14 23:59:41 +01:00
Harry Wood
d8e51614cb Display how long until a note will disappear
Modify the message displayed at the bottom of the notes sidepanel. For already resolved notes we don't want to say "please resolve it". Fixes https://github.com/openstreetmap/openstreetmap-website/issues/3663

Instead explain that it will disappear from the map (so reporting is probably not necessary) and display how long to go until that happens. Tackling https://github.com/openstreetmap/openstreetmap-website/issues/3071
2022-09-14 23:59:25 +01:00
Anton Khorev
9aa24a0715 Link prefixed wikipedia tags 2022-09-15 01:00:19 +03:00
Tom Hughes
5eb09448c5 Merge remote-tracking branch 'upstream/pull/3689' 2022-09-14 18:24:14 +01:00
Andy Allan
48ed305163
Merge pull request #3678 from AntonKhorev/close-button-margins
Remove top margins from close buttons
2022-09-14 17:48:41 +01:00
Andy Allan
4d1f83d6bb Use bootstrap breakpoint mixin
This has the same end result, but is more clear than an arbitrary
pixel number.
2022-09-14 17:32:43 +01:00
Andy Allan
a3474de4d8 Use bootstrap utility classes for showing the new user arm
The original value was close to the 'lg' breakpoint, but the 'md'
breakpoint is fine for this too.
2022-09-14 17:32:43 +01:00
Andy Allan
5ab682dbbd Combine small.scss into common.scss
We've moved away from the idea of having extra rules for small screens,
and instead follow the bootstrap convention of designing for small
screens first and overriding those rules if needed for larger screens.

Having a separate file remaining for a limited number of small screen
rules is therefore counter-productive. Moving the remaining rules into
common.scss, adjacent to the related rules for larger screen, makes
the behaviour easier to understand, as well as making it easier to
refactor the rules to a small-screen-first approach.
2022-09-14 17:32:43 +01:00
Tom Hughes
35392c1a2f Merge remote-tracking branch 'upstream/pull/3680' 2022-09-13 19:19:12 +01:00
Anton Khorev
84c8289e06 Fix zoom level related tooltip for Edit button 2022-09-13 05:26:49 +03:00
Anton Khorev
e8f2af833a Fix zoom level related tooltips for layer checkboxes 2022-09-13 04:20:57 +03:00
Anton Khorev
e409e83b48 Merge tooltip fixes/tests 2022-09-13 01:52:23 +03:00
Anton Khorev
cb438ac3f6 Use https in 'report a problem' link of embedded map 2022-09-13 01:18:48 +03:00
Adam Hoyle
7e5cbe87ed Merge branch 'master' into feature/add-communities-page
# Conflicts:
#	Gemfile.lock
#	package.json
#	yarn.lock
2022-09-10 16:13:17 +01:00
Tom Hughes
9cd96bd452 Fix new rubocop warnings 2022-09-09 22:45:58 +01:00
Tom Hughes
7df4a7f8a3 Fix background colour for badges on GPS traces
Fixes #3681
2022-09-09 11:01:20 +01:00