summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGeorge Tsiolis <tsiolis.g@gmail.com>2018-04-16 16:44:34 +0300
committerGeorge Tsiolis <tsiolis.g@gmail.com>2018-04-18 00:05:50 +0300
commit5a34d3bd162e51169e13f02c58eaf32c92a8e9ea (patch)
tree32d483a584e7f19e53eab76e84dd04a97931287a /app
parent2cc78c0b03d9468e25bbf4805fe1d55e414840ff (diff)
downloadgitlab-ce-5a34d3bd162e51169e13f02c58eaf32c92a8e9ea.tar.gz
Fix size and position for fork icon
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/framework/wells.scss1
-rw-r--r--app/assets/stylesheets/pages/commits.scss2
-rw-r--r--app/helpers/commits_helper.rb2
3 files changed, 3 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 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