Merge pull request #10429 from alivedise/bugzilla/828965_v1-train/per…

…mission-screen-on-lockscreen Bug 828965 - Move permission screen z-index on lockscreen camera, r=timdream, a=leo+
mozilla-b2g · Jun 18, 2013 · 3e90908 · 3e90908
2 parents fa16d3f + 1fb5d7c
commit 3e90908
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/apps/system/style/zindex.css b/apps/system/style/zindex.css
@@ -101,23 +101,27 @@
   z-index: 2048;
 }
 
-#screen > [data-z-index-level="lockscreen-camera"] {
+/* Permission screen is here because of the lockscreen camera. */
+#screen > [data-z-index-level="permission-screen"] {
   z-index: 2047;
 }
 
-#screen > [data-z-index-level="simpin-dialog"] {
+#screen > [data-z-index-level="lockscreen-camera"] {
   z-index: 2046;
 }
 
+#screen > [data-z-index-level="simpin-dialog"] {
+  z-index: 2045;
+}
+
 /* Keep keyboard under lockscreen when locked */
 #screen.locked > [data-z-index-level="keyboard-frame"] {
-  z-index: 2045;
+  z-index: 2044;
 }
 
 /* Level 7: Dialog Module */
 #screen > [data-z-index-level="dialog-overlay"],
 #screen > [data-z-index-level="value-selector"],
-#screen > [data-z-index-level="permission-screen"],
 #screen > [data-z-index-level="app-install-dialog"],
 #screen > [data-z-index-level="updates-download-dialog"],
 #screen > [data-z-index-level="updates-viaDataConnection-dialog"],