diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-04-21 00:12:38 +0300 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-04-21 00:12:38 +0300 |
commit | 07c5df51eb5b02bbe58f40812c3dc377e362ec44 (patch) | |
tree | 63857457d0a61f0d756599aa91536ea78958b8fe /app/assets/stylesheets/pages/notes.scss | |
parent | ef8377b7d21d4fb54e4f0af9934d0716c7fe47dd (diff) | |
parent | 25f592cf9c2d126625404df140dc5d958e8822cc (diff) |
Merge branch 'revert-diff-scroll' into 'master'
Wrap all code in diffs
Closes #15382
Closes #15422
All diff code wraps to next line instead of scrolling
<img src="/uploads/ec5754919bac0b027fcb122bb88435b3/Screen_Shot_2016-04-20_at_12.22.27_PM.png" width="500px">
See merge request !3838
Diffstat (limited to 'app/assets/stylesheets/pages/notes.scss')
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index aacb12532c3..82f78e8d796 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -81,16 +81,8 @@ ul.notes { @include md-typography; // On diffs code should wrap nicely and not overflow - p { - code { - white-space: normal; - } - - pre { - code { - white-space: pre; - } - } + code { + white-space: pre-wrap; } // Reset ul style types since we're nested inside a ul already @@ -137,7 +129,7 @@ ul.notes { margin-right: 10px; } .line_content { - white-space: pre; + white-space: pre-wrap; } } @@ -171,11 +163,6 @@ ul.notes { &.parallel { border-width: 1px; - - .code, - code { - white-space: pre-wrap; - } } .notes { |