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 c2129e20c170a8a91470fb9c1f7390fcc7ca3f1a..30823d49ea5d00a0a493463c4aa6f1046b6c4433 100644 (file)
--- a/app/assets/javascripts/edit.js
+++ b/app/assets/javascripts/edit.js
@@ -2,7 +2,7 @@ function maximiseMap() {
   $("#left").hide();
   $("#top-bar").hide();
 
   $("#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 {
   if ($("html").attr("dir") == "ltr") {
     $("#content").css("margin-left", "0px");
   } else {


@@ -16,7 +16,7 @@ function minimiseMap() {
   $("#left").show();
   $("#top-bar").show();
 
   $("#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 {
   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 8f500acea2e4d8801a152fa41b3d281dfa8a75b3..217bb0c669c341463fea61a90296d7e466bad1b6 100644 (file)
--- 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 {
 
 .site-index .leaflet-top,
 .site-export .leaflet-top {

-  top: 10px !important;
+  top: 40px !important;

 
   .leaflet-control {
     margin-top: 0px !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;
 .site-index #content,
 .site-export #content {
   position: fixed;

+  margin-top: 0px;

   left: 0px;
   right: 0px;
   top: 0px;
   left: 0px;
   right: 0px;
   top: 0px;


@@ -686,6 +687,10 @@ body.site-export #tabnav a#exportanchor {
   padding: 0px;
 }
 
   padding: 0px;
 }
 

+.site-edit #content {
+  top: 30px;
+}
+

 #slim_container {
   width: 100%;
 }
 #slim_container {
   width: 100%;
 }