Commit a675cc81 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'Resolve-Migrate-.fa-spinner-app/views/projects/notes' into 'master'

Resolve Migrate '.fa-spinner' to '.spinner' for 'app/views/projects/notes'

See merge request gitlab-org/gitlab!25015
parents ab614380 5ce1b52f
...@@ -29,8 +29,7 @@ ...@@ -29,8 +29,7 @@
":title" => "buttonText", ":title" => "buttonText",
":ref" => "'button'" } ":ref" => "'button'" }
= icon('spin spinner', 'v-if' => 'loading', class: 'loading', 'aria-hidden' => 'true', 'aria-label' => 'Loading') %div
%div{ 'v-else' => '' }
%template{ 'v-if' => 'isResolved' } %template{ 'v-if' => 'isResolved' }
= render 'shared/icons/icon_status_success_solid.svg' = render 'shared/icons/icon_status_success_solid.svg'
%template{ 'v-else' => '' } %template{ 'v-else' => '' }
...@@ -40,7 +39,6 @@ ...@@ -40,7 +39,6 @@
- if note.emoji_awardable? - if note.emoji_awardable?
.note-actions-item .note-actions-item
= button_tag title: 'Add reaction', class: "note-action-button note-emoji-button js-add-award js-note-emoji has-tooltip btn btn-transparent", data: { position: 'right', container: 'body' } do = button_tag title: 'Add reaction', class: "note-action-button note-emoji-button js-add-award js-note-emoji has-tooltip btn btn-transparent", data: { position: 'right', container: 'body' } do
= icon('spinner spin')
%span{ class: 'link-highlight award-control-icon-neutral' }= sprite_icon('slight-smile') %span{ class: 'link-highlight award-control-icon-neutral' }= sprite_icon('slight-smile')
%span{ class: 'link-highlight award-control-icon-positive' }= sprite_icon('smiley') %span{ class: 'link-highlight award-control-icon-positive' }= sprite_icon('smiley')
%span{ class: 'link-highlight award-control-icon-super-positive' }= sprite_icon('smile') %span{ class: 'link-highlight award-control-icon-super-positive' }= sprite_icon('smile')
......
---
title: Remove spinner from app/views/projects/notes
merge_request: 25015
author: nuwe1
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment