diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-04-18 18:26:14 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-04-18 18:26:14 +0000 |
| commit | ec74ae0616a13e227d94bb127df2f63832229a21 (patch) | |
| tree | 2028bd6123b301837098986f655f58db92163754 /app/assets | |
| parent | e4f1d1367b3cdb0c2d634be656935f695a2847c5 (diff) | |
| parent | 101f57d9170f5ea8e736f17c2fd8294bbc15e142 (diff) | |
| download | gitlab-ce-ec74ae0616a13e227d94bb127df2f63832229a21.tar.gz | |
Merge branch 'parallel-diff' into 'master'
Wrap code in parallel view
Code scrolling was breaking the parallel layout. It should wrap on 'Side-by-side' mode
<img src="/uploads/db657e6c7f08ce57f1be615d7193136a/Screen_Shot_2016-04-14_at_4.28.31_PM.png" width="700px">
See merge request !3731
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index a0fbf7d67c5..ffcd89a3c9f 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -171,6 +171,11 @@ ul.notes { &.parallel { border-width: 1px; + + .code, + code { + white-space: pre-wrap; + } } .notes { |