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

Merge branch 'word-break' into 'master'
99c4513e · Jacob Schatz · f89fea54 · 328db9de · 99c4513e · 99c4513e
Commit 99c4513e authored Apr 25, 2016 by Jacob Schatz
Showing with 6 additions and 1 deletion

markdown_area.scss app/assets/stylesheets/framework/markdown_area.scss +1 -1

detail_page.scss app/assets/stylesheets/pages/detail_page.scss +1 -0

notes.scss app/assets/stylesheets/pages/notes.scss +4 -0

No files found.
--- 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;
    }
  }
 }
--- 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;
    }
  }
 }
--- 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 {