Improve breadcrumbs

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

2 files changed, 13 insertions, 13 deletions

diff --git a/app/views/projects/commits/_head.html.haml b/app/views/projects/commits/_head.html.haml
index 1bb4d9bfab4..b636e8ffe16 100644
--- a/app/views/projects/commits/_head.html.haml
+++ b/app/views/projects/commits/_head.html.haml
@@ -1,6 +1,4 @@
 %ul.nav.nav-tabs
-  %li= render partial: 'shared/ref_switcher', locals: {destination: 'commits'}
-
   = nav_link(controller: [:commit, :commits]) do
     = link_to 'Commits', project_commits_path(@project, @repository.root_ref)
   = nav_link(controller: :compare) do
@@ -19,9 +17,3 @@
   = nav_link(controller: :repositories, action: :stats) do
     = link_to stats_project_repository_path(@project) do
       Stats
-
-
-  - if current_user && current_controller?(:commits) && current_user.private_token
-    %li.pull-right.hidden-sm
-      = link_to project_commits_path(@project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Feed" do
-        %i.icon-rss
diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml
index 3a4f304a255..482a845558f 100644
--- a/app/views/projects/commits/show.html.haml
+++ b/app/views/projects/commits/show.html.haml
@@ -1,10 +1,18 @@
 = render "head"
 
-- if @path.present?
-  %ul.breadcrumb.commit-breadcrumb
-    %li.light
-      History for
-    = commits_breadcrumbs
+.tree-ref-holder
+  = render 'shared/ref_switcher', destination: 'commits'
+
+- if current_user && current_user.private_token
+  .commits-feed-holder.hidden-xs.hidden-sm
+    = link_to project_commits_path(@project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Feed", class: 'btn' do
+      %i.icon-rss
+      Commits feed
+
+%ul.breadcrumb.repo-breadcrumb
+  = commits_breadcrumbs
+  %li.active
+    commits
 
 %div{id: dom_id(@project)}
   #commits-list= render "commits"