Merge branch 'code-wrapping' into 'master'

Fix side-by-side code format & commit message wrap ![Screen_Shot_2016-04-07_at_1.31.28_PM](/uploads/bad00284e4dfbec1fdd75220c34f4a98/Screen_Shot_2016-04-07_at_1.31.28_PM.png) ![Screen_Shot_2016-04-07_at_1.32.23_PM](/uploads/7cd344765025e93d0035934a473b4bb3/Screen_Shot_2016-04-07_at_1.32.23_PM.png) See merge request !3605

Merge branch 'code-wrapping' into 'master'
6dbc5f9f · Jacob Schatz · 8f0846d7 · 422a9247 · 6dbc5f9f · 6dbc5f9f
Commit 6dbc5f9f authored Apr 07, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

commit.scss app/assets/stylesheets/pages/commit.scss +2 -0

diff.scss app/assets/stylesheets/pages/diff.scss +4 -0

No files found.
--- a/app/assets/stylesheets/pages/commit.scss
+++ b/app/assets/stylesheets/pages/commit.scss
@@ -20,6 +20,8 @@
  margin: 0;
  padding: 0;
  margin-top: 10px;
+  word-break: normal;
+  white-space: pre-wrap;
 }

 .commit-info-row {

--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -109,6 +109,10 @@
        display: table-cell;
      }
    }
+
+    .text-file.diff-wrap-lines table .line_holder td span {
+      white-space: pre-wrap;
+    }
  }
  .image {
    background: #ddd;