summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-03-17 13:54:18 +0000
committerJacob Schatz <jschatz1@gmail.com>2016-03-17 13:54:18 +0000
commit4874c549c618db98888cfa5adc84543d872f655f (patch)
treeff2ee307f831630b8461b737b30c8f2fad47c818
parent5e7622d2dc8e91968ba9e1d0faadbcd1451793e5 (diff)
parent4b5e06a944c46043b735952bd02754993de84744 (diff)
downloadgitlab-ce-4874c549c618db98888cfa5adc84543d872f655f.tar.gz
Merge branch 'fix_horizontal_overflow_in_code_tag' into 'master'
Fix horizontal overflow that occurs in the code tag closes #14167 ### Before Fix ![Screen_Shot_2016-03-16_at_9.10.52_PM](/uploads/b4a282ffc33684983d7e2482b8e13a8f/Screen_Shot_2016-03-16_at_9.10.52_PM.png) ### After Fix ![Screen_Shot_2016-03-16_at_9.11.16_PM](/uploads/8acca3b46bfdbd929cc096ad070022e2/Screen_Shot_2016-03-16_at_9.11.16_PM.png) See merge request !3255
-rw-r--r--app/assets/stylesheets/pages/notes.scss7
1 files changed, 7 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index c40dc79537e..d408853cc80 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -108,6 +108,13 @@ ul.notes {
word-wrap: break-word;
@include md-typography;
+ // On diffs code should wrap nicely and not overflow
+ pre {
+ code {
+ white-space: pre-wrap;
+ }
+ }
+
// Reset ul style types since we're nested inside a ul already
& > ul {
list-style-type: disc;