Commit graph

3041 commits

Author SHA1 Message Date
Andy Allan
cb68450ac7 Simplify margins when showing diary entries 2021-11-24 12:24:16 +00:00
Andy Allan
3bc20b6f21 Pass classes to override the default thumbnail_tiny style, rather than having another selector overriding 2021-11-24 12:24:16 +00:00
Andy Allan
52cd62bf13 Replace CSS-driven borders with bootstrap borders
This makes future refactoring easier, since the elements will
retain their borders even if the hierarchy changes.

Also round some maps and the legale section since I think those now
look nicer.
2021-11-24 12:24:16 +00:00
Andy Allan
300cd884ec Use flex grid instead of floating to position changeset element paging nav
This works much better when either the heading or the paging is long.

The heading was moved into the partial to avoid repetitive grid definitions
2021-11-24 12:07:49 +00:00
Andy Allan
18c70fa2de Add a user link to the heading of the diary comments page
Fixes #3369

This makes the heading match the layout of the user's Notes page,
which also has a short heading and a subheading with a link.

Additionally, add a page title, again for consistency
2021-11-24 10:55:09 +00:00
Tom Hughes
87bf5648c8 Drop es5 polyfill 2021-11-19 18:09:49 +00:00
Tom Hughes
d8da12f587 Drop use of html5shiv
Fixes #3367
2021-11-18 17:20:07 +00:00
Tom Hughes
e21b9b2bf1 Merge remote-tracking branch 'upstream/pull/3365' 2021-11-11 15:33:08 +00:00
Andy Allan
75749cc540 Convert remaining heading titles to use h1
This makes them consistent with all the other pages that use h1
in the `content_for :heading` sections
2021-11-11 15:12:23 +00:00
Andy Allan
3719e8defb Remove the userinformation ids from headings
The style rule was removed in 3f8cf32272
and they were otherwise only used in the tests.
2021-11-11 14:53:36 +00:00
Tom Hughes
425818913b Merge remote-tracking branch 'upstream/pull/3363' 2021-11-10 18:26:34 +00:00
Tom Hughes
8da015ac88 Merge remote-tracking branch 'upstream/pull/3362' 2021-11-10 18:21:01 +00:00
Andy Allan
9c9bf153cd Simplify user_image and user_thumbnail css
Now that all uses of the images and thumbnails have been migrated
to flex grids, we can remove the margin and padding from the original
css classes and revert to using them.
2021-11-10 15:30:42 +00:00
Andy Allan
dc67e54958 Use grid for dashboard map popups 2021-11-10 15:19:31 +00:00
Andy Allan
aa77ff5aec Use flex grid for issue reports and comments 2021-11-10 15:06:54 +00:00
Andy Allan
2c9d2486ec Use flex grid for diary index headings 2021-11-10 14:54:54 +00:00
Andy Allan
afce5886f4 Rework diary entries to use grid when a heading thumbnail is shown
This happens on the index page, but not individual show pages. I've
reversed the if condition to avoid having an else on a negative
condition.
2021-11-10 14:46:52 +00:00
Andy Allan
ee9c8ff7c8 Use grid for diary entry heading layout
This brings it into line with the user profile, which has a similar heading
2021-11-10 14:41:27 +00:00
Andy Allan
6283d0a47a Rework diary comments to use flex grid rather than floats and margins 2021-11-10 14:32:13 +00:00
Andy Allan
6181919b61 Fix erblint errors from the Rails/ContentTag cop 2021-11-10 12:23:48 +00:00
Andy Allan
abe8551506 Remove custom css overrides for the users list
The margins on the buttons aren't needed since the table has a bottom
margin, and the button class has never been applied since it was
incorrectly in the id field. The table row override had no effect since
the cells have their own vertical-alignment set.
2021-11-03 18:35:42 +00:00
Andy Allan
6bce75b134 Add button classes for users list action buttons 2021-11-03 18:35:42 +00:00
Andy Allan
826a864e6c Remove the contact-activity class
The margin-top is better replaced with a bottom margin on the
preceding element, and the width is unnecessary in the grid layout.
2021-11-03 18:35:42 +00:00
Andy Allan
2b84452222 Remove custom margins on sidebar headings
Margin-top in particular is best avoided. The removal of some top
margins required a few corresponding changes to add bottom margins
to other features, mostly done by converting bare text strings to
live within paragraphs.
2021-11-03 18:16:38 +00:00
Andy Allan
1a97236747 Use em rather than fixed pixels to offset the copyright symbol
Fixes #3302

Also fixes an error where the h5 tag was closed incorrectly.
2021-10-20 17:48:21 +01:00
Adam Hoyle
97e70e93bb Remove unnecessary code 2021-10-17 22:34:39 +01:00
Adam Hoyle
0eb2afa83a Merge branch 'master' into feature/add-communities-page 2021-10-17 22:33:02 +01:00
Andy Allan
b0a9b39c8d Use flexbox instead of floating to position the comment icon
This ensures both components get appropriate padding. Fixes #3305
2021-10-13 17:36:48 +01:00
Tom Hughes
5966acc207 Merge remote-tracking branch 'upstream/pull/3300' 2021-10-07 17:45:07 +01:00
Andy Allan
95e5178bfb Refactor tracepoint index to use an xml builder view
This avoids constructing xml by hand in both the controller and
the model, and opens the way for other rendering in future.

The complexity of deciding which point goes where, along with revisiting
previous tracks and tracksegs means that I've broken it down into
two parts - sorting the points into the right trksegs is done first,
before rendering them all as xml. I couldn't find a way to allow
revisiting using the builder.
2021-09-29 15:14:53 +01:00
Adam Hoyle
06c2db433d Merge branch 'master' into feature/add-communities-page 2021-09-27 19:30:25 +01:00
Tom Hughes
e91c02f2ce Merge remote-tracking branch 'upstream/pull/3297' 2021-09-15 18:44:23 +01:00
Andy Allan
76f1d7bc78 Use a builder to render changeset downloads 2021-09-15 16:33:04 +01:00
Andy Allan
9aa17258fc Use flexbox to position user thumbnails on the dashboard
This fixes a poor interaction involving lots of margins and the secondary-actions list
2021-09-15 14:30:32 +01:00
Andy Allan
99abdeb683 Refactor paragraph margin to avoid custom css 2021-09-15 14:29:15 +01:00
Andy Allan
31e247c1e2 Restore the grey border around the user image on the profile page
This approach keeps the look without adding in the margins (and floats)
which are inappropriate for the flex-based layout.
2021-09-15 14:11:05 +01:00
Andy Allan
dfaea75c27 Use an 'inline' dl to unify the appearance of the mapper and admin info details lines 2021-09-15 13:19:56 +01:00
Andy Allan
3b1ef97c69 Move the admin actions into line with the other links
This avoids wrapping them under the user profile picture
2021-09-15 11:57:58 +01:00
Paul Norman
b1b2b52477
Add Fastly as top three donor 2021-09-08 20:05:47 -07:00
Adam Hoyle
4bcc88161c Refactor osm-community-index and local chapters models 2021-09-08 18:11:50 +01:00
Tom Hughes
f4d1d97848 Add a privileged scope that allows email addresses to be returned 2021-08-26 17:22:25 +01:00
Tom Hughes
6c6e8883f7 Introduce privileged scopes that only an administrator can enable 2021-08-26 17:22:24 +01:00
Adam Hoyle
94f9c2b86f Tidy 2021-08-24 21:38:05 +01:00
Tom Hughes
cc461b126d Correct policing of access to private user details 2021-08-24 17:49:08 +01:00
Tom Hughes
29e9857145 Improve behaviour of secondary action lists when wrapping
Based on https://stackoverflow.com/a/31732902 this ensure that when
a secondary action list wraps the additional lines don't start with
an item delimiter by pushing it to the left, outside of a parent nav
element which then hides it.
2021-08-21 15:38:00 +01:00
Andy Allan
6ab522b2b3 Convert account setting menu to tabs, and include on other pages
This makes it easier to navigate around these pages. Since each tab
corresponds to a given controller, this makes the selection of active
tabs straightforward.
2021-08-18 14:30:35 +01:00
Andy Allan
3f8cf32272 Refactor the profile page to move the profile information out of the header
This makes it look like other normal pages, along with removing the unusual full-width class.
2021-08-18 13:33:14 +01:00
Andy Allan
cb7b79a58f Split the non-public information off of the profile page
This opens up many possibilities for more interesting things to be
shown on the dashboard, as well as making it easier to find if
you have lots of content in your profile.
2021-08-18 13:32:36 +01:00
Adam Hoyle
62ecf15975 Merge branch 'master' into feature/add-communities-page 2021-08-12 19:41:12 +01:00
Tom Hughes
9778714046 Merge remote-tracking branch 'upstream/pull/3293' 2021-08-12 18:10:54 +01:00