From 5921cb7a9b92342c2a7d7e494e0449de637bb704 Mon Sep 17 00:00:00 2001
From: Jeremy Zhang <jkzhang@uw.edu>
Date: Wed, 8 Aug 2018 02:29:20 +0000
Subject: [PATCH] Update showscrollbar and scrollbar to not clip chatbox

---
 webapp/titanembeds/static/css/embed.css | 3 +--
 webapp/titanembeds/static/js/embed.js   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/webapp/titanembeds/static/css/embed.css b/webapp/titanembeds/static/css/embed.css
index fc32fa4..81b1315 100644
--- a/webapp/titanembeds/static/css/embed.css
+++ b/webapp/titanembeds/static/css/embed.css
@@ -61,6 +61,7 @@ main {
   min-height: calc(100vh - 80px);
   overflow-x: hidden;
   height: 100%;
+  padding-bottom: 50px;
 }
 
 footer {
@@ -185,8 +186,6 @@ nav .brand-logo {
 #chatcontent {
   padding-left: 1%;
   padding-top: 1%;
-  padding-bottom: 40px;
-  margin-bottom: 20px;
   word-wrap: break-word;
 }
 
diff --git a/webapp/titanembeds/static/js/embed.js b/webapp/titanembeds/static/js/embed.js
index 9267d20..f524639 100644
--- a/webapp/titanembeds/static/js/embed.js
+++ b/webapp/titanembeds/static/js/embed.js
@@ -363,7 +363,7 @@
             scrollbarTheme = "light";
         }
         $("main").mCustomScrollbar({
-            alwaysShowScrollbar: showScrollbar,
+            autoHideScrollbar: !showScrollbar,
             theme: scrollbarTheme
         });