diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-04-18 12:41:49 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-04-18 12:41:49 +0300 |
| commit | f150f262a9dee0ed329adf3fd30ea8a47a5e3c6b (patch) | |
| tree | 181e9eeb32e6edf538a081855001a0cdfb15828e /app | |
| parent | 923f5af2b23d5734049c5e4c5b8262c19d1f73a5 (diff) | |
Revert "Merge branch 'fix-size-and-position-for-fork-icon' into 'master'"
This reverts merge request !18399
Diffstat (limited to 'app')
| -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 |
3 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/wells.scss b/app/assets/stylesheets/framework/wells.scss index 3fa7a260017..2f3a80daa90 100644 --- a/app/assets/stylesheets/framework/wells.scss +++ b/app/assets/stylesheets/framework/wells.scss @@ -19,7 +19,6 @@ .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 327cb1f57ed..86cdda0359e 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: 8px; + margin-right: 3px; svg { top: 3px; diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb index e594a1d0ba3..98894b86551 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: 12, css_class: 'fork-svg') + "#{text}" + sprite_icon('fork', size: 16, css_class: 'fork-svg') + "#{text}" end end |