Commit 250783d1 authored by Frédéric Caplette's avatar Frédéric Caplette

Merge branch 'job-names-auto-width' into 'master'

Design: Pipelines show full job names

See merge request gitlab-org/gitlab!74879
parents 9aadeffd f6737193
...@@ -67,7 +67,7 @@ export default { ...@@ -67,7 +67,7 @@ export default {
:class="cssClassJobName" :class="cssClassJobName"
class="dropdown-menu-toggle gl-pipeline-job-width! gl-pr-4!" class="dropdown-menu-toggle gl-pipeline-job-width! gl-pr-4!"
> >
<div class="gl-display-flex gl-align-items-center gl-justify-content-space-between"> <div class="gl-display-flex gl-align-items-stretch gl-justify-content-space-between">
<job-item <job-item
:type="$options.jobItemTypes.jobDropdown" :type="$options.jobItemTypes.jobDropdown"
:group-tooltip="tooltipText" :group-tooltip="tooltipText"
......
...@@ -203,7 +203,7 @@ export default { ...@@ -203,7 +203,7 @@ export default {
<template> <template>
<div <div
:id="computedJobId" :id="computedJobId"
class="ci-job-component gl-display-flex gl-align-items-center gl-justify-content-space-between gl-w-full" class="ci-job-component gl-display-flex gl-justify-content-space-between gl-pipeline-job-width"
data-qa-selector="job_item_container" data-qa-selector="job_item_container"
> >
<component <component
...@@ -223,12 +223,12 @@ export default { ...@@ -223,12 +223,12 @@ export default {
> >
<div class="ci-job-name-component gl-display-flex gl-align-items-center"> <div class="ci-job-name-component gl-display-flex gl-align-items-center">
<ci-icon :size="24" :status="job.status" class="gl-line-height-0" /> <ci-icon :size="24" :status="job.status" class="gl-line-height-0" />
<div class="gl-pl-3 gl-display-flex gl-flex-direction-column gl-w-full"> <div class="gl-pl-3 gl-pr-3 gl-display-flex gl-flex-direction-column gl-pipeline-job-width">
<div class="gl-text-truncate gl-w-70p gl-line-height-normal">{{ job.name }}</div> <div class="gl-text-truncate gl-pr-9 gl-line-height-normal">{{ job.name }}</div>
<div <div
v-if="showStageName" v-if="showStageName"
data-testid="stage-name-in-job" data-testid="stage-name-in-job"
class="gl-text-truncate gl-w-70p gl-font-sm gl-text-gray-500 gl-line-height-normal" class="gl-text-truncate gl-pr-9 gl-font-sm gl-text-gray-500 gl-line-height-normal"
> >
{{ stageName }} {{ stageName }}
</div> </div>
......
...@@ -124,7 +124,7 @@ export default { ...@@ -124,7 +124,7 @@ export default {
<div <div
ref="linkedPipeline" ref="linkedPipeline"
v-gl-tooltip v-gl-tooltip
class="gl-pipeline-job-width" class="gl-downstream-pipeline-job-width"
:title="tooltipText" :title="tooltipText"
data-qa-selector="child_pipeline" data-qa-selector="child_pipeline"
@mouseover="onDownstreamHovered" @mouseover="onDownstreamHovered"
...@@ -134,7 +134,7 @@ export default { ...@@ -134,7 +134,7 @@ export default {
class="gl-relative gl-bg-white gl-p-3 gl-border-solid gl-border-gray-100 gl-border-1" class="gl-relative gl-bg-white gl-p-3 gl-border-solid gl-border-gray-100 gl-border-1"
:class="{ 'gl-pl-9': isUpstream }" :class="{ 'gl-pl-9': isUpstream }"
> >
<div class="gl-display-flex"> <div class="gl-display-flex gl-pr-7 gl-pipeline-job-width">
<ci-status <ci-status
v-if="!pipelineIsLoading" v-if="!pipelineIsLoading"
:status="pipelineStatus" :status="pipelineStatus"
...@@ -142,7 +142,9 @@ export default { ...@@ -142,7 +142,9 @@ export default {
css-classes="gl-top-0 gl-pr-2" css-classes="gl-top-0 gl-pr-2"
/> />
<div v-else class="gl-pr-2"><gl-loading-icon size="sm" inline /></div> <div v-else class="gl-pr-2"><gl-loading-icon size="sm" inline /></div>
<div class="gl-display-flex gl-flex-direction-column gl-w-13"> <div
class="gl-display-flex gl-flex-direction-column gl-pipeline-job-width gl-text-truncate"
>
<span class="gl-text-truncate" data-testid="downstream-title"> <span class="gl-text-truncate" data-testid="downstream-title">
{{ downstreamTitle }} {{ downstreamTitle }}
</span> </span>
......
...@@ -25,7 +25,7 @@ export default { ...@@ -25,7 +25,7 @@ export default {
// The max width and the width make sure the ellipsis to work and the min width // The max width and the width make sure the ellipsis to work and the min width
// is for when there is less text than the stage column width (which the width 100% does not fix) // is for when there is less text than the stage column width (which the width 100% does not fix)
jobWrapperClasses: jobWrapperClasses:
'gl-display-flex gl-flex-direction-column gl-align-items-center gl-w-full gl-px-8 gl-min-w-full gl-max-w-15', 'gl-display-flex gl-flex-direction-column gl-align-items-stretch gl-w-full gl-px-8 gl-min-w-full gl-max-w-15',
props: { props: {
pipelineData: { pipelineData: {
required: true, required: true,
......
...@@ -113,8 +113,8 @@ ...@@ -113,8 +113,8 @@
- mini graph in Commit widget pipeline - mini graph in Commit widget pipeline
*/ */
@mixin pipeline-graph-dropdown-menu() { @mixin pipeline-graph-dropdown-menu() {
width: 240px; width: auto;
max-width: 240px; max-width: 400px;
// override dropdown.scss // override dropdown.scss
&.dropdown-menu li button, &.dropdown-menu li button,
...@@ -185,8 +185,6 @@ ...@@ -185,8 +185,6 @@
} }
.ci-status-icon { .ci-status-icon {
@include gl-mr-3;
position: relative; position: relative;
> svg { > svg {
......
...@@ -129,11 +129,17 @@ ...@@ -129,11 +129,17 @@
} }
.gl-pipeline-job-width { .gl-pipeline-job-width {
width: 186px; width: 100%;
max-width: 400px;
} }
.gl-pipeline-job-width\! { .gl-pipeline-job-width\! {
width: 186px !important; width: 100% !important;
max-width: 400px !important;
}
.gl-downstream-pipeline-job-width {
width: 240px;
} }
.gl-linked-pipeline-padding { .gl-linked-pipeline-padding {
...@@ -199,7 +205,6 @@ ...@@ -199,7 +205,6 @@
.big-pipeline-graph-dropdown-menu { .big-pipeline-graph-dropdown-menu {
@include pipeline-graph-dropdown-menu(); @include pipeline-graph-dropdown-menu();
width: 195px;
min-width: 195px; min-width: 195px;
left: 100%; left: 100%;
top: -10px; top: -10px;
......
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