diff --git a/app/assets/javascripts/vue_merge_request_widget/components/widget/dynamic_content.vue b/app/assets/javascripts/vue_merge_request_widget/components/widget/dynamic_content.vue index 51c2b15668e0b200e33ac712878248dfeb2a7b40..cbc7b91922b00fd17068ad1cf03a87f885c17e6f 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/widget/dynamic_content.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/widget/dynamic_content.vue @@ -72,10 +72,14 @@ export default { :widget-name="widgetName" :header="data.header" :help-popover="data.helpPopover" - :class="{ 'gl-border-top-0': rowIndex === 0 }" + :class="{ + 'gl-border-top-0': rowIndex === 0, + 'gl-align-items-start': data.supportingText, + 'gl-align-items-baseline': !data.supportingText, + }" > <template #body> - <div class="gl-w-full gl-display-flex" :class="{ 'gl-flex-direction-column': level === 1 }"> + <div class="gl-w-full gl-display-flex gl-flex-direction-column"> <div class="gl-display-flex gl-flex-grow-1"> <div class="gl-display-flex gl-flex-grow-1 gl-align-items-baseline"> <div> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/widget/widget_content_row.vue b/app/assets/javascripts/vue_merge_request_widget/components/widget/widget_content_row.vue index bb82da7796aacddae654f3e11d131f4e1c4dbfe8..7413e2237c362c63c3f9d1185cfca6415491cb97 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/widget/widget_content_row.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/widget/widget_content_row.vue @@ -81,8 +81,7 @@ export default { <div class="gl-display-flex" :class="{ - 'gl-border-t gl-py-3 gl-pl-7 gl-align-items-baseline': level === 2, - 'gl-align-items-center': level === 3, + 'gl-border-t gl-py-3 gl-pl-7': level === 2, }" > <status-icon diff --git a/spec/frontend/vue_merge_request_widget/components/widget/__snapshots__/dynamic_content_spec.js.snap b/spec/frontend/vue_merge_request_widget/components/widget/__snapshots__/dynamic_content_spec.js.snap index eb65f790df6f4535ca2fef5fd270034f74cfda82..f2a66ad2ff20426502761752a929060a1ab8c57d 100644 --- a/spec/frontend/vue_merge_request_widget/components/widget/__snapshots__/dynamic_content_spec.js.snap +++ b/spec/frontend/vue_merge_request_widget/components/widget/__snapshots__/dynamic_content_spec.js.snap @@ -49,7 +49,7 @@ exports[`~/vue_merge_request_widget/components/widget/dynamic_content.vue render name="MyWidget" /> <div - class="gl-display-flex gl-w-full" + class="gl-display-flex gl-flex-direction-column gl-w-full" > <div class="gl-display-flex gl-flex-grow-1" @@ -88,7 +88,7 @@ exports[`~/vue_merge_request_widget/components/widget/dynamic_content.vue render > <li> <div - class="gl-align-items-center gl-display-flex" + class="gl-align-items-baseline gl-display-flex" > <div class="gl-min-w-0 gl-w-full" @@ -110,7 +110,7 @@ exports[`~/vue_merge_request_widget/components/widget/dynamic_content.vue render class="gl-align-items-baseline gl-display-flex" > <div - class="gl-display-flex gl-w-full" + class="gl-display-flex gl-flex-direction-column gl-w-full" > <div class="gl-display-flex gl-flex-grow-1"