From: Tom Hughes <tom@compton.nu>
Date: Fri, 23 Nov 2012 19:36:56 +0000 (+0000)
Subject: Revert "Stop the map overlapping the top bar"
X-Git-Tag: live~5167
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f978642a58b06c509ba424e272c4dd82bd434edd?hp=8e27c78d3cb2162d963b49e25519b5d213d74730

Revert "Stop the map overlapping the top bar"

This reverts commit 2ef2d7c876168d6beb606b655470f48ffabc8841.
---

diff --git a/app/assets/javascripts/edit.js b/app/assets/javascripts/edit.js
index c2129e20c..30823d49e 100644
--- a/app/assets/javascripts/edit.js
+++ b/app/assets/javascripts/edit.js
@@ -2,7 +2,7 @@ function maximiseMap() {
   $("#left").hide();
   $("#top-bar").hide();
 
-  $("#content").css("margin-top", "0px");
+  $("#content").css("top", "0px");
   if ($("html").attr("dir") == "ltr") {
     $("#content").css("margin-left", "0px");
   } else {
@@ -16,7 +16,7 @@ function minimiseMap() {
   $("#left").show();
   $("#top-bar").show();
 
-  $("#content").css("margin-top", "30px");
+  $("#content").css("top", "30px");
   if ($("html").attr("dir") == "ltr") {
     $("#content").css("margin-left", "185px");
   } else {
diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 8f500acea..217bb0c66 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -455,7 +455,7 @@ body.site-export #tabnav a#exportanchor {
 
 .site-index .leaflet-top,
 .site-export .leaflet-top {
-  top: 10px !important;
+  top: 40px !important;
 
   .leaflet-control {
     margin-top: 0px !important;
@@ -679,6 +679,7 @@ body.site-export #tabnav a#exportanchor {
 .site-index #content,
 .site-export #content {
   position: fixed;
+  margin-top: 0px;
   left: 0px;
   right: 0px;
   top: 0px;
@@ -686,6 +687,10 @@ body.site-export #tabnav a#exportanchor {
   padding: 0px;
 }
 
+.site-edit #content {
+  top: 30px;
+}
+
 #slim_container {
   width: 100%;
 }