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

Fix size and position for fork icon Closes #42582 See merge request gitlab-org/gitlab-ce!18399

Merge branch 'fix-size-and-position-for-fork-icon' into 'master'
9a5765bf · Tim Zallmann · adcdb25b · 5a34d3bd · 9a5765bf · 9a5765bf
Commit 9a5765bf authored Apr 18, 2018 by Tim Zallmann
5 changed files
--- a/Gemfile.lock
+++ b/Gemfile.lock
--- a/app/assets/stylesheets/framework/wells.scss
+++ b/app/assets/stylesheets/framework/wells.scss
@@ -19,6 +19,7 @@

        .fork-svg {
          margin-right: 4px;
+          vertical-align: bottom;
        }
      }


--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -70,7 +70,7 @@
 }

 .branch-info .commit-icon {
-  margin-right: 3px;
+  margin-right: 8px;

  svg {
    top: 3px;

--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -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


--- a/changelogs/unreleased/fix-size-and-position-for-fork-icon.yml
+++ b/changelogs/unreleased/fix-size-and-position-for-fork-icon.yml
+---
+title: Fix size and position for fork icon
+merge_request: 18399
+author: George Tsiolis
+type: fixed