Merge pull request #298 from atom/sm-indent-diffs

Adjust diff indentation

Author: simurai

lib/views/hunk-view.js

@@ -99,7 +99,7 @@ class LineView {
         <div className='git-HunkView-lineNumber is-old'>{oldLineNumber}</div>
         <div className='git-HunkView-lineNumber is-new'>{newLineNumber}</div>
         <div className='git-HunkView-lineContent'>
-          <span>{line.getOrigin()}</span>
+          <span className='git-HunkView-plusMinus'>{line.getOrigin()}</span>
           <span>{line.getText()}</span>
         </div>
       </div>

styles/hunk-view.less

@@ -53,11 +53,14 @@
     -webkit-font-smoothing: antialiased;
   }
 
+  &-plusMinus {
+    margin-right: 1ch;
+  }
+
   &-lineContent {
     flex: 1;
-    padding: 0 .5em;
-    padding: 0 .5em 0 3em; // indent 2 levels
-    text-indent: -2.5em; // but only when soft-wrapped
+    padding: 0 .5em 0 3ch; // indent 3 characters
+    text-indent: -2ch; // remove indentation for the +/-
     white-space: pre-wrap;
     word-wrap: break-word;
   }