From 952f18e908faa17ea011c1a95035e4b50c28dd97 Mon Sep 17 00:00:00 2001 From: George Tsiolis Date: Wed, 18 Apr 2018 13:12:54 +0300 Subject: Restore size and position for fork icon --- app/assets/stylesheets/framework/wells.scss | 1 + app/assets/stylesheets/pages/commits.scss | 2 +- app/helpers/commits_helper.rb | 2 +- changelogs/unreleased/restore-size-and-position-for-fork-icon.yml | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 changelogs/unreleased/restore-size-and-position-for-fork-icon.yml diff --git a/app/assets/stylesheets/framework/wells.scss b/app/assets/stylesheets/framework/wells.scss index 2f3a80daa90..3fa7a260017 100644 --- 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; } } diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index 86cdda0359e..327cb1f57ed 100644 --- 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; diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb index 98894b86551..e594a1d0ba3 100644 --- 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 diff --git a/changelogs/unreleased/restore-size-and-position-for-fork-icon.yml b/changelogs/unreleased/restore-size-and-position-for-fork-icon.yml new file mode 100644 index 00000000000..dd8dad0b17d --- /dev/null +++ b/changelogs/unreleased/restore-size-and-position-for-fork-icon.yml @@ -0,0 +1,5 @@ +--- +title: Fix size and position for fork icon +merge_request: 18449 +author: George Tsiolis +type: changed -- cgit v1.2.3