Skip to content
代码片段 群组 项目
提交 f735fda1 编辑于 作者: David Pisek's avatar David Pisek
浏览文件

Merge branch '433271-fix-mr-widget-ui-issues' into 'master'

No related branches found
No related tags found
无相关合并请求
...@@ -72,10 +72,14 @@ export default { ...@@ -72,10 +72,14 @@ export default {
:widget-name="widgetName" :widget-name="widgetName"
:header="data.header" :header="data.header"
:help-popover="data.helpPopover" :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> <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">
<div class="gl-display-flex gl-flex-grow-1 gl-align-items-baseline"> <div class="gl-display-flex gl-flex-grow-1 gl-align-items-baseline">
<div> <div>
......
...@@ -81,8 +81,7 @@ export default { ...@@ -81,8 +81,7 @@ export default {
<div <div
class="gl-display-flex" class="gl-display-flex"
:class="{ :class="{
'gl-border-t gl-py-3 gl-pl-7 gl-align-items-baseline': level === 2, 'gl-border-t gl-py-3 gl-pl-7': level === 2,
'gl-align-items-center': level === 3,
}" }"
> >
<status-icon <status-icon
......
...@@ -49,7 +49,7 @@ exports[`~/vue_merge_request_widget/components/widget/dynamic_content.vue render ...@@ -49,7 +49,7 @@ exports[`~/vue_merge_request_widget/components/widget/dynamic_content.vue render
name="MyWidget" name="MyWidget"
/> />
<div <div
class="gl-display-flex gl-w-full" class="gl-display-flex gl-flex-direction-column gl-w-full"
> >
<div <div
class="gl-display-flex gl-flex-grow-1" class="gl-display-flex gl-flex-grow-1"
...@@ -88,7 +88,7 @@ exports[`~/vue_merge_request_widget/components/widget/dynamic_content.vue render ...@@ -88,7 +88,7 @@ exports[`~/vue_merge_request_widget/components/widget/dynamic_content.vue render
> >
<li> <li>
<div <div
class="gl-align-items-center gl-display-flex" class="gl-align-items-baseline gl-display-flex"
> >
<div <div
class="gl-min-w-0 gl-w-full" class="gl-min-w-0 gl-w-full"
...@@ -110,7 +110,7 @@ exports[`~/vue_merge_request_widget/components/widget/dynamic_content.vue render ...@@ -110,7 +110,7 @@ exports[`~/vue_merge_request_widget/components/widget/dynamic_content.vue render
class="gl-align-items-baseline gl-display-flex" class="gl-align-items-baseline gl-display-flex"
> >
<div <div
class="gl-display-flex gl-w-full" class="gl-display-flex gl-flex-direction-column gl-w-full"
> >
<div <div
class="gl-display-flex gl-flex-grow-1" class="gl-display-flex gl-flex-grow-1"
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册