Commit graph

5562 commits

Author SHA1 Message Date
Tom Hughes
a9b00e16e7 Merge remote-tracking branch 'upstream/pull/2695' 2020-07-16 19:30:55 +01:00
Tom Hughes
8a013c0a96 Merge remote-tracking branch 'upstream/pull/2711' 2020-07-15 21:31:18 +01:00
Andy Allan
89a57f33ef Remove unused warning css 2020-07-15 19:34:19 +02:00
Andy Allan
0c098c3a1d Convert data feature warning to use bootstrap alert
Also rearrange dialog to fit with standard sidebar layouts, so that
the close icon and load buttons are not within the paragraph.

There may be a better way to construct this!
2020-07-15 19:34:19 +02:00
Andy Allan
3012201160 Convert warnings to use bootstrap alerts
The new note is guidance, rather than a warning, so it gets the info
background
2020-07-15 19:09:46 +02:00
Andy Allan
a9f751ec45 Remove unnecessary css
Images have no border in modern browsers, and bootstrap's reset also
sets this.
2020-07-15 13:58:56 +02:00
Andy Allan
b4e7f5eaca Remove unused css 2020-07-15 12:27:15 +02:00
Andy Allan
d89a30421c Use bootstrap backgrounds and text utilities for read issue reports 2020-07-15 12:12:35 +02:00
Andy Allan
e157b37ce5 Rename nav-related body classes
This makes it clearer that the classes are only for navigation menu
matters. Other things should be done on media queries, or ideally,
using bootstrap components like grids.

This has a side effect of removing the smaller font size from the
body when the navigation menu is in the small-nav state.
2020-07-15 11:40:02 +02:00
Andy Allan
58050240d6 Move the login form rules to be based on screen size
Ideally this would be refactored to be mobile-first, but is likely
to be replaced by more general bootstrap form refactoring anyway.
2020-07-15 11:21:08 +02:00
Andy Allan
46bd1a9a2e Remove webkit-appearance: none
This is the default anyway, and we don't need this for anything specific.
2020-07-15 11:19:29 +02:00
Andy Allan
3f6fd290d7 Rework the about header size change to be based on the screen width, not the menu state
Also reworks to be mobile-first
2020-07-15 10:48:04 +02:00
Andy Allan
988446c307 Remove dead CSS code - nothing has the user_map class 2020-07-15 10:35:19 +02:00
Tom Hughes
92a4c1feff Fix eslint warning 2020-07-08 19:25:03 +01:00
Tom Hughes
cfb2f2988c Merge remote-tracking branch 'upstream/pull/2698' 2020-07-08 19:10:01 +01:00
Tom Hughes
efa2c20bff Merge remote-tracking branch 'upstream/pull/2696' 2020-07-08 19:09:55 +01:00
Tom Hughes
4cf3c3b6ed Merge remote-tracking branch 'upstream/pull/2670' 2020-07-08 19:04:04 +01:00
Tom Hughes
3a43f9fe04 Merge remote-tracking branch 'upstream/pull/2697' 2020-07-08 18:57:32 +01:00
Tom Hughes
77bece20ff Merge remote-tracking branch 'upstream/pull/2700' 2020-07-08 18:43:26 +01:00
Andy Allan
8c326a6c1f Remove unnecessary layout calls from api controllers
These were left over from the refactoring of the controllers into api and non-api versions.
2020-07-08 18:51:27 +02:00
Andy Allan
41d6f19a6b Rename the notes#mine action to index 2020-07-08 18:43:30 +02:00
Andy Allan
1977e66ace Use bootstrap text-muted in place of custom deemphasze class
This avoids changing anything related to forms, since they will be
switched over to bootstrap separately.
2020-07-08 18:30:15 +02:00
Andy Allan
6d9434e14d Remove some extraneous css
The trace part is actually removing html, but I thought it was CSS
when I first noticed the blank space on the page.
2020-07-08 16:57:49 +02:00
Andy Allan
8192c0bd17 Rework the users#show page to avoid custom column css
This uses bootstrap instead, ensuring the map shows before the
text on small screens, but to the right of it on md+ widths. The
height of the map also changes at this breakpoint instead of being
based on the menu width (body.small).

The account edit page was also changed to match the content_map
changes, and a full width map is now used. This can be changed, if
required, using bootstrap breakpoints but I like it as it is.
2020-07-08 16:46:15 +02:00
Simon Poole
85cb71702e
Tuen on turn restriction support for graphhopper
No way of actually testing if this works, but it is based on https://docs.graphhopper.com/#operation/getRoute/parameters/point and https://www.graphhopper.com/blog/2020/07/08/turn-restriction-support-for-graphhoppers-directions-api/
2020-07-08 16:04:11 +02:00
Tom Hughes
9f993fe8c8 Fix new rubocop warnings 2020-07-07 10:44:52 +01:00
Tom Hughes
96ee7ef95c Only report traces as offline when they are offline 2020-07-07 10:37:56 +01:00
Tom Hughes
ce99bfd9ac Remove some debug logging comitted by mistake 2020-07-07 10:37:39 +01:00
Tom Hughes
2def62ee19 Fix errors with GPX offline mode 2020-07-05 14:49:12 +01:00
Tom Hughes
b8eaf227d9 Merge remote-tracking branch 'upstream/pull/2688' 2020-07-04 10:39:07 +01:00
Andy Allan
8cd83426cc Make the back button not look disabled
This switches the message buttons to use bootstrap, so that we can have a back button that looks clickable.

Alternative implementation of #2386
2020-07-04 11:20:46 +02:00
Andy Allan
bae057dbdf Avoid list markers for the richtext help text 2020-07-04 10:51:16 +02:00
Martin Raifer
d49771ba95 Add banner for SOTM 2020 2020-07-01 12:27:07 +01:00
Tom Hughes
0585866202 Merge remote-tracking branch 'upstream/pull/2661' 2020-07-01 08:28:08 +01:00
Tom Hughes
3abeeb7f41 Require open3 before using it 2020-06-26 19:40:37 +01:00
Paul Norman
fb4aa31048
Add ÖPNVKarte layer 2020-06-25 20:47:25 -07:00
Simon Poole
63c0b697a4 Change tile licence
This changes the text describing the tile licence as per decision of the OSMF board starting July 1st 2020
2020-06-22 01:06:14 +02:00
Tom Hughes
a13b40ace9 Fix new erblint warnings 2020-06-11 19:44:22 +01:00
Tom Hughes
39b60219fe Fix new rubocop warnings 2020-06-11 19:21:41 +01:00
Tom Hughes
81a5a55f57 Show user delete links to admins 2020-06-11 17:26:05 +01:00
Andy Allan
600812f6ad Rework user#set_status and #delete to avoid GET requests
This renames the delete action to destroy, and starts using resourceful
routing for user actions.
2020-06-10 11:49:18 +02:00
Tom Hughes
d6f518f627 More improvements to locale selection for the data browser
Use the browser language preferences for non-logged in users.
2020-06-07 19:10:48 +01:00
Tom Hughes
293fe68eff Merge remote-tracking branch 'upstream/pull/2642' 2020-06-04 17:40:13 +01:00
Tom Hughes
768a792a61 Improve selection of name to display in data browser
If the user is logged in then consider all their preferred
languages rather than just the UI language, and use the full
locale matching algorithm instead of just checking parents.

Fixes #2636
2020-06-04 17:33:11 +01:00
Tom Hughes
c9f9ade96f Fix new rubocop warnings 2020-06-03 17:47:35 +01:00
Tom Hughes
a8c63724f6 Merge remote-tracking branch 'upstream/pull/2641' 2020-06-03 17:31:12 +01:00
Andy Allan
3786366fdc Rename friend to friendship in notifier
Followup to #2269
2020-06-03 18:29:08 +02:00
Andy Allan
8ebfdbc1ff Move make_friend and remove_friend to friendships controller 2020-06-03 18:23:07 +02:00
Andy Allan
0a33c66146 Convert lib files to model concerns 2020-06-03 16:44:26 +02:00
Andy Allan
c780a3f453
Merge pull request #2624 from francois2metz/diary-entry
Add link to my diary in the diary index
2020-06-03 14:11:04 +02:00