diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-01-16 15:54:12 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-01-16 15:54:12 +0000 |
| commit | 78ca7d97bbb12be11bd2ebeb8b03ae2277c5ec10 (patch) | |
| tree | 5a560efe2c8ba3c2407c3e841f097ca3e41038a8 | |
| parent | 0f449ecc3797337333f595a86a6b282b866067e3 (diff) | |
| parent | 5d8b06d28f062977e765db85e8e34804178ef790 (diff) | |
| download | gitlab-ce-41936-install-btn.tar.gz | |
Merge branch '42046-fork-icon' into 'master'41936-install-btn
Resolve "Icons on forks page are to big"
Closes #42046
See merge request gitlab-org/gitlab-ce!16474
| -rw-r--r-- | app/views/projects/forks/index.html.haml | 4 | ||||
| -rw-r--r-- | app/views/shared/projects/_project.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/42046-fork-icon.yml | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/app/views/projects/forks/index.html.haml b/app/views/projects/forks/index.html.haml index 111cbcda266..21a4702a2a9 100644 --- a/app/views/projects/forks/index.html.haml +++ b/app/views/projects/forks/index.html.haml @@ -31,11 +31,11 @@ - if current_user && can?(current_user, :fork_project, @project) - 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 - = custom_icon('icon_fork') + = sprite_icon('fork', size: 12) %span Fork - else = 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 diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml index 63aa4e29ec9..2a75b46d376 100644 --- a/app/views/shared/projects/_project.html.haml +++ b/app/views/shared/projects/_project.html.haml @@ -52,7 +52,7 @@ = render_project_pipeline_status(project.pipeline_status) - if forks %span.prepend-left-10 - = sprite_icon('fork') + = sprite_icon('fork', size: 12) = number_with_delimiter(project.forks_count) - if stars %span.prepend-left-10 diff --git a/changelogs/unreleased/42046-fork-icon.yml b/changelogs/unreleased/42046-fork-icon.yml new file mode 100644 index 00000000000..def89ff7b08 --- /dev/null +++ b/changelogs/unreleased/42046-fork-icon.yml @@ -0,0 +1,5 @@ +--- +title: Fix giant fork icons on forks page +merge_request: 16474 +author: +type: fixed |