Merge pull request #1579 from hmhealey/plt1298

PLT-1298 Converted Command and @Mention autocomplete to new suggestion components

5 files changed, 39 insertions, 32 deletions

diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss
index f59cefbc6..ee5b7f6d0 100644
--- a/web/sass-files/sass/partials/_mentions.scss
+++ b/web/sass-files/sass/partials/_mentions.scss
@@ -7,26 +7,9 @@
 	@include border-radius(3px);
 }
 
-.mentions--top {
-	position: absolute;
-	z-index: 1060;
-	@extend %popover-box-shadow;
-	.mentions-box {
- 		width: 100%;
- 		height: 100%;
-		position: absolute;
-		background-color: #fff;
-		border: $border-gray;
-		overflow-x: hidden;
-		overflow-y: scroll;
-		bottom: 0;
-	}
-}
-
 .mentions-name {
 	position:relative;
 	width:100%;
-	background-color:#fff;
 	height:36px;
 	padding:2px;
 	z-index:101;
@@ -57,4 +40,4 @@
 
 .mention-highlight {
 	background-color:#fff2bb;
-}
\ No newline at end of file
+}
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index 4a56bc6c7..01c9e136c 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -405,3 +405,11 @@
 		@include opacity(0.7);
 	}
 }
+
+.modal-body.edit-modal-body {
+    overflow: visible;
+
+    .suggestion-content {
+        max-height: 150px;
+    }
+}
diff --git a/web/sass-files/sass/partials/_sidebar--right.scss b/web/sass-files/sass/partials/_sidebar--right.scss
index 43162831d..735b2a99e 100644
--- a/web/sass-files/sass/partials/_sidebar--right.scss
+++ b/web/sass-files/sass/partials/_sidebar--right.scss
@@ -93,6 +93,10 @@
             padding-bottom: 10px;
         }
     }
+
+    .suggestion-content {
+        max-height: 120px;
+    }
 }
 
 .sidebar-right-container {
diff --git a/web/sass-files/sass/partials/_command-box.scss b/web/sass-files/sass/partials/_suggestion_list.scss
index 184fb55eb..c3df88964 100644
--- a/web/sass-files/sass/partials/_command-box.scss
+++ b/web/sass-files/sass/partials/_suggestion_list.scss
@@ -1,15 +1,29 @@
-.command-box {
+.suggestion-list {
+	width: 100%;
+	z-index: 100;
+	@extend %popover-box-shadow;
+}
+
+.suggestion-list--top {
     position: absolute;
-    background-color: #fff;
+}
+
+.suggestion-content {
     width: 100%;
+    max-height: 292px;
+    background-color: #fff;
     border: $border-gray;
-    bottom: 38px;
-    overflow: auto;
-    z-index: 100;
-    @extend %popover-box-shadow;
-    .sidebar--right & {
-        bottom: 100px;
-    }
+    overflow-x: hidden;
+    overflow-y: scroll;
+}
+
+.suggestion-content--top {
+    position: absolute;
+    bottom: 0;
+}
+
+.suggestion--selected {
+    // set by theme code
 }
 
 .command-name {
@@ -20,9 +34,7 @@
     z-index: 101;
     font-size: 0.95em;
     border-bottom: 1px solid #ddd;
-    &:hover {
-        background-color: #e8eaed;
-    }
+
     .command__desc {
         margin-left: 5px;
         @include opacity(0.5);
@@ -32,4 +44,4 @@
 
 .command-desc {
     color: #a7a8ab;
-}
\ No newline at end of file
+}
diff --git a/web/sass-files/sass/styles.scss b/web/sass-files/sass/styles.scss
index 01f654eec..e7fd7c976 100644
--- a/web/sass-files/sass/styles.scss
+++ b/web/sass-files/sass/styles.scss
@@ -32,7 +32,6 @@
 @import "partials/modal";
 @import "partials/forms";
 @import "partials/mentions";
-@import "partials/command-box";
 @import "partials/error";
 @import "partials/error-bar";
 @import "partials/loading";
@@ -40,6 +39,7 @@
 @import "partials/markdown";
 @import "partials/tutorial";
 @import "partials/statistics";
+@import "partials/suggestion_list";
 
 // Elements
 @import "partials/tooltips";