cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
10179 commits 4 branches 1 tag 499 MiB
Commit graph

2514 commits

Author SHA1 Message Date
Tom Hughes
8a013c0a96 Merge remote-tracking branch 'upstream/pull/2711' 2020-07-15 21:31:18 +01: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
d89a30421c Use bootstrap backgrounds and text utilities for read issue reports 2020-07-15 12:12:35 +02: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
3a43f9fe04 Merge remote-tracking branch 'upstream/pull/2697' 2020-07-08 18:57:32 +01: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
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
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
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
293fe68eff Merge remote-tracking branch 'upstream/pull/2642' 2020-06-04 17:40:13 +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
François de Metz
2ea79e21a0
Add link to my diary in the diary index. 2020-05-12 11:37:43 +02:00
François de Metz
43385325a8
Refactor the link to create a new entry diary. 2020-05-12 11:27:08 +02:00
Tom Hughes
7e925c3c00 Look at all note comments to find the close event 
Fixes #2612
 2020-05-06 14:06:04 +01:00
Tom Hughes
1cb92c9d2a Send meta information with error pages 2020-04-22 12:21:42 +01:00
Tom Hughes
9b634f3493 Cache OpenID provider names on a per-locale basis 
Fixes #2591
 2020-04-15 22:48:28 +01:00
Tom Hughes
6ad0340b05 Localise formatting of point count for traces 
Fixes #2592
 2020-04-15 22:42:41 +01:00
Tom Hughes
3666b67433 Merge remote-tracking branch 'upstream/pull/2431' 2020-04-15 19:18:10 +01:00
Andy Allan
055a976051 Remove custom table styling 
This removes the custom table styling code, and move to using bootstrap table styling for almost all remaining tables.
 2020-04-01 12:29:01 +02:00
Andy Allan
b8c1bbb4f8 Remove unnecessary h() calls on model attributes 
These were necessary in the rails 2.x era, but not now.
 2020-03-18 14:33:30 +01:00
Andy Allan
5fdada204c Use bootstrap table striping to replace hand-cycled table stripes 
This cuts down on the complexity of having to use the `cycle` function
and makes the templates easier to read. CSS-based striping has been
around for many years.

The CSS is in order to keep our custom colour for striped tables.
 2020-03-18 12:14:24 +01:00
Andy Allan
73c95847a6
Merge pull request #2485 from mmd-osm/patch/json2 
JSON output nodes, ways, relations, map
 2020-02-26 15:55:48 +01:00
Anton Melnichuk
292f38a6ce fix help page, grid card layout on mobile 2020-02-13 14:18:49 +02:00
Andy Allan
e22b9c35f5 Remove list styling from various sidebar lists 2020-01-30 13:14:53 +01:00
Andy Allan
a2abce0f4a Use an unstyled list for the login buttons 2020-01-30 10:24:08 +01:00
Andy Allan
e5c33c119a Switch to bootstrap for dropdowns and tooltips 
Due to the javascript involved, it was more straightforward to combine
the two together. Moving to bootstrap v4 for dropdowns required some
redesign of the dropdown menu html, and the opportunity was taken to
move to using standard buttons for those menus.
 2020-01-29 18:23:47 +01:00
mmd-osm
7fcb76aa9a JSON: move root_attributes to shared folder 2020-01-22 22:47:47 +01:00
Andy Allan
a3795cddbb Move the search results to use list-group-flush 2020-01-16 12:39:13 +01:00
Andy Allan
65c3c2a915 Remove list style reset, and add overrides where necessary 
This allows the bootstrap list typography to work without being overridden. It also means
that lists look like normal lists by default, instead of needing to be recreated from
scratch each time. Only the cases where padding and discs are unwanted need to have
custom CSS.
 2020-01-15 17:16:11 +01:00
Andy Allan
f885cfe0f5 Rename form-row to standard-form-row to avoid clashing with a bootstrap class 2020-01-15 17:16:11 +01:00
Tom Hughes
ee8ce8c3ab Merge remote-tracking branch 'upstream/pull/2507' 2020-01-15 14:19:11 +00:00
Tom Hughes
f07bdbf905 Merge remote-tracking branch 'upstream/pull/2506' 2020-01-15 14:18:11 +00:00
Andy Allan
cd801b2c12 Rework issues display page to be responsive 
This change uses the bootstrap grid to make the issues page responsive,
and avoids having lots of custom widths of divs specified via CSS.

It also changes the display of the reports and comments to be more
like diary entry comments, by having all metadata on one line and shown
before the comment / report text.
 2020-01-15 12:20:27 +01:00
Andy Allan
1a75b1ba72 Minor tweaks to copyright heading 
This fixes a small bug where the hr was shown even when not required,
by ensuring the test is run before creating the content.

Also fixes where an h1 tag was used instead of a div.
 2020-01-15 12:09:14 +01:00
Andy Allan
0a0ff5e7d6 Remove extra div wrappings from list items 
These are unnecessary, and also prevent the secondary-actions vertical
border from appearing.
 2020-01-10 15:53:42 +01:00
Tom Hughes
1c062165f6 Avoid double escaping a name 2020-01-09 11:05:08 +00:00
Tom Hughes
bd7c279604 Merge remote-tracking branch 'upstream/pull/2500' 2020-01-09 11:03:34 +00:00
Tom Hughes
928465764e Merge remote-tracking branch 'upstream/pull/2499' 2020-01-09 10:36:31 +00:00
Tom Hughes
e39d227dd0 Merge remote-tracking branch 'upstream/pull/2498' 2020-01-09 10:31:37 +00:00
Tom Hughes
d76756d202 Merge remote-tracking branch 'upstream/pull/2497' 2020-01-09 10:10:10 +00:00
Andy Allan
ff363832f8 Fix typos 2020-01-09 10:06:20 +01:00