diff options
| author | Paul Slaughter <pslaughter@gitlab.com> | 2018-08-14 08:57:16 -0500 |
|---|---|---|
| committer | Paul Slaughter <pslaughter@gitlab.com> | 2018-08-21 08:20:38 -0500 |
| commit | 093690d0b77c37383ef6660c7c8231135260efc3 (patch) | |
| tree | 9b1c6435fb8cc30a5671c04bb3552a7c9127890b | |
| parent | df567ddb40f2ee89e78a742417e0599c12d6f2a8 (diff) | |
| download | gitlab-ce-093690d0b77c37383ef6660c7c8231135260efc3.tar.gz | |
Update MR deployment to use .label-truncate with .deploy-link
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/deployment.vue | 22 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 3 |
2 files changed, 18 insertions, 7 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue index 21f21232596..d530ab2767b 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue @@ -1,5 +1,6 @@ <script> import Icon from '~/vue_shared/components/icon.vue'; +import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue'; import timeagoMixin from '../../vue_shared/mixins/timeago'; import tooltip from '../../vue_shared/directives/tooltip'; import LoadingButton from '../../vue_shared/components/loading_button.vue'; @@ -16,6 +17,7 @@ export default { MemoryUsage, StatusIcon, Icon, + TooltipOnTruncate, }, directives: { tooltip, @@ -88,14 +90,20 @@ export default { <span> Deployed to </span> - <a - :href="deployment.url" - target="_blank" - rel="noopener noreferrer nofollow" - class="deploy-link js-deploy-meta" + <tooltip-on-truncate + :title="deployment.name" + truncate-target="child" + class="deploy-link label-truncate" > - {{ deployment.name }} - </a> + <a + :href="deployment.url" + target="_blank" + rel="noopener noreferrer nofollow" + class="js-deploy-meta" + > + {{ deployment.name }} + </a> + </tooltip-on-truncate> </template> <span v-tooltip diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index ea16fa78384..bf0928385d7 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -237,7 +237,10 @@ font-weight: normal; overflow: hidden; word-break: break-all; + } + .deploy-link, + .label-branch { &.label-truncate { // NOTE: This selector targets its children because some of the HTML comes from // 'source_branch_link'. Once this external HTML is no longer used, we could |