summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-04-17 13:53:39 +0000
committerLin Jen-Shin <godfat@godfat.org>2017-04-18 15:38:40 +0800
commitedcb910de776d5c6b170fcc792c18e8615980476 (patch)
treea172a9fa9247a4f077909f53636a4e5b79571b16
parent74d6c20359b4d4d8f418504b0d742b1315e25af1 (diff)
downloadgitlab-ce-edcb910de776d5c6b170fcc792c18e8615980476.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;
+ }
}
}