Commit 2ad5b30b authored by Mike Greiling's avatar Mike Greiling

Merge branch '61821-tooltip-consistency' into 'master'

Resolve "Tooltip Consistency"

Closes #61821

See merge request gitlab-org/gitlab-ce!28839
parents 15916ad5 3c6dc87e
...@@ -254,16 +254,17 @@ export default { ...@@ -254,16 +254,17 @@ export default {
<diff-stats :added-lines="diffFile.added_lines" :removed-lines="diffFile.removed_lines" /> <diff-stats :added-lines="diffFile.added_lines" :removed-lines="diffFile.removed_lines" />
<div class="btn-group" role="group"> <div class="btn-group" role="group">
<template v-if="diffFile.blob && diffFile.blob.readable_text"> <template v-if="diffFile.blob && diffFile.blob.readable_text">
<button <span v-gl-tooltip.hover :title="s__('MergeRequests|Toggle comments for this file')">
<gl-button
:disabled="!diffHasDiscussions(diffFile)" :disabled="!diffHasDiscussions(diffFile)"
:class="{ active: hasExpandedDiscussions }" :class="{ active: hasExpandedDiscussions }"
:title="s__('MergeRequests|Toggle comments for this file')"
class="js-btn-vue-toggle-comments btn" class="js-btn-vue-toggle-comments btn"
type="button" type="button"
@click="handleToggleDiscussions" @click="handleToggleDiscussions"
> >
<icon name="comment" /> <icon name="comment" />
</button> </gl-button>
</span>
<edit-button <edit-button
v-if="!diffFile.deleted_file" v-if="!diffFile.deleted_file"
......
...@@ -38,7 +38,7 @@ export default { ...@@ -38,7 +38,7 @@ export default {
<template> <template>
<gl-button <gl-button
v-gl-tooltip.bottom v-gl-tooltip.top
:href="editPath" :href="editPath"
:title="__('Edit file')" :title="__('Edit file')"
class="js-edit-blob" class="js-edit-blob"
......
---
title: Resolve Tooltip Consistency
merge_request: 28839
author:
type: fixed
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