Skip to content
代码片段 群组 项目
未验证 提交 65745910 编辑于 作者: Simon Knox's avatar Simon Knox
浏览文件

Merge branch 'job-log' into 'master'

No related branches found
No related tags found
无相关合并请求
......@@ -62,12 +62,12 @@ export default {
<template>
<div
class="log-line collapsible-line d-flex justify-content-between ws-normal gl-align-items-flex-start"
class="log-line collapsible-line d-flex justify-content-between ws-normal gl-align-items-flex-start gl-relative"
:class="{ 'gl-bg-gray-700': isHighlighted || applyHashHighlight }"
role="button"
@click="handleOnClick"
>
<gl-icon :name="iconName" class="arrow position-absolute" />
<gl-icon :name="iconName" class="arrow gl-absolute gl-top-2" />
<line-number :line-number="line.lineNumber" :path="path" />
<span
v-for="(content, i) in line.content"
......
......@@ -6,7 +6,7 @@
word-break: break-all;
word-wrap: break-word;
color: color-yiq($builds-log-bg);
border-radius: $border-radius-small;
border-radius: 0 0 $border-radius-default $border-radius-default;
min-height: 42px;
background-color: $builds-log-bg;
}
......
......@@ -263,7 +263,7 @@
@mixin build-log-top-bar($height) {
@include build-log-bar($height);
position: sticky;
top: $calc-application-header-height;
top: calc(#{$calc-application-header-height} - 1px);
}
/*
......
......@@ -15,6 +15,9 @@
.top-bar {
@include build-log-top-bar(50px);
z-index: 2;
border-radius: $border-radius-default $border-radius-default 0 0;
box-shadow: 0 -2px 0 0 var(--white);
&.has-archived-block {
top: calc(#{$calc-application-header-height} + 28px);
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册