Avoid having to condition on mobile mode

diff --git a/app/assets/stylesheets/ltr.css.scss b/app/assets/stylesheets/ltr.css.scss
index d557ba61833d1fed456a674146895465c26b1da0..817404a799d879e34ad2e65cca634774444028c9 100644 (file)
--- a/app/assets/stylesheets/ltr.css.scss
+++ b/app/assets/stylesheets/ltr.css.scss
@@ -106,6 +106,7 @@ html body {
 
 #sidebar {
   left: 0px;
+  margin-right: 3px;
 }
 
 #sidebar #sidebar_title {

diff --git a/app/assets/stylesheets/rtl.css.scss b/app/assets/stylesheets/rtl.css.scss
index b4ae98dbc14ba6b13120b6186cdb37a3a05a4051..953efd7a66bc5b2b4f7e7cf1a34e2be4ab220889 100644 (file)
--- a/app/assets/stylesheets/rtl.css.scss
+++ b/app/assets/stylesheets/rtl.css.scss
@@ -107,6 +107,7 @@ html body {
 
 #sidebar {
   right: 0px;
+  margin-left: 3px;
 }
 
 #sidebar #sidebar_title {

diff --git a/app/assets/stylesheets/small.css.scss b/app/assets/stylesheets/small.css.scss
index 4dee3f1bfc2ed3b5d528ad491688ae676f98311c..07b5d7b1075f534e2bc46f1b2ab865990b6d3632 100644 (file)
--- a/app/assets/stylesheets/small.css.scss
+++ b/app/assets/stylesheets/small.css.scss
@@ -118,6 +118,7 @@ h1 {
 #sidebar {
   border: 0px;
   border-right: 1px solid #ccccdd;
+  margin: 0px;
 }
 
 .sidebar_title, #sidebar_content {

diff --git a/app/views/site/_resize.html.erb b/app/views/site/_resize.html.erb
index 9ee05a7c83d04f713e24378c8ca524f2c29cc11d..30ee81f05ccba84b2098988523af9c32a37c0613 100644 (file)
--- a/app/views/site/_resize.html.erb
+++ b/app/views/site/_resize.html.erb
@@ -16,21 +16,19 @@
   }
 
   function resizeMap() {
-    var sidebar_width = 0 + $("#sidebar:visible").width();
-
-    if (sidebar_width > 0 && window.width > 641) {
-      sidebar_width = sidebar_width + 5
-    }
+    var sidebar_width = 0 + $("#sidebar:visible").outerWidth(true);
+    var left_border = 0 + $("#map").css("border-left-width");
+    var right_border = 0 + $("#map").css("border-right-width");
+    var top_border = 0 + $("#map").css("border-top-width");
+    var bottom_border = 0 + $("#map").css("border-bottom-width");
 
     <% if t('html.dir') == "ltr" -%>
     $("#map").css("left", (sidebar_width) + "px");
     <% else -%>
     $("#map").css("right", (sidebar_width) + "px");
     <% end -%>
-    $("#map").width($("#content").width() - sidebar_width);
-    if (window.width > 641) {
-      $("#map").height($("#content").height() - 2);
-    }
+    $("#map").width($("#content").width() - sidebar_width - left_border - right_border);
+    $("#map").height($("#content").height() - top_border - bottom_border);
   }
 
   function handleResize() {