diff --git a/app/assets/stylesheets/sections/tree.scss b/app/assets/stylesheets/sections/tree.scss index e17487fdb2d..e7d20874aa8 100644 --- a/app/assets/stylesheets/sections/tree.scss +++ b/app/assets/stylesheets/sections/tree.scss @@ -57,10 +57,7 @@ padding-right: 8px; img.avatar { - border: 0 none; - float: none; - margin-right: 0; - padding: 0; + margin-top: 0; width: 16px; } } diff --git a/app/views/repositories/_branch.html.haml b/app/views/repositories/_branch.html.haml index 3c1fe47cc43..2728b100ff6 100644 --- a/app/views/repositories/_branch.html.haml +++ b/app/views/repositories/_branch.html.haml @@ -3,19 +3,25 @@ %tr %td = link_to project_commits_path(@project, branch.name) do + - if @project.protected_branch? branch.name + %i.icon-lock + - else + %i.icon-unlock %strong= truncate(branch.name, length: 60) - if branch.name == @project.root_ref %span.label default %td - = link_to project_commit_path(@project, commit) do - %code= commit.short_id - - = image_tag gravatar_icon(commit.author_email), class: "", width: 16 - = gfm escape_once(truncate(commit.title, length: 40)) - %span.update-author.right + = link_to project_commit_path(@project, commit.id), class: 'commit_short_id' do + = commit.short_id + = image_tag gravatar_icon(commit.author_email), class: "avatar s16" + %span.light + = gfm escape_once(truncate(commit.title, length: 40)) + %span = time_ago_in_words(commit.committed_date) ago %td - if can? current_user, :download_code, @project - = link_to "Download", archive_project_repository_path(@project, ref: branch.name), class: "visible_link download_repo_link" + = link_to archive_project_repository_path(@project, ref: branch.name) do + %i.icon-download + Download diff --git a/app/views/repositories/_branches_head.html.haml b/app/views/repositories/_branches_head.html.haml index 25a988cf01b..8f3e1ba3f81 100644 --- a/app/views/repositories/_branches_head.html.haml +++ b/app/views/repositories/_branches_head.html.haml @@ -3,6 +3,8 @@ = nav_link(path: 'repositories#show') do = link_to 'Recent', project_repository_path(@project) = nav_link(path: 'protected_branches#index') do - = link_to 'Protected', project_protected_branches_path(@project) + = link_to project_protected_branches_path(@project) do + %i.icon-lock + Protected = nav_link(path: 'repositories#branches') do = link_to 'All', branches_project_repository_path(@project)