Merge pull request #211 from atom/sm-fix-list-scrolling

Fix list scrolling

Author: simurai

lib/views/staging-view.js

@@ -189,7 +189,7 @@ export default class StagingView {
           <span className={'git-FilePatchListView-icon icon icon-alert status-modified'} />
         </header>
         <ListView
-          className='git-FilePatchListView'
+          className='git-StagingView-list git-FilePatchListView'
           ref='mergeConflictListView'
           didConfirmItem={this.stageFilePatch}
           items={this.multiListCollection.getItemsForKey(ListTypes.CONFLICTS)}
@@ -206,7 +206,7 @@ export default class StagingView {
             onmousedown={() => this.selectList(ListTypes.UNSTAGED)} >
           <header className='git-StagingView-header'>Unstaged Changes</header>
           <ListView
-            className='git-FilePatchListView'
+            className='git-StagingView-list git-FilePatchListView'
             ref='unstagedChangesView'
             didConfirmItem={this.stageFilePatch}
             items={this.multiListCollection.getItemsForKey(ListTypes.UNSTAGED)}
@@ -219,7 +219,7 @@ export default class StagingView {
             onmousedown={() => this.selectList(ListTypes.STAGED)} >
           <header className='git-StagingView-header'>Staged Changes</header>
           <ListView
-            className='git-FilePatchListView'
+            className='git-StagingView-list git-FilePatchListView'
             ref='stagedChangesView'
             didConfirmItem={this.unstageFilePatch}
             items={this.multiListCollection.getItemsForKey(ListTypes.STAGED)}

styles/staging-view.less

@@ -2,12 +2,13 @@
 
 .git-StagingView {
   flex: 1;
-  overflow-y: auto;
   display: flex;
   flex-direction: column;
 
   &-group {
     flex: 1;
+    display: flex;
+    flex-direction: column;
   }
 
   &-header {
@@ -22,4 +23,9 @@
     font-weight:bold;
     box-shadow:inset @separator-border-color 0 -1px 0, inset @separator-border-color 0 1px 0;
   }
+
+  &-list {
+    flex: 1 1 0;
+    overflow-x: auto;
+  }
 }