From: Tom Hughes Date: Sun, 7 Apr 2024 11:44:00 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/4656' X-Git-Tag: live~197 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/108984f04af55561898a6ae3dbb42cf0bef81674?hp=d39533cd50d4b25ef5cc5e39fd79ee91c02ecc23 Merge remote-tracking branch 'upstream/pull/4656' --- diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index fc774a3ee..db03b94ab 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -321,7 +321,6 @@ body.small-nav { #sidebar { float: left; width: $sidebarWidth; - background: #fff; #sidebar_loader { display: none; diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb index 9c1eb7020..3e2996b2e 100644 --- a/app/views/layouts/map.html.erb +++ b/app/views/layouts/map.html.erb @@ -21,7 +21,7 @@ <% end %> <% content_for :content do %> -