diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-07-11 15:36:09 -0500 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-07-12 14:52:59 -0500 |
| commit | 8ed105bf42ed28be1d9c19e2cd6401fb3c89a046 (patch) | |
| tree | c3ea271c405fca379c70c0a7130ecd84acf94ae2 /app | |
| parent | c57471ddb456c9640f6d77128e1fc56c7a5b35b2 (diff) | |
| download | gitlab-ce-8ed105bf42ed28be1d9c19e2cd6401fb3c89a046.tar.gz | |
Fix label alignment bug; re-add build-link
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 5 | ||||
| -rw-r--r-- | app/views/admin/builds/_build.html.haml | 16 | ||||
| -rw-r--r-- | app/views/projects/ci/builds/_build.html.haml | 16 |
3 files changed, 20 insertions, 17 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index 064bb83e44c..cbf8297f387 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -81,7 +81,10 @@ } .label-container { - margin-top: 5px; + + .label { + margin-top: 5px; + } } } diff --git a/app/views/admin/builds/_build.html.haml b/app/views/admin/builds/_build.html.haml index c60f81f8936..2b5a4628242 100644 --- a/app/views/admin/builds/_build.html.haml +++ b/app/views/admin/builds/_build.html.haml @@ -7,9 +7,9 @@ .branch-commit - if can?(current_user, :read_build, build.project) = link_to namespace_project_build_url(build.project.namespace, build.project, build) do - %span ##{build.id} + %span.build-link ##{build.id} - else - %span ##{build.id} + %span.build-link ##{build.id} - if build.stuck? %i.fa.fa-warning.text-warning @@ -22,15 +22,15 @@ = link_to build.short_sha, namespace_project_commit_path(build.project.namespace, build.project, build.sha), class: "monospace commit-id" - - if build.tags.any? - .label-container + .label-container + - if build.tags.any? - build.tags.each do |tag| %span.label.label-primary = tag - - if build.try(:trigger_request) - %span.label.label-info triggered - - if build.try(:allow_failure) - %span.label.label-danger allowed to fail + - if build.try(:trigger_request) + %span.label.label-info triggered + - if build.try(:allow_failure) + %span.label.label-danger allowed to fail %td - if project diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index 0c29658e4d9..f60929d0990 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -28,17 +28,17 @@ - if defined?(commit_sha) && commit_sha = link_to build.short_sha, namespace_project_commit_path(build.project.namespace, build.project, build.sha), class: "commit-id monospace" - - if build.tags.any? - .label-container + .label-container + - if build.tags.any? - build.tags.each do |tag| %span.label.label-primary = tag - - if build.try(:trigger_request) - %span.label.label-info triggered - - if build.try(:allow_failure) - %span.label.label-danger allowed to fail - - if defined?(retried) && retried - %span.label.label-warning retried + - if build.try(:trigger_request) + %span.label.label-info triggered + - if build.try(:allow_failure) + %span.label.label-danger allowed to fail + - if defined?(retried) && retried + %span.label.label-warning retried - if defined?(runner) && runner |