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 1/4] 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 f9b3cc16c6e..3eace6908bd 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 b35c1a9851c..6ea2148e4bb 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;

From e060e952b544272e4811f90749735af2f7ab9bfa Mon Sep 17 00:00:00 2001
From: Brentley Jones <the.ajarn@gmail.com>
Date: Tue, 16 Jul 2013 19:06:33 +0000
Subject: [PATCH 2/4] Accidently removed some styles in the merge

---
 .../stylesheets/application/modal.css.scss    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/app/assets/stylesheets/application/modal.css.scss b/app/assets/stylesheets/application/modal.css.scss
index 6ea2148e4bb..1efd206aa3b 100644
--- a/app/assets/stylesheets/application/modal.css.scss
+++ b/app/assets/stylesheets/application/modal.css.scss
@@ -296,3 +296,22 @@ position: fixed;
     }
   }
 }
+
+.permission-selector{
+  width: 300px;
+}
+.permission-list{
+  list-style:none;
+  margin: 0 0 15px;
+  padding: 0;
+  .name {
+    display: inline-block;
+    min-width: 80px;
+  }
+  .icon-remove-sign {
+    margin-left: 5px;
+  }
+  li {
+    margin-bottom: 10px;
+  }
+}

From a03e933eb6e6be9c26cc6ea2eb248477f80bbdff Mon Sep 17 00:00:00 2001
From: Brentley Jones <the.ajarn@gmail.com>
Date: Tue, 16 Jul 2013 19:16:22 +0000
Subject: [PATCH 3/4] Fix spacing

---
 app/assets/stylesheets/application/modal.css.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/application/modal.css.scss b/app/assets/stylesheets/application/modal.css.scss
index 1efd206aa3b..11a51e7288f 100644
--- a/app/assets/stylesheets/application/modal.css.scss
+++ b/app/assets/stylesheets/application/modal.css.scss
@@ -71,7 +71,7 @@
 
 // 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;
+  position: fixed;
   top: 50%;
   left: 50%;
   z-index: 1050;

From f26b479458f286aa581108396943f32c0dfd69ad Mon Sep 17 00:00:00 2001
From: Brentley Jones <the.ajarn@gmail.com>
Date: Tue, 16 Jul 2013 21:05:33 +0000
Subject: [PATCH 4/4] FIX: History modal having custom (old) setting of min
 height and width.

It is functional, but it no longer resizes down. I would look at making this fluid or having a style for mobile.
---
 app/assets/stylesheets/application/history.css.scss | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/application/history.css.scss b/app/assets/stylesheets/application/history.css.scss
index 38301a66aab..ca4bc56b5c4 100644
--- a/app/assets/stylesheets/application/history.css.scss
+++ b/app/assets/stylesheets/application/history.css.scss
@@ -5,9 +5,11 @@
 @import "foundation/mixins";
 
 .modal.history-modal {
-  width: 960px;
-  margin-left: -460px;
-  min-height: 500px;
+  .modal-inner-container {
+    min-width: 960px;
+    min-height: 500px;
+  }
+
   ins {
     background: #e6ffe6;
   }