Skip to content
代码片段 群组 项目
提交 51c26ca2 编辑于 作者: Natalia Tepluhina's avatar Natalia Tepluhina
浏览文件

Merge branch '365718-pmg-icon-size' into 'master'

No related branches found
No related tags found
无相关合并请求
...@@ -252,7 +252,7 @@ export default { ...@@ -252,7 +252,7 @@ export default {
@click="jobItemClick" @click="jobItemClick"
@mouseout="hideTooltips" @mouseout="hideTooltips"
> >
<div class="ci-job-name-component gl-display-flex gl-align-items-center"> <div class="gl-display-flex gl-align-items-center gl-flex-grow-1">
<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-pr-3 gl-display-flex gl-flex-direction-column gl-pipeline-job-width"> <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-pr-9 gl-line-height-normal">{{ job.name }}</div> <div class="gl-text-truncate gl-pr-9 gl-line-height-normal">{{ job.name }}</div>
......
...@@ -29,7 +29,7 @@ export default { ...@@ -29,7 +29,7 @@ export default {
}; };
</script> </script>
<template> <template>
<span class="ci-job-name-component mw-100 gl-display-flex gl-align-items-center"> <span class="mw-100 gl-display-flex gl-align-items-center gl-flex-grow-1">
<ci-icon :size="iconSize" :status="status" class="gl-line-height-0" /> <ci-icon :size="iconSize" :status="status" class="gl-line-height-0" />
<span class="gl-text-truncate mw-70p gl-pl-3 gl-display-inline-block"> <span class="gl-text-truncate mw-70p gl-pl-3 gl-display-inline-block">
{{ name }} {{ name }}
......
...@@ -163,7 +163,7 @@ export default { ...@@ -163,7 +163,7 @@ export default {
@click.stop="hideTooltips" @click.stop="hideTooltips"
@mouseout="hideTooltips" @mouseout="hideTooltips"
> >
<job-name-component :name="job.name" :status="job.status" :icon-size="24" /> <job-name-component :name="job.name" :status="job.status" />
</gl-link> </gl-link>
<div <div
...@@ -175,7 +175,7 @@ export default { ...@@ -175,7 +175,7 @@ export default {
data-testid="job-without-link" data-testid="job-without-link"
@mouseout="hideTooltips" @mouseout="hideTooltips"
> >
<job-name-component :name="job.name" :status="job.status" :icon-size="24" /> <job-name-component :name="job.name" :status="job.status" />
</div> </div>
<action-component <action-component
......
...@@ -149,7 +149,7 @@ export default { ...@@ -149,7 +149,7 @@ export default {
class="js-builds-dropdown-list scrollable-menu" class="js-builds-dropdown-list scrollable-menu"
data-testid="mini-pipeline-graph-dropdown-menu-list" data-testid="mini-pipeline-graph-dropdown-menu-list"
> >
<div class="gl--flex-center gl-border-b gl-font-weight-bold gl-pb-3"> <div class="gl--flex-center gl-border-b gl-font-weight-bold gl-mb-3 gl-pb-3">
<span class="gl-mr-1">{{ $options.i18n.stage }}</span> <span class="gl-mr-1">{{ $options.i18n.stage }}</span>
<span data-testid="pipeline-stage-dropdown-menu-title">{{ stageName }}</span> <span data-testid="pipeline-stage-dropdown-menu-title">{{ stageName }}</span>
</div> </div>
......
...@@ -822,7 +822,6 @@ Pipeline Graph ...@@ -822,7 +822,6 @@ Pipeline Graph
$ci-action-icon-size: 22px; $ci-action-icon-size: 22px;
$ci-action-icon-size-lg: 24px; $ci-action-icon-size-lg: 24px;
$pipeline-dropdown-line-height: 20px; $pipeline-dropdown-line-height: 20px;
$pipeline-dropdown-status-icon-size: 18px;
$ci-action-dropdown-button-size: 24px; $ci-action-dropdown-button-size: 24px;
$ci-action-dropdown-svg-size: 12px; $ci-action-dropdown-svg-size: 12px;
......
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
.ci-action-icon-container { .ci-action-icon-container {
position: absolute; position: absolute;
right: 8px; right: 11px;
top: 8px; top: 7px;
&.ci-action-icon-wrapper { &.ci-action-icon-wrapper {
height: $ci-action-dropdown-button-size; height: $ci-action-dropdown-button-size;
...@@ -84,25 +84,6 @@ ...@@ -84,25 +84,6 @@
&.non-details-job-component { &.non-details-job-component {
padding: $gl-padding-8 $gl-btn-horz-padding; padding: $gl-padding-8 $gl-btn-horz-padding;
} }
.ci-job-name-component {
align-items: center;
display: flex;
flex: 1;
}
.ci-status-icon {
position: relative;
> svg {
width: $pipeline-dropdown-status-icon-size;
height: $pipeline-dropdown-status-icon-size;
margin: 3px 0;
position: relative;
overflow: visible;
display: block;
}
}
} }
// ensure .mini-pipeline-graph-dropdown-item has hover style when action-icon is hovered // ensure .mini-pipeline-graph-dropdown-item has hover style when action-icon is hovered
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册