Bootstrap modal css updated to include only what is needed.

diff --git a/apps/workbench/app/assets/stylesheets/bootstrap-modal.css.scss b/apps/workbench/app/assets/stylesheets/bootstrap-modal.css.scss
index 887065e8e3a7762a152b1c417b0b762bfceee56d..a16eb32c8e5e2466ab91afa8db04396800ed5c06 100644 (file)
--- a/apps/workbench/app/assets/stylesheets/bootstrap-modal.css.scss
+++ b/apps/workbench/app/assets/stylesheets/bootstrap-modal.css.scss
@@ -1,116 +1,27 @@
-/*!
-* Bootstrap Modal
-*
-* Copyright Jordan Schroter
-* Licensed under the Apache License v2.0
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-*/
-
-body.modal-open,
-.modal-open .navbar-fixed-top,
-.modal-open .navbar-fixed-bottom {
-  margin-right: 0;
-}
+// Place all the styles related to the bootstrap modal here.
 
 .modal {
   left: 50%;
   bottom: auto;
   right: auto;
   padding: 0;
-  width: 500px;
+  width: 400px;
   margin-left: -250px;
   background-color: #ffffff;
-  border: 1px solid #999999;
-  border: 1px solid rgba(0, 0, 0, 0.2);
+  border: 2px solid #999999;
   border-radius: 6px;
-  -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
   box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
   background-clip: padding-box;
 }
 
-.modal.container {
-  max-width: none;
-}
-
-
-.modal-open {
-overflow: hidden;
-}
-
-
-/* add a scroll bar to stop page from jerking around */
-.modal-open.page-overflow .page-container,
-.modal-open.page-overflow .page-container .navbar-fixed-top,
-.modal-open.page-overflow .page-container .navbar-fixed-bottom,
-.modal-open.page-overflow .modal-scrollable {
-overflow-y: scroll;
-}
-
-#user-setup-modal-window{
-  overflow: hidden;
-}
-
-
-@media (max-width: 979px) {
-.modal-open.page-overflow .page-container .navbar-fixed-top,
-.modal-open.page-overflow .page-container .navbar-fixed-bottom {
-overflow-y: visible;
-}
-}
-
-
-.modal-scrollable {
-position: fixed;
-top: 0;
-bottom: 0;
-left: 0;
-right: 0;
-overflow: auto;
-}
-
-.modal.fade {
-top: -100%;
--webkit-transition: opacity 0.3s linear, top 0.3s ease-out, bottom 0.3s ease-out, margin-top 0.3s ease-out; 
--moz-transition: opacity 0.3s linear, top 0.3s ease-out, bottom 0.3s ease-out, margin-top 0.3s ease-out;
--o-transition: opacity 0.3s linear, top 0.3s ease-out, bottom 0.3s ease-out, margin-top 0.3s ease-out;
-transition: opacity 0.3s linear, top 0.3s ease-out, bottom 0.3s ease-out, margin-top 0.3s ease-out;
-}
-
 .modal.fade.in {
-top: 50%;
-}
-
-.modal-body {
-max-height: none;
-overflow: visible;
-}
-
-.modal.modal-absolute {
-position: absolute;
-z-index: 950;
-}
-
-.modal .loading-mask {
-position: absolute;
-top: 0;
-bottom: 0;
-left: 0;
-right: 0;
-background: #fff;
-border-radius: 6px;
-}
-
-.modal-backdrop.modal-absolute{
-position: absolute;
-z-index: 940;
+  top: 10%;
 }
 
 .modal-backdrop,
 .modal-backdrop.fade.in{
-opacity: 0.7;
-filter: alpha(opacity=70);
-background: #fff;
+  opacity: 0.7;
+  background: #fff;
 }
 
 /* Modal Overflow */
@@ -183,3 +94,7 @@ top: 50%;
 left: 50%;
 margin: -12px 0 0 -12px;
 }
+
+#user-setup-modal-window{
+  overflow: hidden;
+}

diff --git a/apps/workbench/app/views/users/_setup_popup.html.erb b/apps/workbench/app/views/users/_setup_popup.html.erb
index 412d211715c4214c9c080d99e2fe7e7181341366..a1c3f8adc3649681acbcf662e888ec1248fc95fb 100644 (file)
--- a/apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/apps/workbench/app/views/users/_setup_popup.html.erb
@@ -3,7 +3,7 @@
     <h3 class="modal-title">Setup User</h4>
   </div
 
-  <div class="modal-body" style="max-height:800px;">
+  <div class="modal-body">
     <% if @object%>
       <% uuid = @object.uuid %>
       <% email = @object.email %>