Commit graph

5883 commits

Author SHA1 Message Date
Tom Hughes
e0f3fdbac7 Merge remote-tracking branch 'upstream/pull/2475' 2019-12-29 19:16:33 +00:00
Kristjan
81c244e273
fixed "end tag" -> "source"
Fixed inattentiveness from my last commit.
2019-12-26 11:23:45 +01:00
Kristjan
0d3f269aa8
removed end tag ("source" is a self-closing tag) 2019-12-24 23:44:50 +01:00
Kristjan
ec56eaf0f2
removed end tag ("source" is a self-closing tag) 2019-12-24 23:44:22 +01:00
Kristjan
f771df86d2
removed end tag ("source" is a self-closing tag) 2019-12-24 23:43:49 +01:00
Simon Legner
7a81258ddc Translate units used by leaflet-locatecontrol 2019-12-24 00:29:30 +01:00
Andy Allan
dddef7672e Use _html suffix to avoid using raw when displaying translated strings
This is safer than raw, since any user input is still escaped.
2019-12-22 11:28:18 +01:00
Andy Allan
281d7992f8
Merge pull request #2464 from hikemaniac/fix-comment-textarea
Improve textarea behaviour
2019-12-22 10:21:14 +00:00
Andy Allan
217f616630 Use _html suffix to avoid using raw when displaying translated strings
This is safer than raw, since any user input is still escaped.
2019-12-20 14:32:00 +01:00
Andy Allan
dfedf85b6c Use _html suffix to avoid using raw when displaying translated strings
This is safer than raw, since any user input is still escaped.
2019-12-20 10:29:07 +01:00
Andy Allan
1ff7e3ac71 Replace custom css class with bootstrap inline utility
This has actually been broken since the controller was renamed,
but nobody noticed.
2019-12-19 19:31:52 +01:00
Andy Allan
1586e2ba80 Use badges for the trace visibility labels
Our green is currently just on the side of triggering black text,
hence the override to make it look consistent with the other badges.
2019-12-19 19:18:00 +01:00
Andy Allan
a3e3be007e Use text-danger style for pending trace warning 2019-12-19 19:15:36 +01:00
Andy Allan
f8d61f287c Remove font-size overrides for traces and user lists
This makes them much easier to read
2019-12-19 18:03:09 +01:00
Andy Allan
410fe87045 Use a warning alert for reporting new issues
This removes custom colouring for the alert. The list overrides
need to stay until we unpick more of our custom styling.
2019-12-19 17:50:22 +01:00
Andy Allan
3776a6d321 Use offwhite instead of grey for browse pages tag tables 2019-12-19 17:43:03 +01:00
Andy Allan
118347444f Remove more header font size overrides
This smooths out inconsistencies in the hierarchies, for example when
using header sizes beyond h3 in profile descriptions.
2019-12-19 17:29:21 +01:00
Andy Allan
6edf2d4374 Minimially invasive fix for sidebar heading sizes
I'd prefer to avoid overriding the heading sizes, but this will involve
more extensive changes to the layout. For example, the h2 heading has
specific padding and margins that break when moving to h3.

Fixes #2467
2019-12-19 17:09:51 +01:00
hikemaniac
75d09e2233 Let all textareas only be vertically resized 2019-12-18 20:32:56 +01:00
Tom Hughes
32fa124698 Merge remote-tracking branch 'upstream/pull/2452' 2019-12-18 18:23:42 +00:00
Tom Hughes
6f8966e7c1 Note events use "opened" not "open" as the status 2019-12-16 22:26:33 +00:00
Tom Hughes
ac6a872a48 Avoid errors when /edit is called on an invalid object 2019-12-16 21:23:09 +00:00
hikemaniac
e6d7471ab6 Fixed comment textarea going off the sidebar, added border-radius to form fields 2019-12-15 16:04:29 +01:00
Tom Hughes
a2ad08b2e2 Use correct link for settings page 2019-12-12 19:12:38 +00:00
Tom Hughes
9153fd3559 Fix link in error page when a user has public edits disabled 2019-12-12 18:50:30 +00:00
mmd
ffe636e6bd Add In-Reply-To, References headers to email
Closes https://github.com/openstreetmap/openstreetmap-website/issues/2430
2019-12-12 18:25:29 +01:00
Tom Hughes
2f419c7ab0 Merge remote-tracking branch 'upstream/pull/2461' 2019-12-11 17:31:16 +00:00
Andy Allan
040302286f Remove ignoring of nearby column
This is the final stage in the process. Now that the migrations are run,
and apps restarted, it is safe to remove the ignore_column declaration.
2019-12-11 18:08:31 +01:00
Tom Hughes
c56f7a37fc Merge remote-tracking branch 'upstream/pull/2460' 2019-12-11 16:36:40 +00:00
Andy Allan
13f0591605 Wrap table header rows in thead 2019-12-11 17:22:23 +01:00
Tom Hughes
3955338682 Merge remote-tracking branch 'upstream/pull/2459' 2019-12-11 16:00:14 +00:00
Andy Allan
efa5f6d4b6 Use a new colour name for the vibrant greens 2019-12-11 16:51:04 +01:00
Andy Allan
c0f5e4ede8 Use paramatered colours for greys 2019-12-11 16:20:16 +01:00
Andy Allan
9b6114ab0b Combine the two different offwhite background colours, and use the lighter one 2019-12-11 15:57:23 +01:00
Tom Hughes
7531060a12 Use squiggly heredocs 2019-12-11 10:40:41 +00:00
Andy Allan
ec5039d9cc Use bootstrap typography 2019-12-11 10:24:57 +01:00
Andy Allan
dc96834ebb Use bootstrap cards to spruce up the help page 2019-12-11 10:24:57 +01:00
Andy Allan
01faa2e287 Custom bootstrap with all components disabled
This lets us work through things slowly as we use more features
2019-12-11 10:24:57 +01:00
Andy Allan
7f9dacbada Add bootstrap 4 2019-12-11 10:24:57 +01:00
Andy Allan
cffff1635d Rename bootstrap-tooltips file
This avoids clashing with including upstream bootstrap
2019-12-11 10:24:05 +01:00
Tom Hughes
86b355c4df Use delete method correctly when deleting traces
Fixes #2453
2019-12-04 21:06:19 +00:00
Tom Hughes
fc8189685e Fix erblint warnings 2019-12-04 19:58:21 +00:00
Tom Hughes
57f5b7840e Fix rubocop warnings 2019-12-04 19:31:53 +00:00
Tom Hughes
6a68e7676d Merge remote-tracking branch 'upstream/pull/2451' 2019-12-04 16:08:26 +00:00
Andy Allan
35370684e5 Make the back button link to the inbox when reading received messages 2019-12-04 16:42:57 +01:00
Andy Allan
f1c6a87aa1
Merge pull request #2427 from mmd-osm/patch/remove_expand_bbox
Remove expand_bbox endpoint
2019-12-04 12:48:34 +01:00
Andy Allan
44c6fdc273 Use the conventional 'destroy' method name for destroying traces 2019-12-04 11:59:18 +01:00
Tom Hughes
dba3940571 Replace content_tag_for with a simple tr element 2019-12-03 22:54:55 +00:00
Andy Allan
a41d500b9f Create an ApplicationRecord for models to inherit from
This is the default for Rails 5+, and also paves the way for
multiple database support.
2019-11-27 11:50:48 +01:00
Tom Hughes
a3a95616d9 Drop bowser, which is no longer used 2019-11-26 18:56:12 +00:00