From 1956a8a737d9db2813646abaadfd32a40d1f5567 Mon Sep 17 00:00:00 2001
From: Clement Ho <ClemMakesApps@gmail.com>
Date: Wed, 23 May 2018 12:38:37 -0500
Subject: [PATCH] Fix admin broadcast color form

---
 app/assets/javascripts/pages/admin/admin.js     | 2 +-
 app/assets/stylesheets/bootstrap_migration.scss | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/pages/admin/admin.js b/app/assets/javascripts/pages/admin/admin.js
index ab4a02c82de..ff4d6ab15f9 100644
--- a/app/assets/javascripts/pages/admin/admin.js
+++ b/app/assets/javascripts/pages/admin/admin.js
@@ -25,7 +25,7 @@ export default function adminInit() {
 
   $('body').on('click', '.js-toggle-colors-link', (e) => {
     e.preventDefault();
-    $('.js-toggle-colors-container').toggleClass('hidden');
+    $('.js-toggle-colors-container').toggleClass('hide');
   });
 
   $('.log-tabs a').on('click', function logTabsClick(e) {
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss
index 3d850523480..0c492e7d4a5 100644
--- a/app/assets/stylesheets/bootstrap_migration.scss
+++ b/app/assets/stylesheets/bootstrap_migration.scss
@@ -46,6 +46,12 @@ a {
   text-align: right;
 }
 
+.form-control,
+.search form {
+  // Bootstrap 4 does not have a height
+  height: 34px;
+}
+
 table {
   // Remove any table border lines
   border-spacing: 0;