From f3836c36aad0d5c778d9f097e480284be2066e39 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Wed, 27 Mar 2019 14:18:04 -0400
Subject: [PATCH] Fix toolbar tooltip placement (close #6112) Tweak pane
 positions for the new toolbar height

---
 css/80_app.css          | 33 +++++++++++++++++++++++++++------
 modules/util/tooltip.js |  2 +-
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/css/80_app.css b/css/80_app.css
index f77f55516..a310479d4 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -440,7 +440,7 @@ button[disabled].action:hover {
     left: 0;
     top: 0;
     right: 0;
-    z-index: 9;
+    z-index: 101;
 }
 #bar .toolbar-item {
     display: flex;
@@ -3012,7 +3012,7 @@ input.key-trap {
 ------------------------------------------------------- */
 .map-controls {
     right: 0;
-    top: 132px;
+    top: 141px;
     width: 40px;
     position: fixed;
     z-index: 100;
@@ -3560,7 +3560,7 @@ ul.issue-fix-list button {
 ------------------------------------------------------- */
 .map-pane {
     position: absolute;
-    top: 60px;
+    top: 71px;
     bottom: 30px;
     right: 0;
     width: 100%;
@@ -4864,7 +4864,7 @@ svg.mouseclick use.right {
 }
 .tooltip.in {
     opacity: 0.9;
-    z-index: 1030;
+    z-index: 5000;
     height: auto;
     display: block;
 }
@@ -5054,13 +5054,34 @@ svg.mouseclick use.right {
 }
 
 /* Move over tooltips that are near the edge of screen */
-.sidebar-toggle .tooltip .tooltip-arrow {
-    left: 36px;
+[dir='ltr'] .sidebar-toggle .tooltip {
+    left: 0 !important;
+}
+[dir='rtl'] .sidebar-toggle .tooltip {
+    right: 0 !important;
+}
+[dir='ltr'] .sidebar-toggle .tooltip .tooltip-arrow {
+    left: 20px;
 }
 [dir='rtl'] .sidebar-toggle .tooltip .tooltip-arrow {
+    right: 20px;
+}
+[dir='ltr'] .save .tooltip {
+    left: auto !important;
+    right: 0 !important;
+}
+[dir='rtl'] .save .tooltip {
+    right: auto !important;
+    left: 0 !important;
+}
+[dir='ltr'] .save .tooltip .tooltip-arrow {
     left: auto;
     right: 36px;
 }
+[dir='rtl'] .save .tooltip .tooltip-arrow {
+    right: auto;
+    left: 36px;
+}
 
 li:first-of-type .badge .tooltip,
 li.hide + li.version .badge .tooltip {
diff --git a/modules/util/tooltip.js b/modules/util/tooltip.js
index 969cedec8..7be587d33 100644
--- a/modules/util/tooltip.js
+++ b/modules/util/tooltip.js
@@ -163,7 +163,7 @@ export function tooltip(klass) {
             pos = { x: outer.x - inner.w, y: outer.y + (outer.h - inner.h) / 2 };
             break;
             case 'bottom':
-            pos = { x: Math.max(0, outer.x + (outer.w - inner.w) / 2), y: outer.y + outer.h };
+            pos = { x: outer.x + (outer.w - inner.w) / 2, y: outer.y + outer.h };
             break;
         }