diff options
author | Jacob Schatz <jschatz1@gmail.com> | 2016-04-07 22:00:54 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz1@gmail.com> | 2016-04-07 22:00:54 +0000 |
commit | 6dbc5f9f33d499be253f12d998de3b7c635bd3a5 (patch) | |
tree | 1403d5e1ea0da63e3c2683efc09b196a47396b97 /app/assets | |
parent | 8f0846d74914553aa8801b7575a934473d3b7e19 (diff) | |
parent | 422a9247587703ae149c1c716decc0fbb356afe2 (diff) | |
download | gitlab-ce-6dbc5f9f33d499be253f12d998de3b7c635bd3a5.tar.gz |
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
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/pages/commit.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss index 082911bd118..358d2f4ab9d 100644 --- 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 { diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 939555bb260..97f4485beb8 100644 --- 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; |