diff options
| author | Phil Hughes <me@iamphill.com> | 2017-11-20 09:08:50 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-11-20 09:08:50 +0000 |
| commit | 05f97535f64a5ed06093e4e804db5f3bb4cbeb87 (patch) | |
| tree | 9ffddf884410b441f44c43d707fb26f8e9e70d2b | |
| parent | c563661f910934f1103690d46f9af8a75423077d (diff) | |
| parent | 9151ee2bbec16feb31960c0a4e195feb6eb59ad8 (diff) | |
| download | gitlab-ce-05f97535f64a5ed06093e4e804db5f3bb4cbeb87.tar.gz | |
Merge branch '40016-log-header' into 'master'
Hide log size in mobile
Closes #40016
See merge request gitlab-org/gitlab-ce!15431
| -rw-r--r-- | app/assets/stylesheets/pages/builds.scss | 13 | ||||
| -rw-r--r-- | app/views/projects/jobs/show.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/40016-log-header.yml | 5 |
3 files changed, 14 insertions, 8 deletions
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss index 27b10b536a2..f139f4ab650 100644 --- a/app/assets/stylesheets/pages/builds.scss +++ b/app/assets/stylesheets/pages/builds.scss @@ -49,6 +49,7 @@ font-size: 12px; border-radius: 0; border: 0; + padding: $grid-size; .bash { display: block; @@ -57,14 +58,13 @@ .top-bar { height: 35px; - display: flex; - justify-content: flex-end; background: $gray-light; border: 1px solid $border-color; color: $gl-text-color; position: sticky; position: -webkit-sticky; top: $header-height; + padding: $grid-size; &.affix { top: $header-height; @@ -90,9 +90,6 @@ } .truncated-info { - margin: 0 auto; - align-self: center; - .truncated-info-size { margin: 0 5px; } @@ -118,7 +115,11 @@ .controllers-buttons { color: $gl-text-color; - margin: 0 10px; + margin: 0 $grid-size; + + &:last-child { + margin-right: 0; + } } .btn-scroll.animate { diff --git a/app/views/projects/jobs/show.html.haml b/app/views/projects/jobs/show.html.haml index 2abd2c9e652..1d0aaa47b60 100644 --- a/app/views/projects/jobs/show.html.haml +++ b/app/views/projects/jobs/show.html.haml @@ -57,13 +57,13 @@ .build-trace-container.prepend-top-default .top-bar.js-top-bar - .js-truncated-info.truncated-info.hidden< + .js-truncated-info.truncated-info.hidden-xs.pull-left.hidden< Showing last %span.js-truncated-info-size.truncated-info-size>< KiB of log - %a.js-raw-link.raw-link{ href: raw_project_job_path(@project, @build) }>< Complete Raw - .controllers + .controllers.pull-right - if @build.has_trace? = link_to raw_project_job_path(@project, @build), title: 'Show complete raw', diff --git a/changelogs/unreleased/40016-log-header.yml b/changelogs/unreleased/40016-log-header.yml new file mode 100644 index 00000000000..f52c2d2a0d5 --- /dev/null +++ b/changelogs/unreleased/40016-log-header.yml @@ -0,0 +1,5 @@ +--- +title: Hide log size for mobile screens +merge_request: +author: +type: fixed |