Fix some styling issues

Author: fcollonval

src/components/FileItem.tsx

@@ -272,26 +272,26 @@ export class FileItem extends React.Component<IFileItemProps, {}> {
           title={this.props.file.to}
         >
           {extractFilename(this.props.file.to)}
-          <span className={this.getFileChangedLabelClass(this.props.file.y)}>
-            {this.getFileChangedLabel(this.props.file.y)}
-          </span>
-          {this.props.stage === 'Changed' && (
-            <React.Fragment>
-              <button
-                className={`jp-Git-button ${this.getDiscardFileIconClass()}`}
-                title={'Discard this change'}
-                onClick={() => {
-                  this.discardSelectedFileChanges();
-                }}
-              />
-              {isDiffSupported(this.props.file.to) &&
-                this.diffButton({ specialRef: 'WORKING' })}
-            </React.Fragment>
-          )}
-          {this.props.stage === 'Staged' &&
-            isDiffSupported(this.props.file.to) &&
-            this.diffButton({ specialRef: 'INDEX' })}
         </span>
+        <span className={this.getFileChangedLabelClass(this.props.file.y)}>
+          {this.getFileChangedLabel(this.props.file.y)}
+        </span>
+        {this.props.stage === 'Changed' && (
+          <React.Fragment>
+            <button
+              className={`jp-Git-button ${this.getDiscardFileIconClass()}`}
+              title={'Discard this change'}
+              onClick={() => {
+                this.discardSelectedFileChanges();
+              }}
+            />
+            {isDiffSupported(this.props.file.to) &&
+              this.diffButton({ specialRef: 'WORKING' })}
+          </React.Fragment>
+        )}
+        {this.props.stage === 'Staged' &&
+          isDiffSupported(this.props.file.to) &&
+          this.diffButton({ specialRef: 'INDEX' })}
       </li>
     );
   }

src/style/BranchHeaderStyle.ts

@@ -3,7 +3,8 @@ import { style } from 'typestyle';
 export const branchStyle = style({
   zIndex: 1,
   textAlign: 'center',
-  overflowY: 'auto'
+  overflowY: 'auto',
+  minHeight: 29
 });
 
 export const selectedHeaderStyle = style({

src/style/FileItemStyle.ts

@@ -3,7 +3,6 @@ import { style } from 'typestyle';
 export const fileStyle = style({
   display: 'flex',
   flexDirection: 'row',
-  flexWrap: 'wrap',
   color: 'var(--jp-ui-font-color1)',
   lineHeight: 'var(--jp-private-running-item-height)',
   paddingLeft: '4px',

src/style/HistorySideBarStyle.ts

@@ -3,5 +3,6 @@ import { style } from 'typestyle';
 export const historySideBarStyle = style({
   display: 'flex',
   flexDirection: 'column',
-  paddingLeft: 0
+  paddingLeft: 0,
+  overflowY: 'scroll'
 });