Merge branch 'ui-improvements' into 'master'

Ui improvements

* show page context title instead of `Dashboard` keyword
* fix event feed overflow
* remove annoying tooltips where its not needed
* fix tests broken in previous mr

See merge request !1242

22 files changed, 39 insertions, 35 deletions

diff --git a/app/assets/stylesheets/base/gl_variables.scss b/app/assets/stylesheets/base/gl_variables.scss
index 1f71b0a52b9..628b22ef90a 100644
--- a/app/assets/stylesheets/base/gl_variables.scss
+++ b/app/assets/stylesheets/base/gl_variables.scss
@@ -136,7 +136,7 @@ $kbd-bg:                      #333;
 //== Buttons
 //
 //##
-$btn-default-color:              #7f8fa4;
+$btn-default-color:              $gl-text-color;
 $btn-default-bg:                 #fff;
 $btn-default-border:             #e7e9ed;
 
diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss
index 11519268fe0..c6145cdd770 100644
--- a/app/assets/stylesheets/generic/common.scss
+++ b/app/assets/stylesheets/generic/common.scss
@@ -385,7 +385,7 @@ table {
     a {
       padding: 15px;
       font-size: 20px;
-      line-height: 27px;
+      line-height: 28px;
       color: #7f8fa4;
       border-bottom: 2px solid transparent;
 
diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss
index 1d71a542f8a..16f1fdaae5e 100644
--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
@@ -34,8 +34,6 @@
 
   .event-title {
     @include str-truncated(calc(100% - 174px));
-
-    max-width: 70%;
     font-weight: 500;
 
     .author_name {
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb
index 1bd3ec5e0e0..6ffa1a7121d 100644
--- a/app/helpers/diff_helper.rb
+++ b/app/helpers/diff_helper.rb
@@ -137,7 +137,7 @@ module DiffHelper
     # Always use HTML to handle case where JSON diff rendered this button
     params_copy.delete(:format)
 
-    link_to url_for(params_copy), id: "commit-diff-viewtype", class: (params[:view] != 'parallel' ? 'btn btn-sm active' : 'btn btn-sm') do
+    link_to url_for(params_copy), id: "inline-diff-btn", class: (params[:view] != 'parallel' ? 'btn btn-sm active' : 'btn btn-sm') do
       'Inline'
     end
   end
@@ -148,7 +148,7 @@ module DiffHelper
     # Always use HTML to handle case where JSON diff rendered this button
     params_copy.delete(:format)
 
-    link_to url_for(params_copy), id: "commit-diff-viewtype", class: (params[:view] == 'parallel' ? 'btn active btn-sm' : 'btn btn-sm') do
+    link_to url_for(params_copy), id: "parallel-diff-btn", class: (params[:view] == 'parallel' ? 'btn active btn-sm' : 'btn btn-sm') do
       'Side-by-side'
     end
   end
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 13347b6eec6..76602614bcd 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -30,7 +30,6 @@ module EventsHelper
       class: "event-filter-link btn btn-default #{active}",
       id:    "#{key}_event_filter",
       title: "Filter by #{tooltip.downcase}",
-      data:  { toggle: 'tooltip', placement: 'top' }
     }
 
     link_to request.path, link_opts do
diff --git a/app/views/dashboard/_groups_head.html.haml b/app/views/dashboard/_groups_head.html.haml
index 8a397a84e0e..dcd6c97d44d 100644
--- a/app/views/dashboard/_groups_head.html.haml
+++ b/app/views/dashboard/_groups_head.html.haml
@@ -3,5 +3,5 @@
     = link_to dashboard_groups_path, title: 'Your groups', data: {placement: 'right'} do
       Your Groups
   = nav_link(page: [explore_groups_path]) do
-    = link_to explore_groups_path, title: 'Explore groups', data: {toggle: 'tooltip', placement: 'bottom'} do
+    = link_to explore_groups_path, title: 'Explore groups', data: {placement: 'bottom'} do
       Explore Groups
diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml
index 9ba12036f27..13a5eae3cdc 100644
--- a/app/views/dashboard/_projects_head.html.haml
+++ b/app/views/dashboard/_projects_head.html.haml
@@ -6,5 +6,5 @@
     = link_to starred_dashboard_projects_path, title: 'Starred Projects', data: {placement: 'right'} do
       Starred Projects
   = nav_link(page: [explore_root_path, trending_explore_projects_path, starred_explore_projects_path, explore_projects_path], html_options: { class: 'hidden-xs' }) do
-    = link_to explore_root_path, title: 'Explore', data: {toggle: 'tooltip', placement: 'bottom'} do
+    = link_to explore_root_path, title: 'Explore', data: {placement: 'right'} do
       Explore Projects
diff --git a/app/views/dashboard/activity.html.haml b/app/views/dashboard/activity.html.haml
index 72419bf94dd..3e24338af64 100644
--- a/app/views/dashboard/activity.html.haml
+++ b/app/views/dashboard/activity.html.haml
@@ -2,6 +2,7 @@
   - if current_user
     = auto_discovery_link_tag(:atom, dashboard_url(format: :atom, private_token: current_user.private_token), title: "All activity")
 
+- header_title  "Activity", activity_dashboard_path
 = render 'dashboard/activity_head'
 
 %section.activities
diff --git a/app/views/dashboard/groups/index.html.haml b/app/views/dashboard/groups/index.html.haml
index 9307812d495..c249f5cacec 100644
--- a/app/views/dashboard/groups/index.html.haml
+++ b/app/views/dashboard/groups/index.html.haml
@@ -1,4 +1,5 @@
 - page_title "Groups"
+- header_title  "Groups", dashboard_groups_path
 = render 'dashboard/groups_head'
 
 .gray-content-block
diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml
index 94318d1bcf5..14734ae7372 100644
--- a/app/views/dashboard/issues.html.haml
+++ b/app/views/dashboard/issues.html.haml
@@ -1,14 +1,11 @@
 - page_title "Issues"
+- header_title  "Issues", issues_dashboard_path(assignee_id: current_user.id)
 = content_for :meta_tags do
   - if current_user
     = auto_discovery_link_tag(:atom, issues_dashboard_url(format: :atom, private_token: current_user.private_token), title: "#{current_user.name} issues")
 
-%h3.page-title
-  Issues
-
 %p.light
   List all issues from all projects you have access to.
-%hr
 
 .append-bottom-20
   .pull-right
diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml
index 90611d562b0..3739a7d5dbc 100644
--- a/app/views/dashboard/merge_requests.html.haml
+++ b/app/views/dashboard/merge_requests.html.haml
@@ -1,11 +1,9 @@
 - page_title "Merge Requests"
-%h3.page-title
-  Merge Requests
-
+- header_title  "Merge Requests", merge_requests_dashboard_path(assignee_id: current_user.id)
 
 %p.light
   List all merge requests from all projects you have access to.
-%hr
+
 .append-bottom-20
   = render 'shared/issuable/filter', type: :merge_requests
 = render 'shared/merge_requests'
diff --git a/app/views/dashboard/milestones/index.html.haml b/app/views/dashboard/milestones/index.html.haml
index 9a9a5e139a4..88ad3cd7297 100644
--- a/app/views/dashboard/milestones/index.html.haml
+++ b/app/views/dashboard/milestones/index.html.haml
@@ -1,12 +1,9 @@
 - page_title "Milestones"
-%h3.page-title
-  Milestones
-  %span.pull-right #{@dashboard_milestones.count} milestones
+- header_title  "Milestones", dashboard_milestones_path
 
 %p.light
   List all milestones from all projects you have access to.
 
-%hr
 
 = render 'shared/milestones_filter'
 .milestones
diff --git a/app/views/dashboard/projects/starred.html.haml b/app/views/dashboard/projects/starred.html.haml
index becd989c1f3..2fd7a1cf16c 100644
--- a/app/views/dashboard/projects/starred.html.haml
+++ b/app/views/dashboard/projects/starred.html.haml
@@ -1,4 +1,5 @@
 - page_title "Starred Projects"
+- header_title "Projects", (current_user ? root_path : explore_root_path)
 = render 'dashboard/projects_head'
 
 - if @projects.any?
diff --git a/app/views/dashboard/show.html.haml b/app/views/dashboard/show.html.haml
index 4cf2feb9aa6..1d5324e0d72 100644
--- a/app/views/dashboard/show.html.haml
+++ b/app/views/dashboard/show.html.haml
@@ -2,6 +2,7 @@
   - if current_user
     = auto_discovery_link_tag(:atom, dashboard_url(format: :atom, private_token: current_user.private_token), title: "All activity")
 
+- header_title "Projects", (current_user ? root_path : explore_root_path)
 = render 'dashboard/projects_head'
 
 - if @last_push
diff --git a/app/views/explore/groups/index.html.haml b/app/views/explore/groups/index.html.haml
index 86410db2b2d..e8a6752de8c 100644
--- a/app/views/explore/groups/index.html.haml
+++ b/app/views/explore/groups/index.html.haml
@@ -1,4 +1,5 @@
 - page_title "Groups"
+- header_title "Groups", (current_user ? dashboard_groups_path : explore_groups_path)
 - if current_user
   = render 'dashboard/groups_head'
 .gray-content-block.clearfix
diff --git a/app/views/layouts/dashboard.html.haml b/app/views/layouts/dashboard.html.haml
index c72eca10bf4..fad7de69432 100644
--- a/app/views/layouts/dashboard.html.haml
+++ b/app/views/layouts/dashboard.html.haml
@@ -1,5 +1,6 @@
 - page_title    "Dashboard"
-- header_title  "Dashboard", root_path
+- unless @header_title
+  - header_title  "Dashboard", root_path
 - sidebar       "dashboard"
 
 = render template: "layouts/application"
diff --git a/app/views/layouts/explore.html.haml b/app/views/layouts/explore.html.haml
index 17fee9c510d..9098554e6f0 100644
--- a/app/views/layouts/explore.html.haml
+++ b/app/views/layouts/explore.html.haml
@@ -1,6 +1,7 @@
 - page_title    "Explore"
 - if current_user
-  - header_title  "Dashboard", root_path
+  - unless @header_title
+    - header_title "Projects", (current_user ? root_path : explore_root_path)
 - else
   - header_title  "Explore GitLab", explore_root_path
 - sidebar       "dashboard"
diff --git a/app/views/layouts/snippets.html.haml b/app/views/layouts/snippets.html.haml
index b77fe09fc2a..d9c90d4fcef 100644
--- a/app/views/layouts/snippets.html.haml
+++ b/app/views/layouts/snippets.html.haml
@@ -1,6 +1,6 @@
 - page_title    'Snippets'
 - if current_user
-  - header_title  "Dashboard", root_path
+  - header_title  "Snippets", user_snippets_path(current_user)
 - else
   - header_title  'Snippets', snippets_path
 - sidebar       "dashboard"
diff --git a/app/views/snippets/current_user_index.html.haml b/app/views/snippets/current_user_index.html.haml
index 62a967a2e06..d704407c4dd 100644
--- a/app/views/snippets/current_user_index.html.haml
+++ b/app/views/snippets/current_user_index.html.haml
@@ -1,14 +1,15 @@
 - page_title "Your Snippets"
 = render 'head'
 
-.slead
-  Share code pastes with others out of git repository
-
+.gray-content-block
   .pull-right
-    = link_to new_snippet_path, class: "btn btn-new btn-sm", title: "New Snippet" do
+    = link_to new_snippet_path, class: "btn btn-new", title: "New Snippet" do
       Add new snippet
 
-%ul.nav.nav-tabs
+  .oneline
+    Share code pastes with others out of git repository
+
+%ul.nav.nav-tabs.prepend-top-20
   = nav_tab :scope, nil do
     = link_to user_snippets_path(@user) do
       All
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index 8608815e0a6..3b62dd2a6e1 100644
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@@ -2,8 +2,14 @@
 - if current_user
   = render 'head'
 
-.slead
-  Public snippets created by you and other users are listed here
+.gray-content-block
+  - if current_user
+    .pull-right
+      = link_to new_snippet_path, class: "btn btn-new", title: "New Snippet" do
+        Add new snippet
+
+  .oneline
+    Public snippets created by you and other users are listed here
 
 = render 'snippets'
 
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index 778dce06359..c92998631ff 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -128,7 +128,8 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   end
 
   step 'I should see the proper Inline and Side-by-side links' do
-    expect(page).to have_css('#commit-diff-viewtype', count: 2)
+    expect(page).to have_css('#parallel-diff-btn', count: 1)
+    expect(page).to have_css('#inline-diff-btn', count: 1)
   end
 
   step 'I switch to the merge request\'s comments tab' do
@@ -225,13 +226,13 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
 
   step 'I click link "Hide inline discussion" of the second file' do
     page.within '.files [id^=diff]:nth-child(2)' do
-      find('.js-toggle-diff-comments').click
+      find('.js-toggle-diff-comments').trigger('click')
     end
   end
 
   step 'I click link "Show inline discussion" of the second file' do
     page.within '.files [id^=diff]:nth-child(2)' do
-      find('.js-toggle-diff-comments').click
+      find('.js-toggle-diff-comments').trigger('click')
     end
   end
 
diff --git a/features/steps/shared/diff_note.rb b/features/steps/shared/diff_note.rb
index 27a95aeb19a..72621911a37 100644
--- a/features/steps/shared/diff_note.rb
+++ b/features/steps/shared/diff_note.rb
@@ -198,7 +198,7 @@ module SharedDiffNote
   end
 
   step 'I click side-by-side diff button' do
-    click_link "Side-by-side"
+    find('#parallel-diff-btn').trigger('click')
   end
 
   step 'I see side-by-side diff button' do