summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone <annabel.dunstone@gmail.com>2016-04-21 15:27:39 -0500
committerAnnabel Dunstone <annabel.dunstone@gmail.com>2016-04-21 15:32:38 -0500
commit328db9de27905d762ad2c66f0a7477a0c7c782ad (patch)
tree119a601c3d41cf19c9f18b3c000bcc670d8b8c33
parentc22c4048ce1a4233c0a6f9a9cd59a53efe49da53 (diff)
downloadgitlab-ce-word-break.tar.gz
Don't break line in middle of wordword-break
-rw-r--r--app/assets/stylesheets/framework/markdown_area.scss2
-rw-r--r--app/assets/stylesheets/pages/detail_page.scss1
-rw-r--r--app/assets/stylesheets/pages/notes.scss4
3 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss
index 704fa1ff800..fd885b38680 100644
--- a/app/assets/stylesheets/framework/markdown_area.scss
+++ b/app/assets/stylesheets/framework/markdown_area.scss
@@ -95,7 +95,7 @@
&.md-preview-holder {
code {
white-space: pre-wrap;
- word-break: break-all;
+ word-break: keep-all;
}
}
}
diff --git a/app/assets/stylesheets/pages/detail_page.scss b/app/assets/stylesheets/pages/detail_page.scss
index 751a5ab4d92..3438dbe4958 100644
--- a/app/assets/stylesheets/pages/detail_page.scss
+++ b/app/assets/stylesheets/pages/detail_page.scss
@@ -40,6 +40,7 @@
.wiki {
code {
white-space: pre-wrap;
+ word-break: keep-all;
}
}
}
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index d54abe9bc02..55b1ad97eb0 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -109,6 +109,10 @@ ul.notes {
border-color: darken(#f5f5f5, 8%);
margin: 10px 0;
}
+
+ code {
+ word-break: keep-all;
+ }
}
a {