Merge branch 'ui-improvements' into 'master'

Fix UI bugs with discussions

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1265

app/assets/stylesheets/generic/timeline.scss

@@ -4,14 +4,19 @@
   margin: 0;
   padding: 0;
 
-  > li {
+  .timeline-entry {
     padding: $gl-padding;
     border-color: #f1f2f4;
     margin-left: -$gl-padding;
     margin-right: -$gl-padding;
     color: $gl-gray;
+    border-bottom: 1px solid #f1f2f4;
     border-right: 1px solid #f1f2f4;
 
+    &:last-child {
+      border-bottom: none;
+    }
+
     .avatar {
       margin-right: 15px;
     }
@@ -33,6 +38,13 @@
       color: $gl-gray !important;
     }
   }
+
+  .diff-file {
+    border: 1px solid $border-color;
+    border-bottom: none;
+    margin-left: 0;
+    margin-right: 0;
+  }
 }
 
 @media (max-width: $screen-xs-max) {
@@ -51,3 +63,8 @@
     }
   }
 }
+
+.discussion .timeline-entry {
+  margin: 0;
+  border-right: none;
+}

app/assets/stylesheets/pages/note_form.scss

@@ -146,9 +146,9 @@
   }
 
   .discussion-reply-holder {
-    background: #f9f9f9;
+    background: $background-color;
     padding: 10px 15px;
-    border-top: 1px solid #DDD;
+    border-top: 1px solid $border-color;
   }
 }
 
@@ -170,6 +170,6 @@
   background: #FFF;
   padding: 5px;
   margin-top: -11px;
-  border: 1px solid #DDD;
+  border: 1px solid $border-color;
   font-size: 13px;
 }

app/views/projects/notes/_discussion.html.haml

@@ -1,5 +1,5 @@
 - note = discussion_notes.first
-.timeline-entry.prepend-top-default
+.timeline-entry
   .timeline-entry-inner
     .timeline-icon
       = link_to user_path(note.author) do