diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-03 00:06:22 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-03 00:06:22 +0300 |
| commit | 6d60f910762c1a92a07a4afaf1b26962f75ee4b6 (patch) | |
| tree | 0a9ef6ccb20aa2099df33a409723eb912f8029e3 /app/assets/javascripts/notes | |
| parent | de2ae3154f4ba1c23eeaa4ace41177ecd9b6005a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
| -rw-r--r-- | app/assets/javascripts/notes/components/note_actions.vue | 10 | ||||
| -rw-r--r-- | app/assets/javascripts/notes/components/note_actions/reply_button.vue | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/notes/components/note_actions.vue b/app/assets/javascripts/notes/components/note_actions.vue index 6cc873359da..89d434a60ba 100644 --- a/app/assets/javascripts/notes/components/note_actions.vue +++ b/app/assets/javascripts/notes/components/note_actions.vue @@ -149,9 +149,9 @@ export default { title="Add reaction" data-position="right" > - <icon css-classes="link-highlight award-control-icon-neutral" name="slight-smile" /> - <icon css-classes="link-highlight award-control-icon-positive" name="smiley" /> - <icon css-classes="link-highlight award-control-icon-super-positive" name="smiley" /> + <icon class="link-highlight award-control-icon-neutral" name="slight-smile" /> + <icon class="link-highlight award-control-icon-positive" name="smiley" /> + <icon class="link-highlight award-control-icon-super-positive" name="smiley" /> </a> </div> <reply-button @@ -168,7 +168,7 @@ export default { class="note-action-button js-note-edit btn btn-transparent qa-note-edit-button" @click="onEdit" > - <icon name="pencil" css-classes="link-highlight" /> + <icon name="pencil" class="link-highlight" /> </button> </div> <div v-if="showDeleteAction" class="note-actions-item"> @@ -191,7 +191,7 @@ export default { data-toggle="dropdown" @click="closeTooltip" > - <icon css-classes="icon" name="ellipsis_v" /> + <icon class="icon" name="ellipsis_v" /> </button> <ul class="dropdown-menu more-actions-dropdown dropdown-open-left"> <li v-if="canReportAsAbuse"> diff --git a/app/assets/javascripts/notes/components/note_actions/reply_button.vue b/app/assets/javascripts/notes/components/note_actions/reply_button.vue index 8bdee759a23..20551279aec 100644 --- a/app/assets/javascripts/notes/components/note_actions/reply_button.vue +++ b/app/assets/javascripts/notes/components/note_actions/reply_button.vue @@ -26,7 +26,7 @@ export default { :title="__('Reply to comment')" @click="$emit('startReplying')" > - <icon name="comment" css-classes="link-highlight" /> + <icon name="comment" class="link-highlight" /> </gl-button> </div> </template> |