Commit 63e76cde authored by Yogi's avatar Yogi Committed by Enrique Alcántara

Align merge conflict warning text to center in MR widget

parent bcf29d30
...@@ -162,7 +162,7 @@ export default { ...@@ -162,7 +162,7 @@ export default {
<rect x="250" y="7" width="84" height="16" rx="4" /> <rect x="250" y="7" width="84" height="16" rx="4" />
</gl-skeleton-loader> </gl-skeleton-loader>
</div> </div>
<div v-else class="media-body space-children"> <div v-else class="media-body space-children gl-display-flex gl-align-items-center">
<span v-if="shouldBeRebased" class="bold"> <span v-if="shouldBeRebased" class="bold">
{{ {{
s__(`mrWidget|Fast-forward merge is not possible. s__(`mrWidget|Fast-forward merge is not possible.
......
---
title: Align merge conflict warning text to center
merge_request: 54145
author: Yogi (@yo)
type: changed
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