diff options
author | Phil Hughes <me@iamphill.com> | 2017-09-29 16:32:17 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-09-29 16:32:17 +0300 |
commit | 66775a80833a7acd0a8e5d05327647940e4ed286 (patch) | |
tree | 074dddd7e7d080173b5fc86d3cafd64502c6e009 /app/helpers | |
parent | 5307844c9a2d90410933bf0a20c95cf7e1c9f417 (diff) | |
parent | 5c17fe58fba1cb7f8c5edb336b4de0feaa6254ea (diff) |
Merge branch 'icons-update-nav-bars' into 'master'
Updated All Navigation Icons to Sprite_Icons
See merge request gitlab-org/gitlab-ce!14559
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/breadcrumbs_helper.rb | 2 | ||||
-rw-r--r-- | app/helpers/icons_helper.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/breadcrumbs_helper.rb b/app/helpers/breadcrumbs_helper.rb index 87d2a47f6cb..e88fe6bcd7e 100644 --- a/app/helpers/breadcrumbs_helper.rb +++ b/app/helpers/breadcrumbs_helper.rb @@ -21,7 +21,7 @@ module BreadcrumbsHelper def breadcrumb_list_item(link) content_tag "li" do - link + icon("angle-right", class: "breadcrumbs-list-angle") + link + sprite_icon("angle-right", size: 8, css_class: "breadcrumbs-list-angle") end end diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb index 08e6443bd0f..ec779c1c447 100644 --- a/app/helpers/icons_helper.rb +++ b/app/helpers/icons_helper.rb @@ -24,9 +24,9 @@ module IconsHelper end def sprite_icon(icon_name, size: nil, css_class: nil) - css_classes = size ? "s#{size}" : nil + css_classes = size ? "s#{size}" : "" css_classes << " #{css_class}" unless css_class.blank? - content_tag(:svg, content_tag(:use, "", { "xlink:href" => "#{image_path('icons.svg')}##{icon_name}" } ), class: css_classes) + content_tag(:svg, content_tag(:use, "", { "xlink:href" => "#{image_path('icons.svg')}##{icon_name}" } ), class: css_classes.empty? ? nil : css_classes) end def audit_icon(names, options = {}) |