summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue
diff options
context:
space:
mode:
authorPaul Slaughter <pslaughter@gitlab.com>2018-11-29 16:57:30 -0600
committerPaul Slaughter <pslaughter@gitlab.com>2018-11-30 08:17:13 -0600
commit75d94c4cd0a31962c604e3632e3d80709b549e6f (patch)
treeef0566f5797118b6374c96bdff2057ebae9a68bb /app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue
parent77c26777357d3a8a1fa9f7c9d9a9e9cd956029f3 (diff)
downloadgitlab-ce-75d94c4cd0a31962c604e3632e3d80709b549e6f.tar.gz
Redesign of MR header sections (CE Port)
- https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8593 - Create mr-widget-icon to encapsulate circle icons - Decouple workflow L&F from mr-widget-heading - Decouple container L&F from mr-widget-heading
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue
index 6f422ea3f27..3b9fc2661ef 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue
@@ -6,6 +6,7 @@ import Icon from '~/vue_shared/components/icon.vue';
import clipboardButton from '~/vue_shared/components/clipboard_button.vue';
import tooltip from '~/vue_shared/directives/tooltip';
import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue';
+import MrWidgetIcon from './mr_widget_icon.vue';
export default {
name: 'MRWidgetHeader',
@@ -13,6 +14,7 @@ export default {
Icon,
clipboardButton,
TooltipOnTruncate,
+ MrWidgetIcon,
},
directives: {
tooltip,
@@ -76,7 +78,7 @@ export default {
</script>
<template>
<div class="mr-source-target append-bottom-default">
- <div class="git-merge-icon-container append-right-default"><icon name="git-merge" /></div>
+ <mr-widget-icon name="git-merge" />
<div class="git-merge-container d-flex">
<div class="normal">
<strong>