Merge remote-tracking branch 'upstream/pull/4342'

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index f3ca5f37f463898b2412a83ab07298279f46059e..5bfe86b8607b58a9458e03db6b17306ca1b88b1e 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -68,14 +68,6 @@ window.updateLinks = function (loc, zoom, layers, object) {
     .toggleClass("disabled", editDisabled);
 };
 
-window.maximiseMap = function () {
-  $("#content").addClass("maximised");
-};
-
-window.minimiseMap = function () {
-  $("#content").removeClass("maximised");
-};
-
 $(document).ready(function () {
   var headerWidth = 0,
       compactWidth = 0;

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 7d620f7d31ee9c65abc675f4fe39e67f7784f7aa..3edeeb4d8fcfbc6edcd6b01cd3e9409080c3355e 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -901,15 +901,6 @@ tr.turn:hover {
   }
 }
 
-#content.maximised {
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  border: 0;
-  z-index: 2000;
-}
-
 /* Rules for small maps in content areas */
 
 .content_map {