Commit 1c9351ab authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Restyle branches list. Remove unneccesary styles from tree avatar

parent b4708d00
...@@ -57,10 +57,7 @@ ...@@ -57,10 +57,7 @@
padding-right: 8px; padding-right: 8px;
img.avatar { img.avatar {
border: 0 none; margin-top: 0;
float: none;
margin-right: 0;
padding: 0;
width: 16px; width: 16px;
} }
} }
......
...@@ -3,19 +3,25 @@ ...@@ -3,19 +3,25 @@
%tr %tr
%td %td
= link_to project_commits_path(@project, branch.name) do = 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) %strong= truncate(branch.name, length: 60)
- if branch.name == @project.root_ref - if branch.name == @project.root_ref
%span.label default %span.label default
%td %td
= link_to project_commit_path(@project, commit) do = link_to project_commit_path(@project, commit.id), class: 'commit_short_id' do
%code= commit.short_id = commit.short_id
= image_tag gravatar_icon(commit.author_email), class: "avatar s16"
= image_tag gravatar_icon(commit.author_email), class: "", width: 16 %span.light
= gfm escape_once(truncate(commit.title, length: 40)) = gfm escape_once(truncate(commit.title, length: 40))
%span.update-author.right %span
= time_ago_in_words(commit.committed_date) = time_ago_in_words(commit.committed_date)
ago ago
%td %td
- if can? current_user, :download_code, @project - 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
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
= nav_link(path: 'repositories#show') do = nav_link(path: 'repositories#show') do
= link_to 'Recent', project_repository_path(@project) = link_to 'Recent', project_repository_path(@project)
= nav_link(path: 'protected_branches#index') do = 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 = nav_link(path: 'repositories#branches') do
= link_to 'All', branches_project_repository_path(@project) = link_to 'All', branches_project_repository_path(@project)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment