From 25f592cf9c2d126625404df140dc5d958e8822cc Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 20 Apr 2016 11:48:24 -0500
Subject: Wrap all code in diffs

---
 app/assets/stylesheets/framework/markdown_area.scss |  9 +++++++++
 app/assets/stylesheets/pages/detail_page.scss       |  6 ++++++
 app/assets/stylesheets/pages/diff.scss              |  4 ++--
 app/assets/stylesheets/pages/note_form.scss         | 12 ------------
 app/assets/stylesheets/pages/notes.scss             | 19 +++----------------
 5 files changed, 20 insertions(+), 30 deletions(-)

(limited to 'app/assets')

diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss
index 0f32d36d59c..704fa1ff800 100644
--- a/app/assets/stylesheets/framework/markdown_area.scss
+++ b/app/assets/stylesheets/framework/markdown_area.scss
@@ -90,3 +90,12 @@
   box-shadow: none;
   width: 100%;
 }
+
+.md {
+  &.md-preview-holder {
+    code {
+      white-space: pre-wrap;
+      word-break: break-all;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/pages/detail_page.scss b/app/assets/stylesheets/pages/detail_page.scss
index 2c2ac903f29..751a5ab4d92 100644
--- a/app/assets/stylesheets/pages/detail_page.scss
+++ b/app/assets/stylesheets/pages/detail_page.scss
@@ -36,4 +36,10 @@
       }
     }
   }
+
+  .wiki {
+    code {
+      white-space: pre-wrap;
+    }
+  }
 }
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 183f22a1b24..b84e2aac836 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -86,7 +86,7 @@
         }
 
         span {
-          white-space: pre;
+          white-space: pre-wrap;
         }
       }
     }
@@ -335,7 +335,7 @@
 }
 
 .diff-file .line_content {
-  white-space: pre;
+  white-space: pre-wrap;
 }
 
 .diff-wrap-lines .line_content {
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 2f6d172568b..7fa13e66b43 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -84,18 +84,6 @@
         border-color: $gl-success;
       }
     }
-
-    p {
-      code {
-        white-space: normal;
-      }
-
-      pre {
-        code {
-          white-space: pre;
-        }
-      }
-    }
   }
 }
 
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index ffcd89a3c9f..74437aa207c 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -81,16 +81,8 @@ ul.notes {
         @include md-typography;
 
         // On diffs code should wrap nicely and not overflow
-        p {
-          code {
-            white-space: normal;
-          }
-
-          pre {
-            code {
-              white-space: pre;
-            }
-          }
+        code {
+          white-space: pre-wrap;
         }
 
         // Reset ul style types since we're nested inside a ul already
@@ -137,7 +129,7 @@ ul.notes {
     margin-right: 10px;
   }
   .line_content {
-    white-space: pre;
+    white-space: pre-wrap;
   }
 }
 
@@ -171,11 +163,6 @@ ul.notes {
 
       &.parallel {
         border-width: 1px;
-
-        .code,
-        code {
-          white-space: pre-wrap;
-        }
       }
 
       .notes {
-- 
cgit v1.2.3