Merge pull request #8514 from kumarrishav/moveNavLeft

move the nav controls to left in full screen mode - in macOS Fix #7872
brave · May 3, 2017 · 42c9d1d · 42c9d1d
2 parents c4ba8be + 7a06897
commit 42c9d1d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/app/renderer/components/navigation/navigator.js b/app/renderer/components/navigation/navigator.js
@@ -27,7 +27,7 @@ const extensionState = require('../../../common/state/extensionState')
 const siteSettingsState = require('../../../common/state/siteSettingsState')
 
 // Util
-const {getCurrentWindowId, isMaximized} = require('../../currentWindow')
+const {getCurrentWindowId, isMaximized, isFullScreen} = require('../../currentWindow')
 const {makeImmutable} = require('../../../common/state/immutableUtil')
 const platformUtil = require('../../../common/lib/platformUtil')
 const {braveShieldsEnabled} = require('../../../common/state/shieldState')
@@ -225,7 +225,10 @@ class Navigator extends ImmutableComponent {
           onDragOver={this.onDragOver}
           onDrop={this.onDrop}
         >
-          <div className='backforward'>
+          <div className={cx({
+            backforward: true,
+            fullscreen: isFullScreen()
+          })}>
             <div className={cx({
               navigationButtonContainer: true,
               nav: true,

diff --git a/less/navigationBar.less b/less/navigationBar.less
@@ -19,6 +19,10 @@
 .platform--darwin .navigatorWrapper .backforward {
   margin-left: @navbarLeftMarginDarwin;
 
+  &.fullscreen {
+    margin-left: 0;
+  }
+
   // Since we want to keep the navigator centered, we need to calculate the
   // difference between the width of the left box and the width of the right box.
   @centerOffset: @navbarLeftMarginDarwin + 2 * (@navbarButtonWidth + @navbarButtonSpacing) // width area on the left