diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-04-25 18:42:14 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-04-25 18:42:14 +0000 |
| commit | 99c4513eaaa593c8be06eb3236485c8aec309eb0 (patch) | |
| tree | 455ed3be90f6e509aca2ca20386bb4d8cbe8d461 | |
| parent | f89fea54e4c24bf1273fe1e2b7296fdd611eecd2 (diff) | |
| parent | 328db9de27905d762ad2c66f0a7477a0c7c782ad (diff) | |
| download | gitlab-ce-99c4513eaaa593c8be06eb3236485c8aec309eb0.tar.gz | |
Merge branch 'word-break' into 'master'
Don't break line in middle of word
<img src="/uploads/cceb1a4212ff7785ace03cd6468edf85/Screen_Shot_2016-04-21_at_3.32.00_PM.png" width="500px">
See merge request !3864
| -rw-r--r-- | app/assets/stylesheets/framework/markdown_area.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/detail_page.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 4 |
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 { |