Commit graph

12437 commits

Author SHA1 Message Date
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
Tom Hughes
4b36fee5de Merge remote-tracking branch 'upstream/pull/3687' 2022-09-13 19:14:24 +01:00
Tom Hughes
5f0c04d7ea Update bundle 2022-09-13 18:17:42 +01:00
Andy Allan
1094fe92b2
Merge pull request #3686 from AntonKhorev/embed-https
Use https in 'report a problem' link of embedded map
2022-09-13 09:08:47 +01:00
Anton Khorev
63f9ee3db6 Add bootstrap to js globals 2022-09-13 06:52:36 +03: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
dependabot[bot]
3178b524ca
Bump eslint from 8.23.0 to 8.23.1
Bumps [eslint](https://github.com/eslint/eslint) from 8.23.0 to 8.23.1.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.23.0...v8.23.1)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-12 23:00:55 +00: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
Tom Hughes
00112700d7 Update doorkeeper to 5.6.0 2022-09-12 19:27:33 +01:00
translatewiki.net
0abd8ea78d Localisation updates from https://translatewiki.net. 2022-09-12 13:13:55 +02: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
Adam Hoyle
4a6e7b7815 Update osm-community-index dependency version 2022-09-10 15:54:44 +01:00
Adam Hoyle
1542951b5a Update text above list of local chapters 2022-09-10 15:52:57 +01:00
Tom Hughes
9cd96bd452 Fix new rubocop warnings 2022-09-09 22:45:58 +01:00
Tom Hughes
f7e168b8e1 Update to rails 7.0.4 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
translatewiki.net
88cec0880b Localisation updates from https://translatewiki.net. 2022-09-08 13:13:36 +02:00
Anton Khorev
1fc2a70c17 Rewrite bbox only in place history atom links 2022-09-07 22:13:57 +03:00
Tom Hughes
fa93526f76 Use nominatim_url setting more consistently 2022-09-07 08:45:27 +01:00
Tom Hughes
d4da1dce97 Update bundle 2022-09-06 18:14:11 +01:00
Tom Hughes
95ceaef3b2 Merge remote-tracking branch 'upstream/pull/3673' 2022-09-06 18:13:43 +01:00
translatewiki.net
1795407caa Localisation updates from https://translatewiki.net. 2022-09-05 13:13:01 +02:00
Tom Hughes
2948b86eb5 Merge remote-tracking branch 'upstream/pull/3677' 2022-09-02 22:27:15 +01:00
Anton Khorev
fb75f447d7 Remove top margins from close buttons 2022-09-02 17:02:46 +03:00
Anton Khorev
78b4ff4a29 Simplify css for text selection with stretched link 2022-09-02 16:22:54 +03:00
Anton Khorev
a0f52e8b4f Make changeset id also a link so it can be displayed over the stretched link and be text-selectable 2022-09-02 16:13:52 +03:00
Anton Khorev
f1cf1be64a Put span inside stretched link to improve text selection 2022-09-02 16:03:52 +03:00
Tom Hughes
139ccef2dd Merge remote-tracking branch 'upstream/pull/3675' 2022-09-01 21:12:49 +01:00
Anton Khorev
5da7215873 Stretch changeset links in history lists 2022-09-01 22:45:09 +03:00
Abijeet Patro
d2b3fe71c8
Delete zh-hk.yml file that has been mapped to zh-HK.yml
See: https://gerrit.wikimedia.org/r/c/translatewiki/+/828590 as per #3669
2022-09-01 15:51:18 +05:30
Andy Allan
bf11e06e63
Merge pull request #3672 from AntonKhorev/geolink-button
Remove geolink and close button nesting
2022-09-01 09:17:11 +01:00
Andy Allan
6e144577aa
Merge pull request #3642 from Firefishy/forum-to-community
Add Link and text for the new community forum
2022-09-01 09:10:49 +01:00
Grant Slater
7d2206393b
Add Link and text for the new community forum 2022-08-31 23:12:12 +01:00
Anton Khorev
351a785949 Remove geolink and close button nesting 2022-09-01 00:42:50 +03:00
Tom Hughes
b36df9286a Merge remote-tracking branch 'upstream/pull/3668' 2022-08-31 17:44:48 +01:00
Andy Allan
04ff7d4ee8
Merge pull request #3666 from AntonKhorev/flex-close-buttons
Position close buttons with flexbox
2022-08-31 15:04:45 +01:00
Andy Allan
f6dd80e87d Use named arguments for button-variant mixins
This is much clearer than relying on positional arguments, and is
also required for future upgrades to bootstrap.
2022-08-31 14:42:03 +01:00
translatewiki.net
a9b77d60c8 Localisation updates from https://translatewiki.net. 2022-08-29 13:13:01 +02:00
Tom Hughes
5c76c5a933 Merge remote-tracking branch 'upstream/pull/3664' 2022-08-28 18:37:15 +01:00
Anton Khorev
2da8855cc2 Fix eslint errors 2022-08-28 00:53:53 +03:00
Anton Khorev
f41b5558b7 Position directions close button with flex 2022-08-28 00:32:50 +03:00