Commit 3d153622 authored by Phil Hughes's avatar Phil Hughes

Merge branch '42922-environment-name' into 'master'

Resolve "Add tooltip in enviroments names"

Closes #42922

See merge request gitlab-org/gitlab-ce!17029
parents 595bc740 369d18cb
<script> <script>
import Timeago from 'timeago.js'; import Timeago from 'timeago.js';
import _ from 'underscore'; import _ from 'underscore';
import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue'; import tooltip from '~/vue_shared/directives/tooltip';
import { humanize } from '../../lib/utils/text_utility'; import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
import { humanize } from '~/lib/utils/text_utility';
import ActionsComponent from './environment_actions.vue'; import ActionsComponent from './environment_actions.vue';
import ExternalUrlComponent from './environment_external_url.vue'; import ExternalUrlComponent from './environment_external_url.vue';
import StopComponent from './environment_stop.vue'; import StopComponent from './environment_stop.vue';
...@@ -21,14 +22,18 @@ ...@@ -21,14 +22,18 @@
export default { export default {
components: { components: {
userAvatarLink, UserAvatarLink,
'commit-component': CommitComponent, CommitComponent,
'actions-component': ActionsComponent, ActionsComponent,
'external-url-component': ExternalUrlComponent, ExternalUrlComponent,
'stop-component': StopComponent, StopComponent,
'rollback-component': RollbackComponent, RollbackComponent,
'terminal-button-component': TerminalButtonComponent, TerminalButtonComponent,
'monitoring-button-component': MonitoringButtonComponent, MonitoringButtonComponent,
},
directives: {
tooltip,
}, },
props: { props: {
...@@ -443,7 +448,11 @@ ...@@ -443,7 +448,11 @@
v-if="!model.isFolder" v-if="!model.isFolder"
class="environment-name flex-truncate-parent table-mobile-content" class="environment-name flex-truncate-parent table-mobile-content"
:href="environmentPath"> :href="environmentPath">
<span class="flex-truncate-child">{{ model.name }}</span> <span
class="flex-truncate-child"
v-tooltip
:title="model.name"
>{{ model.name }}</span>
</a> </a>
<span <span
v-else v-else
......
...@@ -121,6 +121,10 @@ ...@@ -121,6 +121,10 @@
width: 100%; width: 100%;
text-align: left; text-align: left;
} }
.environment-child-row {
padding-left: 20px;
}
} }
} }
......
---
title: Adds tooltip in environment names to increase readability
merge_request:
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