summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-04-20 21:12:38 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-04-20 21:12:38 +0000
commit07c5df51eb5b02bbe58f40812c3dc377e362ec44 (patch)
tree63857457d0a61f0d756599aa91536ea78958b8fe /app/assets/stylesheets/framework
parentef8377b7d21d4fb54e4f0af9934d0716c7fe47dd (diff)
parent25f592cf9c2d126625404df140dc5d958e8822cc (diff)
downloadgitlab-ce-07c5df51eb5b02bbe58f40812c3dc377e362ec44.tar.gz
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/framework')
-rw-r--r--app/assets/stylesheets/framework/markdown_area.scss9
1 files changed, 9 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss
index 0f32d36d59c..704fa1ff800 100644
--- a/app/assets/stylesheets/framework/markdown_area.scss
+++ b/app/assets/stylesheets/framework/markdown_area.scss
@@ -90,3 +90,12 @@
box-shadow: none;
width: 100%;
}
+
+.md {
+ &.md-preview-holder {
+ code {
+ white-space: pre-wrap;
+ word-break: break-all;
+ }
+ }
+}