From 7527792dae8e9614545cffec55c055a9fdb04c45 Mon Sep 17 00:00:00 2001
From: FierySama <fieryludus@gmail.com>
Date: Sat, 9 Nov 2019 21:08:27 -0800
Subject: [PATCH 1/2] Emote Modal to bottom

Brings Mixer vs Elixr emotes closer to smiley button
---
 src/injected-content/emotes/emote-modal-handler.js    | 2 +-
 src/injected-content/scss/_emotes.scss                | 3 ++-
 src/injected-content/scss/themes/_elixr-obsidian.scss | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/injected-content/emotes/emote-modal-handler.js b/src/injected-content/emotes/emote-modal-handler.js
index 73c80450..a8e51e0f 100644
--- a/src/injected-content/emotes/emote-modal-handler.js
+++ b/src/injected-content/emotes/emote-modal-handler.js
@@ -57,7 +57,7 @@ export function handleEmoteModal(options, cache) {
                                 <img src="${browser.runtime.getURL('resources/images/elixr-light-128.png')}">
                             </div>
                         </div>
-                    `).insertBefore(emotesContainer);
+                    `).insertAfter(emotesContainer);
 
                         $('.me-emote-tab').off('click');
                         $('.me-emote-tab').on('click', function() {
diff --git a/src/injected-content/scss/_emotes.scss b/src/injected-content/scss/_emotes.scss
index e324f7a1..cff48a45 100644
--- a/src/injected-content/scss/_emotes.scss
+++ b/src/injected-content/scss/_emotes.scss
@@ -67,7 +67,7 @@
     width: 100%;
     display: flex;
     background: #222d3c;
-    border-bottom: 1px solid #3E4A5B;
+    border-top: 1px solid rgb(62, 74, 91);
     .me-emote-tab {
         padding: 10px 0;
         width: 50%;
@@ -93,4 +93,5 @@
 .me-emotes-wrapper {
     overflow-y: auto;
     padding: 16px;
+    height: 100%;
 }
diff --git a/src/injected-content/scss/themes/_elixr-obsidian.scss b/src/injected-content/scss/themes/_elixr-obsidian.scss
index b19e50ab..e1de42a2 100644
--- a/src/injected-content/scss/themes/_elixr-obsidian.scss
+++ b/src/injected-content/scss/themes/_elixr-obsidian.scss
@@ -101,7 +101,7 @@ body.elixr-obsidian {
 
     .me-emote-tabs {
         background: #232324;
-        border-bottom: 1px solid hsla(0,0%,100%,.1);
+        border-top: 1px solid hsla(0,0%,100%,.1);
         .me-emote-tab.me-tab-selected {
             background: #151515;
         }

From 771cdf5a3b97375c58c48d0139f46c2ad2c10074 Mon Sep 17 00:00:00 2001
From: FierySama <fieryludus@gmail.com>
Date: Fri, 13 Dec 2019 09:15:34 -0800
Subject: [PATCH 2/2] Revert "Emote Modal to bottom"

This reverts commit 7527792dae8e9614545cffec55c055a9fdb04c45.
---
 src/injected-content/emotes/emote-modal-handler.js    | 2 +-
 src/injected-content/scss/_emotes.scss                | 3 +--
 src/injected-content/scss/themes/_elixr-obsidian.scss | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/injected-content/emotes/emote-modal-handler.js b/src/injected-content/emotes/emote-modal-handler.js
index a8e51e0f..73c80450 100644
--- a/src/injected-content/emotes/emote-modal-handler.js
+++ b/src/injected-content/emotes/emote-modal-handler.js
@@ -57,7 +57,7 @@ export function handleEmoteModal(options, cache) {
                                 <img src="${browser.runtime.getURL('resources/images/elixr-light-128.png')}">
                             </div>
                         </div>
-                    `).insertAfter(emotesContainer);
+                    `).insertBefore(emotesContainer);
 
                         $('.me-emote-tab').off('click');
                         $('.me-emote-tab').on('click', function() {
diff --git a/src/injected-content/scss/_emotes.scss b/src/injected-content/scss/_emotes.scss
index cff48a45..e324f7a1 100644
--- a/src/injected-content/scss/_emotes.scss
+++ b/src/injected-content/scss/_emotes.scss
@@ -67,7 +67,7 @@
     width: 100%;
     display: flex;
     background: #222d3c;
-    border-top: 1px solid rgb(62, 74, 91);
+    border-bottom: 1px solid #3E4A5B;
     .me-emote-tab {
         padding: 10px 0;
         width: 50%;
@@ -93,5 +93,4 @@
 .me-emotes-wrapper {
     overflow-y: auto;
     padding: 16px;
-    height: 100%;
 }
diff --git a/src/injected-content/scss/themes/_elixr-obsidian.scss b/src/injected-content/scss/themes/_elixr-obsidian.scss
index e1de42a2..b19e50ab 100644
--- a/src/injected-content/scss/themes/_elixr-obsidian.scss
+++ b/src/injected-content/scss/themes/_elixr-obsidian.scss
@@ -101,7 +101,7 @@ body.elixr-obsidian {
 
     .me-emote-tabs {
         background: #232324;
-        border-top: 1px solid hsla(0,0%,100%,.1);
+        border-bottom: 1px solid hsla(0,0%,100%,.1);
         .me-emote-tab.me-tab-selected {
             background: #151515;
         }