From 447f3613b78ac4ba4ad6bda1811447b48e126b0c Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Fri, 8 Apr 2016 15:48:18 -0700
Subject: [PATCH 1/3] Wrap text in notes box if longer than code in diff

---
 app/assets/stylesheets/pages/notes.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 7295fe5112..88ba5e53a0 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -155,6 +155,7 @@ ul.notes {
       border-width: 1px 0;
       padding: 0;
       vertical-align: top;
+      white-space: normal;
       &.parallel {
         border-width: 1px;
       }

From d3ff7ca0846a88961d3f954c62398c54aa69c059 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Mon, 11 Apr 2016 10:00:45 -0500
Subject: [PATCH 2/3] Input updates

---
 .../stylesheets/pages/merge_requests.scss     |  1 +
 app/assets/stylesheets/pages/note_form.scss   | 22 ++++++++++++-
 app/assets/stylesheets/pages/notes.scss       | 31 ++++++++++++++++---
 3 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index b79335eab9..4ef548ffbe 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -142,6 +142,7 @@
   overflow: hidden;
   font-size: 90%;
   margin: 0 3px;
+  word-break: break-all;
 }
 
 .mr-list {
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 4d4d508396..5e5722c2c3 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -16,6 +16,7 @@
   .new-note {
     margin: 0;
     border: none;
+    border-right: 1px solid $table-border-gray;
   }
 }
 
@@ -71,12 +72,25 @@
         border-color: $focus-border-color;
       }
     }
+
+    p {
+      code {
+        white-space: normal;
+      }
+
+      pre {
+        code {
+          white-space: pre;
+        }
+      }
+    }
   }
 }
 
 .discussion-form {
   padding: $gl-padding-top $gl-padding;
-  background-color: #fff;
+  background-color: $white-light;
+  border-right: 1px solid $table-border-gray;
 }
 
 .note-edit-form {
@@ -118,7 +132,13 @@
 
   .discussion-reply-holder {
     background-color: $white-light;
+    border-right: 1px solid $table-border-gray;
     padding: 10px 16px;
+    max-width: 800px;
+
+    .new-note {
+      border-right: none;
+    }
   }
 }
 
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 88ba5e53a0..07dd029245 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -81,9 +81,15 @@ ul.notes {
         @include md-typography;
 
         // On diffs code should wrap nicely and not overflow
-        pre {
+        p {
           code {
-            white-space: pre;
+            white-space: normal;
+          }
+
+          pre {
+            code {
+              white-space: pre;
+            }
           }
         }
 
@@ -112,6 +118,10 @@ ul.notes {
           margin: 10px 0;
         }
       }
+
+      a {
+        word-break: break-all;
+      }
     }
 
     .note-header {
@@ -127,7 +137,7 @@ ul.notes {
     margin-right: 10px;
   }
   .line_content {
-    white-space: pre-wrap;
+    white-space: pre;
   }
 }
 
@@ -145,20 +155,33 @@ ul.notes {
       background: $background-color;
       color: $text-color;
     }
+
     &.notes_line2 {
       text-align: center;
       padding: 10px 0;
       border-left: 1px solid #ddd !important;
     }
+
     &.notes_content {
-      background-color: #fff;
+      background-color: $background-color;
       border-width: 1px 0;
       padding: 0;
       vertical-align: top;
       white-space: normal;
+
       &.parallel {
         border-width: 1px;
       }
+
+      .new-note {
+        max-width: 800px;
+      }
+
+      .notes {
+        max-width: 800px;
+        background-color: $white-light;
+        border-right: 1px solid $table-border-gray;
+      }
     }
   }
 }

From 60736db429666f4145004408b722799ef144eb5f Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 12 Apr 2016 15:07:24 -0500
Subject: [PATCH 3/3] Remove max-width from comments

---
 app/assets/stylesheets/pages/note_form.scss | 8 --------
 app/assets/stylesheets/pages/notes.scss     | 6 ------
 2 files changed, 14 deletions(-)

diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 5e5722c2c3..f4da17fada 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -16,7 +16,6 @@
   .new-note {
     margin: 0;
     border: none;
-    border-right: 1px solid $table-border-gray;
   }
 }
 
@@ -90,7 +89,6 @@
 .discussion-form {
   padding: $gl-padding-top $gl-padding;
   background-color: $white-light;
-  border-right: 1px solid $table-border-gray;
 }
 
 .note-edit-form {
@@ -132,13 +130,7 @@
 
   .discussion-reply-holder {
     background-color: $white-light;
-    border-right: 1px solid $table-border-gray;
     padding: 10px 16px;
-    max-width: 800px;
-
-    .new-note {
-      border-right: none;
-    }
   }
 }
 
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 07dd029245..e421a31549 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -173,14 +173,8 @@ ul.notes {
         border-width: 1px;
       }
 
-      .new-note {
-        max-width: 800px;
-      }
-
       .notes {
-        max-width: 800px;
         background-color: $white-light;
-        border-right: 1px solid $table-border-gray;
       }
     }
   }