Commit 78ca7d97 authored by Fatih Acet's avatar Fatih Acet

Merge branch '42046-fork-icon' into 'master'

Resolve "Icons on forks page are to big"

Closes #42046

See merge request gitlab-org/gitlab-ce!16474
parents 0f449ecc 5d8b06d2
...@@ -31,11 +31,11 @@ ...@@ -31,11 +31,11 @@
- if current_user && can?(current_user, :fork_project, @project) - if current_user && can?(current_user, :fork_project, @project)
- if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2 - if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2
= link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to your fork', class: 'btn btn-new' do = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to your fork', class: 'btn btn-new' do
= custom_icon('icon_fork') = sprite_icon('fork', size: 12)
%span Fork %span Fork
- else - else
= link_to new_project_fork_path(@project), title: "Fork project", class: 'btn btn-new' do = link_to new_project_fork_path(@project), title: "Fork project", class: 'btn btn-new' do
= custom_icon('icon_fork') = sprite_icon('fork', size: 12)
%span Fork %span Fork
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
= render_project_pipeline_status(project.pipeline_status) = render_project_pipeline_status(project.pipeline_status)
- if forks - if forks
%span.prepend-left-10 %span.prepend-left-10
= sprite_icon('fork') = sprite_icon('fork', size: 12)
= number_with_delimiter(project.forks_count) = number_with_delimiter(project.forks_count)
- if stars - if stars
%span.prepend-left-10 %span.prepend-left-10
......
---
title: Fix giant fork icons on forks page
merge_request: 16474
author:
type: fixed
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