From fa0e43237c610e5027579eecec42473ccfc853d6 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 14 Mar 2014 22:07:59 -0500
Subject: [PATCH] popup z-index sass variables and csscomb'd popup.scss

---
 scss/_popup.scss     | 33 +++++++++++++++++----------------
 scss/_variables.scss |  2 ++
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/scss/_popup.scss b/scss/_popup.scss
index cf2f45fa51..a0f5169bb5 100644
--- a/scss/_popup.scss
+++ b/scss/_popup.scss
@@ -1,3 +1,4 @@
+
 /**
  * Popups
  * --------------------------------------------------
@@ -7,7 +8,7 @@
   position: fixed;
   top: 50%;
   left: 50%;
-  z-index: 11;
+  z-index: $z-index-popup;
 
   // Start hidden
   visibility: hidden;
@@ -38,19 +39,19 @@
 
 .popup-head {
   padding: 15px 0px;
-  text-align: center;
   border-bottom: 1px solid #eee;
+  text-align: center;
 }
 .popup-title {
-  font-size: 15px;
   margin: 0;
   padding: 0;
+  font-size: 15px;
 }
 .popup-sub-title {
-  font-size: 11px;
   margin: 5px 0 0 0;
   padding: 0;
   font-weight: normal;
+  font-size: 11px;
 }
 .popup-body {
   padding: 10px;
@@ -64,8 +65,8 @@
   .button {
     margin: 0px 5px;
     min-height: $popup-button-min-height;
-    line-height: $popup-button-line-height;
     border-radius: $popup-button-border-radius;
+    line-height: $popup-button-line-height;
 
     &:first-child {
       margin-left: 0px;
@@ -77,27 +78,27 @@
 }
 
 .popup-backdrop {
-  position: fixed;
-  top: 0;
-  left: 0;
-  z-index: 10;
-
-  width: 100%;
-  height: 100%;
-    
-  background-color: rgba(0,0,0,0.4);
-
   @include animation-name(fadeIn);
   @include animation-duration($popup-backdrop-fadein-duration);
   @include animation-timing-function(linear);
   @include animation-fill-mode(both);
+
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: $z-index-popup-backdrop;
+
+  width: 100%;
+  height: 100%;
+
+  background-color: rgba(0,0,0,0.4);
 }
 
 .loading-backdrop {
   position: fixed;
   top: 0;
   left: 0;
-  z-index: 10;
+  z-index: $z-index-popup-backdrop;
 
   visibility: hidden;
   width: 100%;
diff --git a/scss/_variables.scss b/scss/_variables.scss
index ead343ec3a..04a8a5d1dd 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -626,6 +626,8 @@ $z-index-item-toggle:             3 !default;
 $z-index-menu:                    0 !default;
 $z-index-modal:                   10 !default;
 $z-index-pane:                    1 !default;
+$z-index-popup:                   11 !default;
+$z-index-popup-backdrop:          10 !default;
 $z-index-scroll-bar:              9999 !default;
 $z-index-tabs:                    5 !default;
 $z-index-view:                    1 !default;