fixed merge conflicts

1 files changed, 52 insertions, 23 deletions

diff --git a/src/client/views/linking/LinkMenu.scss b/src/client/views/linking/LinkMenu.scss
index 4b1a3f425..b0edd238e 100644
--- a/src/client/views/linking/LinkMenu.scss
+++ b/src/client/views/linking/LinkMenu.scss
@@ -1,33 +1,63 @@
 @import "../globalCssVariables";
 
 .linkMenu {
-    width: 100%;
+    width: auto;
     height: auto;
-    //border: 1px solid black;
+    position: absolute;
+    top : 0;
+    left: 0;
+
+    .linkMenu-list {
+
+        display: inline-block;
+
+        border: 1px solid black;
+
+        box-shadow: 3px 3px 1.5px grey;
+
+        max-height: 170px;
+        overflow-y: scroll;
+        position: relative;
+        z-index: 10;
+        background: white;
+        min-width: 170px;
+        //border-radius: 5px;
+        //padding-top: 6.5px;
+        //padding-bottom: 6.5px;
+        //padding-left: 6.5px;
+        //padding-right: 2px;
+        //width: calc(auto + 50px);
+
+        white-space: nowrap;
+
+        overflow-x: hidden;
+
+        width: 240px;
 
-    &:hover {
-        width: calc(auto + 26px);
+        &:last-child {
+            border-bottom: none;
+        }
     }
-}
 
-.linkMenu-list {
-    border: 1px solid black;
-    max-height: 200px;
-    overflow-y: scroll;
-    position: absolute;
-    z-index: 10;
-    background: white;
-    min-width: 150px;
-    border-radius: 5px;
-    padding-top: 6.5px;
-    padding-bottom: 6.5px;
-    padding-left: 6.5px;
-    padding-right: 2px;
-    //width: calc(auto + 50px);
+    .linkMenu-listEditor {
+
+        display: inline-block;
+
+        border: 1px solid black;
+
+        box-shadow: 3px 3px 1.5px grey;
+
+        max-height: 170px;
+        overflow-y: scroll;
+        position: relative;
+        z-index: 10;
+        background: white;
+        min-width: 170px;
+    }
 }
 
 .linkMenu-group {
-    //border-bottom: 0.5px solid lightgray;
+    border-bottom: 0.5px solid lightgray;
     //@extend: 5px 0;
 
 
@@ -36,7 +66,6 @@
     }
 
     .linkMenu-group-name {
-        display: flex;
 
 
         &:hover {
@@ -46,7 +75,7 @@
             }
 
             p.expand-one {
-                width: calc(100% + 26px);
+                width: calc(100% + 20px);
             }
 
             .linkEditor-tableButton {
@@ -56,7 +85,7 @@
 
         p {
             width: 100%;
-            padding: 4px 6px;
+            //padding: 4px 6px;
             line-height: 12px;
             border-radius: 5px;
             font-weight: bold;