kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'restore-size-and-position-for-fork-icon' into 'master' 

Restore size and position for fork icon

See merge request gitlab-org/gitlab-ce!18449
This commit is contained in:
Rémy Coutable 2018-04-26 15:34:23 +00:00
parent 4de3bc5f93 952f18e908
commit aed4270f74
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/framework/wells.scss
View File

@ -19,6 +19,7 @@
.fork-svg {
margin-right: 4px;
vertical-align: bottom;
}
}

2
app/assets/stylesheets/pages/commits.scss
View File

@ -70,7 +70,7 @@
}
.branch-info .commit-icon {
margin-right: 3px;
margin-right: 8px;
svg {
top: 3px;

2
app/helpers/commits_helper.rb
View File

@ -63,7 +63,7 @@ module CommitsHelper
# Returns a link formatted as a commit branch link
def commit_branch_link(url, text)
link_to(url, class: 'label label-gray ref-name branch-link') do
sprite_icon('fork', size: 16, css_class: 'fork-svg') + "#{text}"
sprite_icon('fork', size: 12, css_class: 'fork-svg') + "#{text}"
end
end

5
changelogs/unreleased/restore-size-and-position-for-fork-icon.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fix size and position for fork icon
merge_request: 18449
author: George Tsiolis
type: changed