From 8d810f5eeff0a11c593cb4e4a4bef2f66a7f622e Mon Sep 17 00:00:00 2001
From: Justin Ho <hduong@gitlab.com>
Date: Fri, 1 Jul 2022 16:39:00 +0700
Subject: [PATCH] Fix status box styling on Jira issue details page
Also cleanup issuable header for external author
Changelog: changed
---
.../issuable/show/components/issuable_header.vue | 10 ++++++----
.../issues_show/components/jira_issues_show_root.vue | 7 ++++++-
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/app/assets/javascripts/vue_shared/issuable/show/components/issuable_header.vue b/app/assets/javascripts/vue_shared/issuable/show/components/issuable_header.vue
index f035795a04588..cdc5903b9348f 100644
--- a/app/assets/javascripts/vue_shared/issuable/show/components/issuable_header.vue
+++ b/app/assets/javascripts/vue_shared/issuable/show/components/issuable_header.vue
@@ -112,7 +112,7 @@ export default {
<gl-icon v-if="statusIcon" :name="statusIcon" :class="statusIconClass" />
<span class="gl-display-none gl-sm-display-block"><slot name="status-badge"></slot></span>
</gl-badge>
- <div class="issuable-meta gl-display-flex gl-align-items-center d-md-inline-block">
+ <div class="issuable-meta gl-display-flex! gl-align-items-center">
<div v-if="blocked || confidential" class="gl-display-inline-block">
<div v-if="blocked" data-testid="blocked" class="issuable-warning-icon inline">
<gl-icon name="lock" :aria-label="__('Blocked')" />
@@ -139,13 +139,15 @@ export default {
:size="24"
:src="author.avatarUrl"
:label="author.name"
- class="d-none d-sm-inline-flex gl-mx-1"
+ :class="[{ 'gl-display-none': !isAuthorExternal }, 'gl-sm-display-inline-flex gl-mx-1']"
>
<template #meta>
- <gl-icon v-if="isAuthorExternal" name="external-link" />
+ <gl-icon v-if="isAuthorExternal" name="external-link" class="gl-ml-1" />
</template>
</gl-avatar-labeled>
- <strong class="author d-sm-none d-inline">@{{ author.username }}</strong>
+ <strong v-if="author.username" class="author gl-display-inline gl-sm-display-none!"
+ >@{{ author.username }}</strong
+ >
</gl-avatar-link>
<span
v-if="taskCompletionStatus && hasTasks"
diff --git a/ee/app/assets/javascripts/integrations/jira/issues_show/components/jira_issues_show_root.vue b/ee/app/assets/javascripts/integrations/jira/issues_show/components/jira_issues_show_root.vue
index efc71ecae9736..66e98fe20bd5a 100644
--- a/ee/app/assets/javascripts/integrations/jira/issues_show/components/jira_issues_show_root.vue
+++ b/ee/app/assets/javascripts/integrations/jira/issues_show/components/jira_issues_show_root.vue
@@ -83,7 +83,12 @@ export default {
<template v-else>
<external-issue-alert issue-tracker-name="Jira" :issue-url="issue.webUrl" />
- <issuable-show :issuable="issue" :enable-edit="false" :status-icon="statusIcon">
+ <issuable-show
+ :issuable="issue"
+ :enable-edit="false"
+ :status-icon="statusIcon"
+ status-icon-class="gl-sm-display-none"
+ >
<template #status-badge>{{ statusBadgeText }}</template>
<template #right-sidebar-items="{ sidebarExpanded, toggleSidebar }">
--
GitLab