kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '64608-double-tooltips' into 'master'

Browse source 
Prevents showing 2 tooltips in pipelines

Closes #64608

See merge request gitlab-org/gitlab-ce!31521
This commit is contained in:
Annabel Dunstone Gray 2019-08-06 17:49:18 +00:00
commit f64a84b265
3 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/assets/javascripts/vue_shared/components/commit.vue
View file

@ -152,37 +152,35 @@ export default {
:href="mergeRequestRef.path" :href="mergeRequestRef.path"
:title="mergeRequestRef.title" :title="mergeRequestRef.title"
class="ref-name" class="ref-name"
>{{ mergeRequestRef.iid }}</gl-link
> >
{{ mergeRequestRef.iid }}
</gl-link>
<gl-link <gl-link
v-else v-else
v-gl-tooltip v-gl-tooltip
:href="commitRef.ref_url" :href="commitRef.ref_url"
:title="commitRef.name" :title="commitRef.name"
class="ref-name" class="ref-name"
>{{ commitRef.name }}</gl-link
> >
{{ commitRef.name }}
</gl-link>
</template> </template>
<icon name="commit" class="commit-icon js-commit-icon" /> <icon name="commit" class="commit-icon js-commit-icon" />
<gl-link :href="commitUrl" class="commit-sha mr-0"> {{ shortSha }} </gl-link> <gl-link :href="commitUrl" class="commit-sha mr-0">{{ shortSha }}</gl-link>
<div class="commit-title flex-truncate-parent"> <div class="commit-title">
<tooltip-on-truncate v-if="title" class="flex-truncate-child" :title="title"> <span v-if="title" class="flex-truncate-parent">
<user-avatar-link <user-avatar-link
v-if="hasAuthor" v-if="hasAuthor"
:link-href="author.path" :link-href="author.path"
:img-src="author.avatar_url" :img-src="author.avatar_url"
:img-alt="userImageAltDescription" :img-alt="userImageAltDescription"
:tooltip-text="author.username" :tooltip-text="author.username"
class="avatar-image-container" class="avatar-image-container text-decoration-none"
/> />
<gl-link :href="commitUrl" class="commit-row-message cgray"> <tooltip-on-truncate :title="title" class="flex-truncate-child">
{{ title }} <gl-link :href="commitUrl" class="commit-row-message cgray">{{ title }}</gl-link>
</gl-link> </tooltip-on-truncate>
</tooltip-on-truncate> </span>
<span v-else>{{ __("Can't find HEAD commit for this branch") }}</span> <span v-else>{{ __("Can't find HEAD commit for this branch") }}</span>
</div> </div>
</div> </div>

2
app/assets/stylesheets/framework/responsive_tables.scss
View file

@ -155,7 +155,7 @@
text-overflow: ellipsis; text-overflow: ellipsis;
@include media-breakpoint-up(md) { @include media-breakpoint-up(md) {
flex: 0 0 90%; flex: 0 0 85%;
} }
.avatar { .avatar {

5
changelogs/unreleased/64608-double-tooltips.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Prevents showing 2 tooltips in pipelines table
merge_request:
author:
type: fixed