diff options
Diffstat (limited to 'app/helpers/icons_helper.rb')
| -rw-r--r-- | app/helpers/icons_helper.rb | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb index 6f7ac069fe4..c81041c2d9c 100644 --- a/app/helpers/icons_helper.rb +++ b/app/helpers/icons_helper.rb @@ -42,7 +42,7 @@ module IconsHelper content_tag( :svg, - content_tag(:use, '', { 'href' => "#{sprite_icon_path}##{icon_name}" } ), + content_tag(:use, '', { 'href' => "#{sprite_icon_path}##{icon_name}" }), class: css_classes.empty? ? nil : css_classes.join(' '), data: { testid: "#{icon_name}-icon" } ) @@ -70,18 +70,14 @@ module IconsHelper # gl_loading_icon(css_class: "foo-bar") # # See also https://gitlab-org.gitlab.io/gitlab-ui/?path=/story/base-loading-icon--default - def gl_loading_icon(inline: false, color: 'dark', size: 'sm', css_class: nil) - spinner = content_tag(:span, "", { - class: %[gl-spinner gl-spinner-#{color} gl-spinner-#{size} gl-vertical-align-text-bottom!], - aria: { label: _('Loading') } - }) - - container_classes = ['gl-spinner-container'] - container_classes << css_class unless css_class.blank? - content_tag(inline ? :span : :div, spinner, { - class: container_classes, - role: 'status' - }) + def gl_loading_icon(inline: false, color: 'dark', size: 'sm', css_class: nil, data: nil) + render Pajamas::SpinnerComponent.new( + inline: inline, + color: color, + size: size, + class: css_class, + data: data + ) end def external_snippet_icon(name) |