fixed #147

sorich87 · Oct 2, 2013 · da96321 · da96321
1 parent 446628c
commit da96321
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 36 deletions.
diff --git a/build/css/bootstrap-tour.css b/build/css/bootstrap-tour.css
@@ -4,20 +4,23 @@
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: 1009;
+  z-index: 1030;
   background-color: #000;
   opacity: 0.8;
 }
 .tour-step-backdrop {
   position: relative;
-  z-index: 1011;
+  z-index: 1031;
 }
 .tour-step-background {
   position: absolute;
-  z-index: 1010;
+  z-index: 1030;
   background: #fff;
   border-radius: 6px;
 }
+.popover[class*="tour-"] {
+  z-index: 1030;
+}
 .popover[class*="tour-"] .popover-navigation {
   padding: 9px 14px;
 }

diff --git a/build/css/bootstrap-tour.min.css b/build/css/bootstrap-tour.min.css
diff --git a/build/js/bootstrap-tour.min.js b/build/js/bootstrap-tour.min.js
diff --git a/docs/assets/css/bootstrap-tour.css b/docs/assets/css/bootstrap-tour.css
@@ -4,20 +4,23 @@
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: 1009;
+  z-index: 1030;
   background-color: #000;
   opacity: 0.8;
 }
 .tour-step-backdrop {
   position: relative;
-  z-index: 1011;
+  z-index: 1031;
 }
 .tour-step-background {
   position: absolute;
-  z-index: 1010;
+  z-index: 1030;
   background: #fff;
   border-radius: 6px;
 }
+.popover[class*="tour-"] {
+  z-index: 1030;
+}
 .popover[class*="tour-"] .popover-navigation {
   padding: 9px 14px;
 }

diff --git a/docs/assets/css/bootstrap-tour.min.css b/docs/assets/css/bootstrap-tour.min.css
diff --git a/docs/assets/js/bootstrap-tour.min.js b/docs/assets/js/bootstrap-tour.min.js
diff --git a/docs/assets/js/index.js b/docs/assets/js/index.js
@@ -9,7 +9,6 @@
       onEnd: function() {
         return $start.removeClass("disabled", true);
       },
-      backdrop: true,
       debug: true
     });
     tour.addSteps([

diff --git a/docs/index.coffee b/docs/index.coffee
@@ -4,7 +4,6 @@ $ ->
   tour = new Tour(
     onStart: -> $start.addClass "disabled", true
     onEnd: -> $start.removeClass "disabled", true
-    backdrop: true
     debug: true
   )
 

diff --git a/src/less/bootstrap-tour.less b/src/less/bootstrap-tour.less
@@ -4,52 +4,50 @@
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: 1009;
+  z-index: 1030;
   background-color: #000;
   opacity: 0.8;
 }
 
 .tour-step-backdrop {
   position: relative;
-  z-index: 1011;
+  z-index: 1031;
 }
 
 .tour-step-background {
   position: absolute;
-  z-index: 1010;
+  z-index: 1030;
   background: #fff;
   border-radius: 6px;
 }
 
-.popover {
+.popover[class*="tour-"] {
+  z-index: 1030;
 
-  &[class*="tour-"] {
+  .popover-navigation {
+    padding: 9px 14px;
 
-    .popover-navigation {
-      padding: 9px 14px;
-
-      *[data-role=end]{
-        float:right;
-      }
+    *[data-role=end]{
+      float: right;
+    }
 
-      *[data-role=prev],
-      *[data-role=next],
-      *[data-role=end]{
-        cursor: pointer;
+    *[data-role=prev],
+    *[data-role=next],
+    *[data-role=end]{
+      cursor: pointer;
 
-        &.disabled {
-          cursor: default;
-        }
+      &.disabled {
+        cursor: default;
       }
     }
+  }
 
-    &.orphan {
-      position: fixed;
-      margin-top: 0;
+  &.orphan {
+    position: fixed;
+    margin-top: 0;
 
-      .arrow {
-        display: none;
-      }
+    .arrow {
+      display: none;
     }
   }
 }