diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-07-14 08:46:37 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-07-14 08:46:37 +0000 |
| commit | 948afa2ad3717c121fae1d998a72b83f237950b3 (patch) | |
| tree | 331bfd2d7dbfa5e854224d9743b1dc020c1ee920 | |
| parent | 6fb712a073c66d66c00ef4302f40da2280fb9bc3 (diff) | |
| download | gitlab-ce-948afa2ad3717c121fae1d998a72b83f237950b3.tar.gz | |
Fix spacing in sidebar
| -rw-r--r-- | app/assets/stylesheets/pages/builds.scss | 4 | ||||
| -rw-r--r-- | app/views/projects/jobs/_sidebar.html.haml | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/35035-sidebar-job-spaces.yml | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss index 0393820dee6..b6fc628c02b 100644 --- a/app/assets/stylesheets/pages/builds.scss +++ b/app/assets/stylesheets/pages/builds.scss @@ -244,6 +244,10 @@ } } + .block-last { + padding: 16px 0; + } + .trigger-build-variable { color: $code-color; } diff --git a/app/views/projects/jobs/_sidebar.html.haml b/app/views/projects/jobs/_sidebar.html.haml index bddb587ddc6..f2db71e8838 100644 --- a/app/views/projects/jobs/_sidebar.html.haml +++ b/app/views/projects/jobs/_sidebar.html.haml @@ -11,7 +11,7 @@ #js-details-block-vue - if can?(current_user, :read_build, @project) && (@build.artifacts? || @build.artifacts_expired?) - .block{ class: ("block-first" if !@build.coverage) } + .block .title Job artifacts - if @build.artifacts_expired? @@ -37,7 +37,7 @@ Browse - if @build.trigger_request - .build-widget + .build-widget.block %h4.title Trigger @@ -55,7 +55,7 @@ .js-build-variable.trigger-build-variable= key .js-build-value.trigger-build-value= value - .block + %div{ class: (@build.pipeline.stages_count > 1 ? "block" : "block-last") } %p Commit = link_to @build.pipeline.short_sha, project_commit_path(@project, @build.pipeline.sha), class: 'commit-sha link-commit' @@ -69,7 +69,7 @@ - if @build.pipeline.stages_count > 1 .dropdown.build-dropdown - .title + %div %span{ class: "ci-status-icon-#{@build.pipeline.status}" } = ci_icon_for_status(@build.pipeline.status) Pipeline diff --git a/changelogs/unreleased/35035-sidebar-job-spaces.yml b/changelogs/unreleased/35035-sidebar-job-spaces.yml new file mode 100644 index 00000000000..a9a0211efd9 --- /dev/null +++ b/changelogs/unreleased/35035-sidebar-job-spaces.yml @@ -0,0 +1,4 @@ +--- +title: Fix vertical space in job details sidebar +merge_request: +author: |