Merge branch 'fix-star-icon' into 'master'

Fix star icon Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/682. See merge request !1180

Merge branch 'fix-star-icon' into 'master'
19b0ba5e · Dmitriy Zaporozhets · c31d9b73 · 3c66490e · 19b0ba5e · 19b0ba5e
Commit 19b0ba5e authored Oct 15, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

_project.html.haml app/views/explore/projects/_project.html.haml +1 -0

starred.html.haml app/views/explore/projects/starred.html.haml +1 -1

No files found.
--- a/app/views/explore/projects/_project.html.haml
+++ b/app/views/explore/projects/_project.html.haml
@@ -6,6 +6,7 @@

    - if current_page?(starred_explore_projects_path)
      %strong.pull-right
+        %i.fa.fa-star
        = pluralize project.star_count, 'star'

  .project-info

--- a/app/views/explore/projects/starred.html.haml
+++ b/app/views/explore/projects/starred.html.haml
 .explore-trending-block
  %p.lead
-    %i.fa.fa-comments-o
+    %i.fa.fa-star
    See most starred projects
  %hr
  .public-projects