diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-04-26 18:34:23 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-04-26 18:34:23 +0300 |
| commit | aed4270f743e5d491af5454d9fa0ca54ef7876da (patch) | |
| tree | 28ab8f91e590a052e95329daeafb2fabd4ba7f88 | |
| parent | 4de3bc5f93e016f1d84f43c0e27d8d2c6d82ddb0 (diff) | |
| parent | 952f18e908faa17ea011c1a95035e4b50c28dd97 (diff) | |
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
| -rw-r--r-- | app/assets/stylesheets/framework/wells.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/commits.scss | 2 | ||||
| -rw-r--r-- | app/helpers/commits_helper.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/restore-size-and-position-for-fork-icon.yml | 5 |
4 files changed, 8 insertions, 2 deletions
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 e9384d41e00..1aca3c5cf1a 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 |