summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-14 15:03:07 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-14 15:03:07 +0000
commit8dde52cc099af63e1bdc02ca6fc389e4a9ea9969 (patch)
treec5ec779b8ca6d4fe73d20d2a83426a068b43c5fc
parent947231a4617fb41c809e6a0c1f222f50b6645ca3 (diff)
parent191bb46d74f4ded7b249688cf4c53e493c8262c0 (diff)
downloadgitlab-ce-8dde52cc099af63e1bdc02ca6fc389e4a9ea9969.tar.gz
Merge branch 'fewer-icons' into 'master'
Use slightly fewer icons in project sidebar. ![Screen_Shot_2015-05-14_at_17.01.37](https://gitlab.com/gitlab-org/gitlab-ce/uploads/57928b7a0beb556f1e779d340b5e124f/Screen_Shot_2015-05-14_at_17.01.37.png) See merge request !657
-rw-r--r--app/views/projects/_aside.html.haml6
1 files changed, 0 insertions, 6 deletions
diff --git a/app/views/projects/_aside.html.haml b/app/views/projects/_aside.html.haml
index c2f56996ba8..333a1e6156d 100644
--- a/app/views/projects/_aside.html.haml
+++ b/app/views/projects/_aside.html.haml
@@ -10,17 +10,14 @@
- if @repository.changelog
%li.hidden-xs
= link_to changelog_url(@project) do
- = icon("list-alt fw")
Changelog
- if @repository.license
%li
= link_to license_url(@project) do
- = icon("check-circle-o fw")
License
- if @repository.contribution_guide
%li
= link_to contribution_guide_url(@project) do
- = icon("info-circle fw")
Contribution guide
.actions
@@ -73,15 +70,12 @@
%ul.nav.nav-pills
%li
= link_to namespace_project_commits_path(@project.namespace, @project, @ref || @repository.root_ref) do
- = icon("history fw")
= pluralize(number_with_delimiter(@repository.commit_count), 'commit')
%li
= link_to namespace_project_branches_path(@project.namespace, @project) do
- = icon("code-fork fw")
= pluralize(number_with_delimiter(@repository.branch_names.count), 'branch')
%li
= link_to namespace_project_tags_path(@project.namespace, @project) do
- = icon("tags fw")
= pluralize(number_with_delimiter(@repository.tag_names.count), 'tag')
.actions