Commit 9a865445 authored by Fatih Acet's avatar Fatih Acet

IssueNotesRefactor: Move edit button out the dropdown.

Fix note action buttons spacing.
parent 7c491d4f
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
import emojiSmiley from 'icons/_emoji_smiley.svg'; import emojiSmiley from 'icons/_emoji_smiley.svg';
import loadingIcon from '../../vue_shared/components/loading_icon.vue'; import loadingIcon from '../../vue_shared/components/loading_icon.vue';
import tooltip from '../../vue_shared/directives/tooltip'; import tooltip from '../../vue_shared/directives/tooltip';
import editSvg from 'icons/_icon_pencil.svg';
import ellipsisSvg from 'icons/_ellipsis_v.svg';
export default { export default {
name: 'issueNoteActions', name: 'issueNoteActions',
...@@ -74,6 +76,8 @@ ...@@ -74,6 +76,8 @@
this.emojiSmiling = emojiSmiling; this.emojiSmiling = emojiSmiling;
this.emojiSmile = emojiSmile; this.emojiSmile = emojiSmile;
this.emojiSmiley = emojiSmiley; this.emojiSmiley = emojiSmiley;
this.editSvg = editSvg;
this.ellipsisSvg = ellipsisSvg;
}, },
}; };
</script> </script>
...@@ -83,12 +87,15 @@ ...@@ -83,12 +87,15 @@
<span <span
v-if="accessLevel" v-if="accessLevel"
class="note-role">{{accessLevel}}</span> class="note-role">{{accessLevel}}</span>
<div class="note-actions-item">
<a <a
v-tooltip v-tooltip
v-if="canAddAwardEmoji" v-if="canAddAwardEmoji"
:class="{ 'js-user-authored': isAuthoredByCurrentUser }" :class="{ 'js-user-authored': isAuthoredByCurrentUser }"
class="note-action-button note-emoji-button js-add-award js-note-emoji" class="note-action-button note-emoji-button js-add-award js-note-emoji"
data-position="right" data-position="right"
data-placement="bottom"
data-container="body"
href="#" href="#"
title="Add reaction"> title="Add reaction">
<loading-icon :inline="true" /> <loading-icon :inline="true" />
...@@ -105,33 +112,37 @@ ...@@ -105,33 +112,37 @@
class="link-highlight award-control-icon-super-positive"> class="link-highlight award-control-icon-super-positive">
</span> </span>
</a> </a>
</div>
<div class="note-actions-item">
<button
@click="onEdit"
v-tooltip
type="button"
title="Edit comment"
class="note-action-button js-note-edit btn btn-transparent"
data-container="body"
data-placement="bottom">
<span
v-html="editSvg"
class="link-highlight"></span>
</button>
</div>
<div <div
v-if="shouldShowActionsDropdown" v-if="shouldShowActionsDropdown"
class="dropdown more-actions"> class="dropdown more-actions note-actions-item">
<button <button
v-tooltip v-tooltip
type="button" type="button"
title="More actions" title="More actions"
class="note-action-button more-actions-toggle btn btn-transparent" class="note-action-button more-actions-toggle btn btn-transparent"
data-toggle="dropdown" data-toggle="dropdown"
data-container="body"> data-container="body"
<i data-placement="bottom">
aria-hidden="true" <span
class="fa fa-ellipsis-v icon"> class="icon"
</i> v-html="ellipsisSvg"></span>
</button> </button>
<ul class="dropdown-menu more-actions-dropdown dropdown-open-left"> <ul class="dropdown-menu more-actions-dropdown dropdown-open-left">
<template v-if="canEdit">
<li>
<button
@click="onEdit"
type="button"
class="btn btn-transparent js-note-edit">
Edit comment
</button>
</li>
<li class="divider"></li>
</template>
<li v-if="canReportAsAbuse"> <li v-if="canReportAsAbuse">
<a :href="reportAbusePath"> <a :href="reportAbusePath">
Report as abuse Report as abuse
......
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