refactor: rework dropdown style

Alex-D · May 2, 2019 · 08793fd · 08793fd
1 parent 8fc5e1e
commit 08793fd
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 23 deletions.
diff --git a/plugins/emoji/ui/sass/trumbowyg.emoji.scss b/plugins/emoji/ui/sass/trumbowyg.emoji.scss
@@ -1,9 +1,6 @@
 .trumbowyg-dropdown-emoji {
     width: 265px;
     padding: 7px 0 7px 5px;
-    height: 200px;
-    overflow-y: scroll;
-    overflow-x: hidden;
 }
 
 .trumbowyg-dropdown-emoji svg {

diff --git a/plugins/mention/ui/sass/trumbowyg.mention.scss b/plugins/mention/ui/sass/trumbowyg.mention.scss
@@ -1,14 +1,4 @@
 .trumbowyg-dropdown-mention {
-    height: calc(75%);
-    width: 300px;
-    max-width: 300px;
-    overflow-y: scroll;
-    overflow-x: hidden;
-
-    svg {
-        display: none !important;
-    }
-
     button {
         position: relative;
         white-space: nowrap;

diff --git a/plugins/specialchars/trumbowyg.specialchars.js b/plugins/specialchars/trumbowyg.specialchars.js
@@ -59,6 +59,7 @@
                 defaultSymbolBtnName = 'symbol-' + btn,
                 defaultSymbolBtnDef = {
                     text: symbol,
+                    hasIcon: false,
                     fn: function () {
                         var encodedSymbol = String.fromCodePoint(parseInt(symbol.replace('&#', '0')));
                         trumbowyg.execCmd('insertText', encodedSymbol);

diff --git a/plugins/specialchars/ui/sass/trumbowyg.specialchars.scss b/plugins/specialchars/ui/sass/trumbowyg.specialchars.scss
@@ -6,15 +6,8 @@
 }
 
 .trumbowyg-dropdown-specialChars {
-    width: 265px;
-    padding: 7px 0 7px 5px;
-    height: 200px;
-    overflow-y: scroll;
-    overflow-x: hidden;
-}
-
-.trumbowyg-dropdown-specialChars svg {
-    display: none !important;
+    width: 248px;
+    padding: 5px 3px 3px;
 }
 
 .trumbowyg-dropdown-specialChars button {

diff --git a/src/ui/sass/trumbowyg.scss b/src/ui/sass/trumbowyg.scss
@@ -250,7 +250,10 @@ $slow-transition-duration: 300ms !default;
 }
 
 .trumbowyg-dropdown {
-    min-width: 200px;
+    max-width: 300px;
+    max-height: 250px;
+    overflow-y: auto;
+    overflow-x: hidden;
     border: 1px solid $light-color;
     padding: 5px 0;
     border-top: none;