From: Stefan Baebler <sbaebler@outbrain.com>
Date: Sat, 31 Aug 2019 09:34:57 +0000 (+0200)
Subject: Merge branch 'master' into tag-colour-preview-rebase
X-Git-Tag: live~2463^2~4
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e731dd71a77ad4ad1e9db22535e89444bb98e5d9

Merge branch 'master' into tag-colour-preview-rebase
---

e731dd71a77ad4ad1e9db22535e89444bb98e5d9
diff --cc app/assets/javascripts/index.js
index 4a8d8d917,2c7d70e11..562eb80fd
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@@ -334,13 -347,9 +347,13 @@@ $(document).ready(function () 
            });
          }
        });
 +      
 +      $('.colour-preview-box').each(function () {
 +        $(this).css("background-color", $(this).data("colour"));
 +      });
      }
  
-     page.unload = function() {
+     page.unload = function () {
        map.removeObject();
      };