From cc28a4ddc3f7103eddd956219ef2a150d787e4d2 Mon Sep 17 00:00:00 2001
From: Brentley Jones <the.ajarn@gmail.com>
Date: Tue, 16 Jul 2013 18:32:35 +0000
Subject: [PATCH] FIX: Bootbox modals were not coming through properly. Temp
have them use the old way of displaying. Will look into how to have them be
the same as the "fixed" way.
---
.../templates/modal/modal.js.handlebars | 6 ++--
.../stylesheets/application/modal.css.scss | 28 +++++++++++++++++--
2 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/app/assets/javascripts/discourse/templates/modal/modal.js.handlebars b/app/assets/javascripts/discourse/templates/modal/modal.js.handlebars
index f9b3cc16c..3eace6908 100644
--- a/app/assets/javascripts/discourse/templates/modal/modal.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/modal.js.handlebars
@@ -1,6 +1,6 @@
-<div id='modal-outer-container'>
- <div id='modal-middle-container'>
- <div id='modal-inner-container'>
+<div class="modal-outer-container">
+ <div class="modal-middle-container">
+ <div class="modal-inner-container">
<div class="modal-header">
<a class="close" {{action closeModal}}><i class='icon-remove icon'></i></a>
diff --git a/app/assets/stylesheets/application/modal.css.scss b/app/assets/stylesheets/application/modal.css.scss
index b35c1a985..6ea2148e4 100644
--- a/app/assets/stylesheets/application/modal.css.scss
+++ b/app/assets/stylesheets/application/modal.css.scss
@@ -38,16 +38,16 @@
filter: alpha(opacity=80);
}
-#modal-outer-container {
+.modal-outer-container {
display:table;
width:100%;
height:100%;
}
-#modal-middle-container {
+.modal-middle-container {
display:table-cell;
vertical-align: middle;
}
-#modal-inner-container {
+.modal-inner-container {
max-width: 610px;
margin: 0 auto;
background-color: #ffffff;
@@ -68,6 +68,28 @@
z-index: 1050;
overflow: auto;
}
+
+// 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: 1050;
+ overflow: auto;
+ width: 610px;
+ height: auto;
+ margin: -250px 0 0 -305px;
+ background-color: #ffffff;
+ border: 1px solid #999;
+ border: 1px solid rgba(0, 0, 0, 0.3);
+ *border: 1px solid #999;
+ /* IE6-7 */
+
+ @include border-radius-all (6px);
+ box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+ background-clip: padding-box;
+}
+
.modal.fade {
-webkit-transition: opacity .3s linear, top .3s ease-out;
transition: opacity .3s linear, top .3s ease-out;