Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-05-12 18:08:59 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-05-12 18:08:59 +0300
commit0024c2f44455cf5ace9235a7efa195c12a1d72d2 (patch)
tree72d2e7d8f03fd479b8b3ca9915d12d116d37948f /app/assets/javascripts/issuable
parentcb3b9f9243555b0c26145e2992a9f01f7fa47bf5 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/issuable')
-rw-r--r--app/assets/javascripts/issuable/components/issuable_header_warnings.vue7
1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/issuable/components/issuable_header_warnings.vue b/app/assets/javascripts/issuable/components/issuable_header_warnings.vue
index 7f313086fca..06d1a2ee233 100644
--- a/app/assets/javascripts/issuable/components/issuable_header_warnings.vue
+++ b/app/assets/javascripts/issuable/components/issuable_header_warnings.vue
@@ -63,8 +63,11 @@ export default {
v-gl-tooltip
:data-testid="meta.dataTestId"
:title="meta.tooltip || null"
- :class="{ 'gl-mr-3 gl-mt-2': isMergeRequest }"
- class="issuable-warning-icon gl-display-flex gl-justify-content-center gl-align-items-center"
+ :class="{
+ 'gl-mr-3 gl-mt-2 gl-display-flex gl-justify-content-center gl-align-items-center': isMergeRequest,
+ 'gl-display-inline-block': !isMergeRequest,
+ }"
+ class="issuable-warning-icon"
>
<gl-icon :name="meta.iconName" class="icon" />
</div>