Merge branch '14866-url-overflow' into 'master'

Wrap code blocks to next line Closes #14866 ![Screen_Shot_2016-04-06_at_9.27.06_AM](/uploads/8bed5c17b17c9d15fe34dc7161d31e09/Screen_Shot_2016-04-06_at_9.27.06_AM.png) See merge request !3573

Merge branch '14866-url-overflow' into 'master'
d2f78130 · Jacob Schatz · 3a40e523 · 86d346b6 · d2f78130 · d2f78130
Commit d2f78130 authored Apr 06, 2016 by Jacob Schatz
5 changed files
--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -20,6 +20,7 @@
    margin: 0;
    text-align: left;
    padding: 10px $gl-padding;
+    word-wrap: break-word;
    .file-actions {
      float: right;

--- a/app/assets/stylesheets/framework/markdown_area.scss
+++ b/app/assets/stylesheets/framework/markdown_area.scss
@@ -84,6 +84,7 @@
 .md-preview-holder {
  min-height: 167px;
  padding: 10px 0;
+  overflow-x: auto;
 }
 .markdown-area {

--- a/app/assets/stylesheets/pages/detail_page.scss
+++ b/app/assets/stylesheets/pages/detail_page.scss
@@ -33,8 +33,12 @@
  .description {
    margin-top: 6px;
-    p:last-child {
+    p {
-      margin-bottom: 0;
+      overflow-x: auto;
+      &:last-child {
+        margin-bottom: 0;
+      }
    }
  }
 }
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -59,10 +59,15 @@
      border-collapse: separate;
      margin: 0;
      padding: 0;
      .line_holder td {
        line-height: $code_line_height;
        font-size: $code_font_size;
      }
+      td {
+        white-space: nowrap;
+      }
    }
    tr.line_holder.parallel {

--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -82,7 +82,7 @@ ul.notes {
        // On diffs code should wrap nicely and not overflow
        pre {
          code {
-            white-space: pre-wrap;
+            white-space: pre;
          }
        }