Add content attributes to discussion diffs; change styling of add-note icon to prevent white spaces in paste

1 files changed, 18 insertions, 8 deletions

diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index ca7fa2094b6..bd7640db3b7 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -69,10 +69,12 @@
 
         &.noteable_line.old:before {
           content: '-';
+          position: absolute;
         }
 
         &.noteable_line.new:before {
           content: '+';
+          position: absolute;
         }
 
         span {
@@ -400,14 +402,22 @@
   }
 }
 
-.diff-line-num:not(.js-unfold-bottom) {
-  a {
-    &:before {
-      content: attr(data-linenumber);
+.file-holder {
+  .diff-line-num:not(.js-unfold-bottom) {
+    a {
+      &:before {
+          content: attr(data-linenumber);
+      }
+    }
+  }
+}
+
+.discussion {
+  .diff-content {
+    .diff-line-num {
+      &:before {
+        content: attr(data-linenumber);
+      }
     }
-    -moz-user-select: none;
-    -webkit-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
   }
 }