summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConstance Okoghenun <cokoghenun@gitlab.com>2018-05-24 15:56:24 +0100
committerConstance Okoghenun <cokoghenun@gitlab.com>2018-05-24 15:56:24 +0100
commit7237e356794aee66f91b69a6e46115e150c9baf3 (patch)
tree407f84d71fce93ed377cbc419c66e151ea605741
parent47195375ac781f13a0e41668f20155fe5654bf2d (diff)
downloadgitlab-ce-commit-branch-tag-icon-update.tar.gz
Updated styles for commit tag link iconscommit-branch-tag-icon-update
-rw-r--r--app/assets/stylesheets/pages/commits.scss7
-rw-r--r--app/helpers/commits_helper.rb4
-rw-r--r--app/views/projects/commit/branches.html.haml4
3 files changed, 4 insertions, 11 deletions
diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss
index b26b2323dc4..944996159d7 100644
--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -377,10 +377,3 @@
display: block;
color: $link-color;
}
-
-.commit-info {
- .branch-link {
- display: inline-flex;
- align-content: center;
- }
-}
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index 0542d69a5c6..f5a7871a6e0 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -76,8 +76,8 @@ module CommitsHelper
# Returns a link formatted as a commit tag link
def commit_tag_link(url, text)
- link_to(url, class: 'label label-gray ref-name branch-link') do
- sprite_icon('tag', size: 12, css_class: 'append-right-5') + "#{text}"
+ link_to(url, class: 'label label-gray ref-name') do
+ sprite_icon('tag', size: 12, css_class: 'append-right-5 vertical-align-middle') + "#{text}"
end
end
diff --git a/app/views/projects/commit/branches.html.haml b/app/views/projects/commit/branches.html.haml
index 995f58c1e56..a91e31afc2b 100644
--- a/app/views/projects/commit/branches.html.haml
+++ b/app/views/projects/commit/branches.html.haml
@@ -6,8 +6,8 @@
- if @branches.any? || @tags.any? || @tags_limit_exceeded
%span
- = link_to "#", class: "js-details-expand label label-gray branch-link ref-name" do
- = sprite_icon('ellipsis_h', size: 12)
+ = link_to "#", class: "js-details-expand label label-gray ref-name" do
+ = sprite_icon('ellipsis_h', size: 12, css_class: 'vertical-align-middle')
%span.js-details-content.hide
= commit_branches_links(@project, @branches)
- if @tags_limit_exceeded