Merge pull request #658 from BoostIO/fix-scroll-bar-z-index

Fix not to show scroll bar when full screen mode in Windows
BoostIO · Jun 22, 2017 · 5288d67 · 5288d67
2 parents 0786d8e + 34491f4
commit 5288d67
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/browser/main/Main.js b/browser/main/Main.js
@@ -160,26 +160,29 @@ class Main extends React.Component {
   handleFullScreenButton (e) {
     this.setState({ fullScreen: !this.state.fullScreen }, () => {
       const noteDetail = document.querySelector('.NoteDetail')
+      const noteList = document.querySelector('.NoteList')
       const mainBody = document.querySelector('#main-body')
 
       if (this.state.fullScreen) {
-        this.hideLeftLists(noteDetail, mainBody)
+        this.hideLeftLists(noteDetail, noteList, mainBody)
       } else {
-        this.showLeftLists(noteDetail, mainBody)
+        this.showLeftLists(noteDetail, noteList, mainBody)
       }
     })
   }
 
-  hideLeftLists (noteDetail, mainBody) {
+  hideLeftLists (noteDetail, noteList, mainBody) {
     this.state.noteDetailWidth = noteDetail.style.left
     this.state.mainBodyWidth = mainBody.style.left
     noteDetail.style.left = '0px'
     mainBody.style.left = '0px'
+    noteList.style.display = 'none'
   }
 
-  showLeftLists (noteDetail, mainBody) {
+  showLeftLists (noteDetail, noteList, mainBody) {
     noteDetail.style.left = this.state.noteDetailWidth
     mainBody.style.left = this.state.mainBodyWidth
+    noteList.style.display = 'inline'
   }
 
   render () {

diff --git a/browser/main/Main.styl b/browser/main/Main.styl
@@ -7,7 +7,6 @@
 
 .body--expanded
   @extend .body
-  z-index 100
   left $sideNav--folded-width
 
 .slider