Changed some CSS to make it more concise & less overriding

6 files changed, 58 insertions, 78 deletions

diff --git a/app/assets/stylesheets/framework/mobile.scss b/app/assets/stylesheets/framework/mobile.scss
index 5ea4f9a49db..475340f3f0c 100644
--- a/app/assets/stylesheets/framework/mobile.scss
+++ b/app/assets/stylesheets/framework/mobile.scss
@@ -107,7 +107,7 @@
   }
 
   .page-title {
-    .note_created_ago, .new-issue-link {
+    .note-created-ago, .new-issue-link {
       display: none;
     }
   }
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 148c988f0a2..9f466a817fb 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -22,7 +22,7 @@ ul.notes {
     margin-left: 55px;
   }
 
-  .note_created_ago, .note-updated-at {
+  .note-created-ago, .note-updated-at {
     white-space: nowrap;
   }
 
@@ -39,41 +39,6 @@ ul.notes {
     }
   }
 
-  .discussion-header,
-  .note-header {
-    a:hover {
-      text-decoration: none;
-    }
-
-    .avatar {
-      float: left;
-      margin-right: 10px;
-    }
-
-    .discussion-last-update,
-    .note-last-update {
-      &:before {
-        content: "\00b7";
-      }
-
-      a {
-        color: $gl-gray;
-
-        &:hover {
-          text-decoration: underline;
-        }
-      }
-    }
-    .author {
-      color: #4c4e54;
-      margin-right: 3px;
-
-      &:hover {
-        color: $gl-link-color;
-      }
-    }
-  }
-
   .discussion-body {
     padding-top: 15px;
   }
@@ -193,35 +158,58 @@ ul.notes {
   }
 }
 
+.discussion-header,
+.note-header {
+  a {
+    color: inherit;
+
+    &:hover {
+      color: $gl-link-color;
+      text-decoration: none;
+    }
+  }
+
+  .author_link {
+    font-weight: 600;
+  }
+}
+
+.note-headline-light,
+.discussion-headline-light {
+  color: #8e8e8e;
+}
+
 /**
  * Actions for Discussions/Notes
  */
 
-.discussion,
-.note {
-  .discussion-actions,
-  .note-actions {
-    float: right;
-    margin-left: 10px;
-  }
+.discussion-actions,
+.note-actions {
+  float: right;
+  margin-left: 10px;
+  color: #8F8F8F;
 }
 
-.note-action-button {
+.note-action-button,
+.discussion-action-button {
   display: inline-block;
-  margin-left: 5px;
-  color: #8F8F8F;
+  margin-left: 10px;
   line-height: 24px;
 
   .fa {
     font-size: 16px;
   }
+}
 
-  &:hover {
-    color: $gl-gray;
+.discussion-toggle-button {
+  line-height: 20px;
+  font-size: 13px;
 
-    &.danger {
-      color: $gl-text-red;
-    }
+  .fa {
+    margin-right: 3px;
+    font-size: 10px;
+    line-height: 18px;
+    vertical-align: top;
   }
 }
 
@@ -234,7 +222,7 @@ ul.notes {
   color: #8F8F8F;
   font-size: 12px;
   line-height: 20px;
-  border: 1px solid #bbb;
+  border: 1px solid #E4E4E4;
   border-radius: $border-radius-base;
 }
 
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index 0026c0a1621..34fe1743f4b 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -5,6 +5,11 @@
         = image_tag avatar_icon(note.author), alt: '', class: 'avatar s40'
     .timeline-content
       .note-header
+        = link_to_member(note.project, note.author, avatar: false)
+        .inline.note-headline-light
+          = "#{note.author.to_reference} commented"
+          %a{ href: "##{dom_id(note)}" }
+            = time_ago_with_tooltip(note.created_at, placement: 'bottom', html_class: 'note-created-ago')
         - if note_editable?(note)
           .note-actions
             - access = note.project.team.human_max_access(note.author.id)
@@ -15,15 +20,6 @@
               = icon('pencil-square-o')
             = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button js-note-delete danger' do
               = icon('trash-o')
-
-        = link_to_member(note.project, note.author, avatar: false)
-
-        %span.author-username
-          = '@' + note.author.username
-
-        %span.note-last-update
-          %a{name: dom_id(note), href: "##{dom_id(note)}", title: 'Link here'}
-            = time_ago_with_tooltip(note.created_at, placement: 'bottom', html_class: 'note_created_ago')
       .note-body{class: note_editable?(note) ? 'js-task-list-container' : ''}
         .note-text
           = preserve do
diff --git a/app/views/projects/notes/discussions/_active.html.haml b/app/views/projects/notes/discussions/_active.html.haml
index 3e538a5a581..cd8a5f0bd02 100644
--- a/app/views/projects/notes/discussions/_active.html.haml
+++ b/app/views/projects/notes/discussions/_active.html.haml
@@ -1,22 +1,20 @@
 - note = discussion_notes.first
 .discussion.js-toggle-container{ class: note.discussion_id }
   .discussion-header
+    = link_to_member(@project, note.author, avatar: false)
+    .inline.discussion-headline-light
+      = "#{note.author.to_reference} started a discussion"
+      = link_to diffs_namespace_project_merge_request_path(note.project.namespace, note.project, note.noteable, anchor: note.line_code) do
+        on the diff
     .discussion-actions
-      = link_to "#", class: "note-action-button js-toggle-button" do
+      = link_to "#", class: "discussion-action-button discussion-toggle-button js-toggle-button" do
         %i.fa.fa-chevron-up
         Show/hide discussion
-    %div
-      = link_to_member(@project, note.author, avatar: false)
-      started a discussion
-      = link_to diffs_namespace_project_merge_request_path(note.project.namespace, note.project, note.noteable, anchor: note.line_code) do
-        %strong on the diff
     .last-update.hide.js-toggle-content
       - last_note = discussion_notes.last
       last updated by
       = link_to_member(@project, last_note.author, avatar: false)
-
-      %span.discussion-last-update
-        #{time_ago_with_tooltip(last_note.updated_at, placement: 'bottom', html_class: 'discussion_updated_ago')}
+      #{time_ago_with_tooltip(last_note.updated_at, placement: 'bottom', html_class: 'discussion_updated_ago')}
 
   .discussion-body.js-toggle-content
     = render "projects/notes/discussions/diff", discussion_notes: discussion_notes, note: note
diff --git a/app/views/projects/notes/discussions/_commit.html.haml b/app/views/projects/notes/discussions/_commit.html.haml
index 35b4b70241b..e9913c8c62b 100644
--- a/app/views/projects/notes/discussions/_commit.html.haml
+++ b/app/views/projects/notes/discussions/_commit.html.haml
@@ -4,7 +4,7 @@
 .discussion.js-toggle-container{ class: note.discussion_id }
   .discussion-header
     .discussion-actions
-      = link_to "#", class: "note-action-button js-toggle-button" do
+      = link_to "#", class: "note-action-button discussion-toggle-button js-toggle-button" do
         %i.fa.fa-chevron-up
         Show/hide discussion
     %div
@@ -16,8 +16,7 @@
       - last_note = discussion_notes.last
       last updated by
       = link_to_member(@project, last_note.author, avatar: false)
-      %span.discussion-last-update
-        #{time_ago_with_tooltip(last_note.updated_at, placement: 'bottom', html_class: 'discussion_updated_ago')}
+      #{time_ago_with_tooltip(last_note.updated_at, placement: 'bottom', html_class: 'discussion_updated_ago')}
   .discussion-body.js-toggle-content
     - if note.for_diff_line?
       = render "projects/notes/discussions/diff", discussion_notes: discussion_notes, note: note
diff --git a/app/views/projects/notes/discussions/_outdated.html.haml b/app/views/projects/notes/discussions/_outdated.html.haml
index bee452207e1..28019041967 100644
--- a/app/views/projects/notes/discussions/_outdated.html.haml
+++ b/app/views/projects/notes/discussions/_outdated.html.haml
@@ -2,18 +2,17 @@
 .discussion.js-toggle-container{ class: note.discussion_id }
   .discussion-header
     .discussion-actions
-      = link_to "#", class: "note-action-button js-toggle-button" do
+      = link_to "#", class: "note-action-button discussion-toggle-button js-toggle-button" do
         %i.fa.fa-chevron-down
         Show/hide discussion
     %div
       = link_to_member(@project, note.author, avatar: false)
       started a discussion on the
-      %strong outdated diff
+      outdated diff
     %div
       - last_note = discussion_notes.last
       last updated by
       = link_to_member(@project, last_note.author, avatar: false)
-      %span.discussion-last-update
-        #{time_ago_with_tooltip(last_note.updated_at, placement: 'bottom', html_class: 'discussion_updated_ago')}
+      #{time_ago_with_tooltip(last_note.updated_at, placement: 'bottom', html_class: 'discussion_updated_ago')}
   .discussion-body.js-toggle-content.hide
     = render "projects/notes/discussions/diff", discussion_notes: discussion_notes, note: note