Merge pull request #31153 from albertopq/1185765-landscape-rocketbar

Bug 1185765 - Rocketbar in landscape mode doent fit the screen r=gmarty
mozilla-b2g · Jul 30, 2015 · d3d61c5 · d3d61c5
2 parents 89bfde1 + c6c1878
commit d3d61c5
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 12 deletions.
diff --git a/apps/system/js/statusbar.js b/apps/system/js/statusbar.js
@@ -554,7 +554,6 @@
       this._icons = new Map();
 
       this.element = document.getElementById('statusbar');
-      this.background = document.getElementById('statusbar-background');
       this.statusbarIcons = document.getElementById('statusbar-icons');
       this.statusbarIconsMax = document.getElementById('statusbar-maximized');
       this.screen = document.getElementById('screen');

diff --git a/apps/system/style/rocketbar/rocketbar.css b/apps/system/style/rocketbar/rocketbar.css
@@ -149,10 +149,6 @@
 }
 
 @media (orientation:landscape) {
-  #screen.software-button-enabled #rocketbar {
-    width: calc(100% - var(--software-home-button-height));
-  }
-
   #screen.software-button-enabled #rocketbar-results {
     height: calc(100% - 7rem);
     width: calc(100% - var(--software-home-button-height));

diff --git a/apps/system/style/statusbar/statusbar.css b/apps/system/style/statusbar/statusbar.css
@@ -87,7 +87,6 @@ to be available for moz-elements */
 }
 
 @media (orientation: landscape) {
-  #screen.software-button-enabled #statusbar-background,
   #screen.software-button-enabled #statusbar {
     width: calc(100% - var(--software-home-button-height));
   }

diff --git a/apps/system/test/unit/statusbar_test.js b/apps/system/test/unit/statusbar_test.js
@@ -29,8 +29,8 @@ var mocksForStatusbar = new MocksHelper([
 ]).init();
 
 suite('system/Statusbar', function() {
-  var fakeStatusbarNode, fakeTopPanel, fakeStatusbarBackground,
-      fakeStatusbarIcons, fakeStatusbarIconsMaxWrapper, fakeStatusbarIconsMax,
+  var fakeStatusbarNode, fakeTopPanel, fakeStatusbarIconsMax,
+      fakeStatusbarIcons, fakeStatusbarIconsMaxWrapper,
       fakeStatusbarIconsMinWrapper, fakeStatusbarIconsMin;
   var realMozL10n, realService;
 
@@ -66,10 +66,6 @@ suite('system/Statusbar', function() {
     fakeTopPanel.id = 'top-panel';
     document.body.appendChild(fakeTopPanel);
 
-    fakeStatusbarBackground = document.createElement('div');
-    fakeStatusbarBackground.id = 'statusbar-background';
-    document.body.appendChild(fakeStatusbarBackground);
-
     fakeStatusbarIcons = document.createElement('div');
     fakeStatusbarIcons.id = 'statusbar-icons';
     document.body.appendChild(fakeStatusbarIcons);