summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-04-17 13:53:39 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-04-17 13:53:39 +0000
commit9927cc9bf0347555d34cd0c208955d1f6a173205 (patch)
tree9a36385b4401d1ff12e705bc5c2c9869bb2425ef
parent4eecb14b0abf6bdbf566dcd0fb6f1e3a43f3b0e4 (diff)
parent9ccab7effb629afb26133ecb069833c2d163705c (diff)
downloadgitlab-ce-9927cc9bf0347555d34cd0c208955d1f6a173205.tar.gz
Merge branch '30986-diff-text-overflowing' into 'master'
Added break-word wrap Closes #30986 See merge request !10733
-rw-r--r--app/assets/stylesheets/pages/diff.scss4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 1aa1079903c..1b4694377b3 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -106,6 +106,10 @@
span {
white-space: pre-wrap;
}
+
+ .line {
+ word-wrap: break-word;
+ }
}
}