Commit graph

3041 commits

Author SHA1 Message Date
Anton Khorev
03f266fa48 Stick search input and Go button together with flex instead of input group 2022-09-14 23:15:28 +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
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
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
7df4a7f8a3 Fix background colour for badges on GPS traces
Fixes #3681
2022-09-09 11:01:20 +01:00
Anton Khorev
fb75f447d7 Remove top margins from close buttons 2022-09-02 17:02:46 +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
Anton Khorev
5da7215873 Stretch changeset links in history lists 2022-09-01 22:45:09 +03:00
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
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
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
Anton Khorev
f41b5558b7 Position directions close button with flex 2022-08-28 00:32:50 +03:00
Anton Khorev
41924fb69e Remove unnecessary float from flex-positioned close button 2022-08-27 23:20:36 +03:00
Anton Khorev
8d9ec26421 Fix reverse directions button closing tag 2022-08-27 19:24:54 +03:00
Andy Allan
a9a00acf68 Fix italic font styles
This was missed during the bootstrap 5 upgrade
2022-08-03 19:49:46 +01:00
Tom Hughes
7e5d47e6a8 Merge remote-tracking branch 'upstream/pull/3644' 2022-08-03 18:45:47 +01:00
Andy Allan
c185ef2598 Use standard bootstrap spacers, rather than custom css, to space out the elements
Also make the reporting text small, since it's not required reading in most circumstances.
2022-08-03 18:25:22 +01:00
Harry Wood
7eae946b9a Move note reporting link to bottom of the sidebar
Move the 'report this note' and surrounding sentence down the sidebar beneath the commont/resolve form to give it less prominence.
2022-08-03 18:11:01 +01:00
Harry Wood
dce0f1639e Add wording to discourage reporting a note
Add some wording wrapped around the 'Report this note' link to explain to users to resolve the note instead.

Tackling the issue reported by DWG, that too many note reports are coming to them, where the users could deal it themselves: https://github.com/openstreetmap/openstreetmap-website/issues/3071
2022-08-03 18:10:03 +01:00
Andy Allan
08020fff63 Switch reverse_directions link to use a button
This makes it keyboard selectable, and also preserves the event
handler.

Refs #3637
2022-08-03 14:10:52 +01:00
Andy Allan
6b69655812
Merge pull request #3631 from AntonKhorev/bootstrap-close
Use Bootstrap close button
2022-08-03 11:47:08 +01:00
Andy Allan
e59ba78575 Use lead text highlighting for lede paragraph 2022-08-03 10:35:13 +01:00
Andy Allan
83a0ea14f1 Refactor i18n so that all community information is available
This makes it easier to use non-chapter communities on the site in future.
2022-08-03 10:11:30 +01:00
Tom Hughes
e9f62a8c30 Rename piwik to matomo and merge configuration into settings 2022-08-01 22:42:04 +01:00
Anton Khorev
bb868e0b11 Merge master with css changes 2022-07-27 21:28:12 +03:00
Anton Khorev
4000a4004b Changed feature close buttons to Bootstrap 2022-07-27 21:02:16 +03:00
Anton Khorev
66e526c2d5 Changed directions close button to Bootstrap 2022-07-27 20:54:47 +03:00
Anton Khorev
0322ed4295 Changed close buttons of banner and other leaflet sidebars to Bootstrap 2022-07-27 20:22:20 +03:00
Andy Allan
09631b53e9 Remove extra container div from fixthemap page
This created extra margins and padding either side of the blocks
of text, which was unnecessary
2022-07-27 16:32:16 +01:00
Andy Allan
1bf671f684 Rework welcome and fixthemap pages
* Use lead class for lede paragraphs
* Change headings to start from h2
* Remove custom css and use bootstrap utilities where required
2022-07-27 16:32:16 +01:00
Andy Allan
0bc9ede6ff Use th tags on trace show table
This brings consistency with other similar tables
2022-07-27 13:09:47 +01:00
Andy Allan
c8ddd63280 Fix the font weight on the about page title, and use lead styling for the lede 2022-07-27 13:08:06 +01:00
Andy Allan
f702d5c426 Remove unnecessary br tags
The margin on the table takes care of the spacing.
2022-07-27 11:59:47 +01:00
Tom Hughes
3871d61be4 Merge remote-tracking branch 'upstream/pull/3612' 2022-07-21 19:20:26 +01:00
Tom Hughes
297d05c63b Merge remote-tracking branch 'upstream/pull/3610' 2022-07-21 18:36:29 +01:00
Anton Khorev
2dd7a5edb2 Add xmlns:dc namespace to note show rss actions 2022-07-21 17:14:49 +03:00
Andy Allan
6078e2f68e Bootstrap 5: Use dropdown-menu-end for dropdown alignment 2022-07-20 19:34:19 +01:00
Andy Allan
13e44f031c Bootstrap-5: use logical alternative for text alignment
Using start/end rather than left/right, for better RTL support.
2022-07-20 18:45:26 +01:00
Andy Allan
721044ad01 Bootstrap 5: Use symmetrical padding in toggled dropdown
Required since pl-* classes have been removed, but also works fine
without bringing start/end considerations into play.
2022-07-20 18:43:45 +01:00
Andy Allan
4e06fe054a Rework trace index to use secondary-actions
The border between items is familiar UI, so we can keep it, but lets
use the secondary-actions approach instead.

This avoids using left-right specific border, margin and padding
classes
2022-07-20 17:45:35 +01:00
Andy Allan
9e6ecefdb2 Bootstrap 5: Remove the padding from trace nav buttons on larger sizes
If additional py is added when the tabs are laid out in full, then the
other tabs start to become detatched from the rest of the page and a
line appears under the active tab.

We don't need the padding in the horizontal layout, so remove it, and
tweak the size of the padding when collapsed.
2022-07-20 14:43:00 +01:00
Andy Allan
235ca0b4f3 Bootstrap 5: data-toggle renamed to data-bs-toggle for dropdown menus 2022-07-20 14:43:00 +01:00
Andy Allan
2f1715a02c Bootstrap 5: no-gutters renamed to g-0 2022-07-20 14:43:00 +01:00
Andy Allan
e2f17abd3d Bootstrap 5: Replace card-deck with a row-cols-* based grid 2022-07-20 14:43:00 +01:00
Andy Allan
934d81aa55 Bootstrap 5: Replace all form-group classes with mb-3 2022-07-20 14:42:57 +01:00
Andy Allan
e80d74ae73 Bootstrap 5: Add form-label class to hand-crafted form labels
This is done automatically for forms created by bootstrap_form
2022-07-20 14:41:56 +01:00
Andy Allan
02a6ec60ec Bootstrap 5: Update manual select boxes to use form-select class 2022-07-20 14:41:55 +01:00