From ee155bd4f20bc7715df932719626dfb41086e4ec Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 26 Jan 2018 14:52:03 -0500
Subject: [PATCH] Removing duplicate modal styling

---
 app/assets/stylesheets/common/base/modal.scss | 10 ++++++++++
 app/assets/stylesheets/desktop/modal.scss     | 10 ----------
 app/assets/stylesheets/mobile/modal.scss      | 10 ----------
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index 5961334900f..3d98847638f 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -11,6 +11,16 @@
 
 }
 
+.bootbox.modal {
+  position: fixed;
+  z-index: z("modal","content");
+  overflow: auto;
+  height: auto;
+  background-color: $secondary;
+  box-shadow: 0 2px 2px rgba(0,0,0, .25);
+  background-clip: padding-box;
+}
+
 .input-hint-text {
   margin-left: 0.5em;
   color: $secondary-high;
diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss
index 9d3dd6a25b1..c58442f2464 100644
--- a/app/assets/stylesheets/desktop/modal.scss
+++ b/app/assets/stylesheets/desktop/modal.scss
@@ -7,23 +7,13 @@
 
 // Hardcode to be the same as before for now. I would recommend not using bootbox, or finding a way so the html structure can be the same
 .bootbox.modal {
-  position: fixed;
   top: 50%;
   left: 50%;
-  z-index: z("modal","content");
-  overflow: auto;
   width: 610px;
-  height: auto;
   margin: -250px 0 0 -305px;
-  background-color: $secondary;
-  border: 1px solid $primary-low;
-
-  box-shadow: 0 3px 7px rgba(0,0,0, .8);
-  background-clip: padding-box;
   .cancel {
     margin-left: 1em;
   }
-
 }
 
 .modal.in {
diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss
index 9ee48891934..f7a6892fc90 100644
--- a/app/assets/stylesheets/mobile/modal.scss
+++ b/app/assets/stylesheets/mobile/modal.scss
@@ -10,18 +10,8 @@
 
 // Hardcode to be the same as before for now. I would recommend not using bootbox, or finding a way so the html structure can be the same
 .bootbox.modal {
-  position: fixed;
   top: 10%;
-  z-index: z("modal","content");
-  overflow: auto;
   width: 100%;
-  height: auto;
-  background-color: $secondary;
-  border: 1px solid rgba(0, 0, 0, 0.3);
-
-  @include border-radius-all (6px);
-  box-shadow: 0 3px 7px rgba(0,0,0, 0.3);
-  background-clip: padding-box;
 }
 
 .modal.fade {