Skip to content
代码片段 群组 项目
提交 60acf3b6 编辑于 作者: Robert Hunt's avatar Robert Hunt
浏览文件

Merge branch '363468-fix-status-box-jira-issue-details-page' into 'master'

Fix status box styling on Jira issue details page

See merge request gitlab-org/gitlab!91567
No related branches found
No related tags found
无相关合并请求
...@@ -112,7 +112,7 @@ export default { ...@@ -112,7 +112,7 @@ export default {
<gl-icon v-if="statusIcon" :name="statusIcon" :class="statusIconClass" /> <gl-icon v-if="statusIcon" :name="statusIcon" :class="statusIconClass" />
<span class="gl-display-none gl-sm-display-block"><slot name="status-badge"></slot></span> <span class="gl-display-none gl-sm-display-block"><slot name="status-badge"></slot></span>
</gl-badge> </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 || confidential" class="gl-display-inline-block">
<div v-if="blocked" data-testid="blocked" class="issuable-warning-icon inline"> <div v-if="blocked" data-testid="blocked" class="issuable-warning-icon inline">
<gl-icon name="lock" :aria-label="__('Blocked')" /> <gl-icon name="lock" :aria-label="__('Blocked')" />
...@@ -139,13 +139,15 @@ export default { ...@@ -139,13 +139,15 @@ export default {
:size="24" :size="24"
:src="author.avatarUrl" :src="author.avatarUrl"
:label="author.name" :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> <template #meta>
<gl-icon v-if="isAuthorExternal" name="external-link" /> <gl-icon v-if="isAuthorExternal" name="external-link" class="gl-ml-1" />
</template> </template>
</gl-avatar-labeled> </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> </gl-avatar-link>
<span <span
v-if="taskCompletionStatus && hasTasks" v-if="taskCompletionStatus && hasTasks"
......
...@@ -83,7 +83,12 @@ export default { ...@@ -83,7 +83,12 @@ export default {
<template v-else> <template v-else>
<external-issue-alert issue-tracker-name="Jira" :issue-url="issue.webUrl" /> <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 #status-badge>{{ statusBadgeText }}</template>
<template #right-sidebar-items="{ sidebarExpanded, toggleSidebar }"> <template #right-sidebar-items="{ sidebarExpanded, toggleSidebar }">
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册