Merge branch 'master' into notes

[rails.git] / app / assets / javascripts / edit.js

diff --git a/app/assets/javascripts/edit.js b/app/assets/javascripts/edit.js
index 0b2b329b5d358223c4c1487737a9ad8813a2d768..30823d49ea5d00a0a493463c4aa6f1046b6c4433 100644 (file)
--- a/app/assets/javascripts/edit.js
+++ b/app/assets/javascripts/edit.js
@@ -1,13 +1,12 @@
 function maximiseMap() {
   $("#left").hide();
-  $("#greeting").hide();
-  $("#tabnav").hide();
+  $("#top-bar").hide();
 
   $("#content").css("top", "0px");
   if ($("html").attr("dir") == "ltr") {
-    $("#content").css("left", "0px");
+    $("#content").css("margin-left", "0px");
   } else {
-    $("#content").css("right", "0px");
+    $("#content").css("margin-right", "0px");
   }
 
   handleResize();
@@ -15,14 +14,13 @@ function maximiseMap() {
 
 function minimiseMap() {
   $("#left").show();
-  $("#greeting").show();
-  $("#tabnav").show();
+  $("#top-bar").show();
 
   $("#content").css("top", "30px");
   if ($("html").attr("dir") == "ltr") {
-    $("#content").css("left", "185px");
+    $("#content").css("margin-left", "185px");
   } else {
-    $("#content").css("right", "185px");
+    $("#content").css("margin-right", "185px");
   }
 
   handleResize();