Commit 05f97535 authored by Phil Hughes's avatar Phil Hughes

Merge branch '40016-log-header' into 'master'

Hide log size in mobile

Closes #40016

See merge request gitlab-org/gitlab-ce!15431
parents c563661f 9151ee2b
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
font-size: 12px; font-size: 12px;
border-radius: 0; border-radius: 0;
border: 0; border: 0;
padding: $grid-size;
.bash { .bash {
display: block; display: block;
...@@ -57,14 +58,13 @@ ...@@ -57,14 +58,13 @@
.top-bar { .top-bar {
height: 35px; height: 35px;
display: flex;
justify-content: flex-end;
background: $gray-light; background: $gray-light;
border: 1px solid $border-color; border: 1px solid $border-color;
color: $gl-text-color; color: $gl-text-color;
position: sticky; position: sticky;
position: -webkit-sticky; position: -webkit-sticky;
top: $header-height; top: $header-height;
padding: $grid-size;
&.affix { &.affix {
top: $header-height; top: $header-height;
...@@ -90,9 +90,6 @@ ...@@ -90,9 +90,6 @@
} }
.truncated-info { .truncated-info {
margin: 0 auto;
align-self: center;
.truncated-info-size { .truncated-info-size {
margin: 0 5px; margin: 0 5px;
} }
...@@ -118,7 +115,11 @@ ...@@ -118,7 +115,11 @@
.controllers-buttons { .controllers-buttons {
color: $gl-text-color; color: $gl-text-color;
margin: 0 10px; margin: 0 $grid-size;
&:last-child {
margin-right: 0;
}
} }
.btn-scroll.animate { .btn-scroll.animate {
......
...@@ -57,13 +57,13 @@ ...@@ -57,13 +57,13 @@
.build-trace-container.prepend-top-default .build-trace-container.prepend-top-default
.top-bar.js-top-bar .top-bar.js-top-bar
.js-truncated-info.truncated-info.hidden< .js-truncated-info.truncated-info.hidden-xs.pull-left.hidden<
Showing last Showing last
%span.js-truncated-info-size.truncated-info-size>< %span.js-truncated-info-size.truncated-info-size><
KiB of log - KiB of log -
%a.js-raw-link.raw-link{ href: raw_project_job_path(@project, @build) }>< Complete Raw %a.js-raw-link.raw-link{ href: raw_project_job_path(@project, @build) }>< Complete Raw
.controllers .controllers.pull-right
- if @build.has_trace? - if @build.has_trace?
= link_to raw_project_job_path(@project, @build), = link_to raw_project_job_path(@project, @build),
title: 'Show complete raw', title: 'Show complete raw',
......
---
title: Hide log size for mobile screens
merge_request:
author:
type: fixed
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