Bug 1074608 - Fix permission prompts with SHB button

mozilla-b2g · Oct 9, 2014 · 0dd28fb · 0dd28fb
1 parent 0699081
commit 0dd28fb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 22 deletions.
diff --git a/apps/system/style/permission_manager/permission_manager.css b/apps/system/style/permission_manager/permission_manager.css
@@ -27,11 +27,6 @@
   height: 100%;
 }
 
-#screen.attention #permission-screen {
-  top: 4rem;
-  height: calc(100% - 4rem);
-}
-
 #permission-screen.visible {
   pointer-events: auto;
   display: inline-block;
@@ -42,33 +37,20 @@
   overflow-y: scroll;
 }
 
+#screen:not(.fullscreen-app):not(.fullscreen-layout-app) #permission-dialog > div.inner {
+  margin-top: var(--statusbar-height);
+}
+
 @media not all and (-moz-physical-home-button) {
   #screen:not(.software-button-disabled) #permission-screen {
     height: calc(100% - var(--software-home-button-height));
   }
 
-  #screen.attention:not(.software-button-disabled) #permission-screen {
-    height: calc(100% - 4rem - var(--software-home-button-height));
-  }
-
   #screen.fullscreen-app:not(.software-button-disabled) #permission-screen {
     height: calc(100% - var(--software-home-button-height));
   }
 }
 
-#screen.software-button-enabled #permission-screen {
-  height: calc(100% - var(--software-home-button-height));
-}
-
-#screen.software-button-enabled.attention #permission-screen {
-  height: calc(100% - 4rem - var(--software-home-button-height));
-}
-
-
-#screen.software-button-enabled.fullscreen-app #permission-screen {
-  height: calc(100% - var(--software-home-button-height));
-}
-
 #permission-title {
   padding: 1.2rem;
   font-size: 1.8rem;

diff --git a/apps/system/style/themes/default/core.css b/apps/system/style/themes/default/core.css
@@ -23,6 +23,13 @@
   bottom: var(--software-home-button-height);
 }
 
+@media (orientation: landscape) {
+  #screen.software-button-enabled [role="dialog"].generic-dialog {
+    bottom: 0;
+    right: var(--software-home-button-height);
+  }
+}
+
 [role="dialog"].generic-dialog:before {
   content: "";
   display: inline-block;