Bugfix: Allow user to create & edit segment

2 files changed, 8 insertions, 6 deletions

diff --git a/plugins/SegmentEditor/javascripts/Segmentation.js b/plugins/SegmentEditor/javascripts/Segmentation.js
index 1cc0075024..93ec161bb7 100644
--- a/plugins/SegmentEditor/javascripts/Segmentation.js
+++ b/plugins/SegmentEditor/javascripts/Segmentation.js
@@ -820,7 +820,6 @@ Segmentation = (function($) {
             self.form = getFormHtml();
             $("#segmentEditorPanel").prepend(self.form);
 
-            setLeftMargin('#segmentEditorPanel > .segment-element');
             bindFormEvents();
             bindSegmentManipulationEvents();
 
diff --git a/plugins/SegmentEditor/stylesheets/segmentation.less b/plugins/SegmentEditor/stylesheets/segmentation.less
index 5f6fd1f8c7..8111fdc808 100644
--- a/plugins/SegmentEditor/stylesheets/segmentation.less
+++ b/plugins/SegmentEditor/stylesheets/segmentation.less
@@ -81,7 +81,10 @@ div.scrollable {
     border: 1px solid #a9a399;
     background-color: #f1f0eb;
     padding: 6px 4px;
-    border-radius: 3px 3px 3px 3px;
+    border-radius: 3px;
+    position: absolute;
+    left: 0;
+    top: 0;
 }
 
 .segment-element .custom_select_search {
@@ -128,7 +131,7 @@ div.scrollable {
 }
 
 .segment-element .segment-nav h4.visits {
-    padding-left: 28px;
+    padding-left: 15px;
     background: url(plugins/SegmentEditor/images/icon-users.png) 0 0 no-repeat;
 }
 
@@ -438,14 +441,13 @@ div.scrollable {
 
 #segmentEditorPanel {
     position: absolute;
-    z-index: 6; /* Should be hover of the world map (z-index: 5) */
+    z-index: 120; /* Should be the same as 'Dashboard widget selector' (z-index: 120) */
     background: #f7f7f7;
     border: 1px solid #e4e5e4;
     padding: 5px 10px 6px 10px;
     border-radius: 4px;
     color: #444;
     font-size: 14px;
-  overflow: hidden;
 }
 
 #segmentEditorPanel:hover {
@@ -545,8 +547,9 @@ span.segmentationTitle {
     display: none;
 }
 
-.segmentList {
+#segmentList {
     max-height: 250px;
+    overflow: hidden; /* Create a BFC */
 }
 
 .jspVerticalBar {