Commit 6c61f244 authored by Fatih Acet's avatar Fatih Acet

Merge branch 'admin-builds' into 'master'

Pipelines/Builds updates

## What does this MR do?
Adds branch/tag icons in admin view; increase min-width of builds tables

## What are the relevant issue numbers?
#20139

## Screenshots (if relevant)
Branch icons:    
![Screen_Shot_2016-07-27_at_1.29.57_PM](/uploads/2fceddfed5ed1a28d9b7d5e2427cba93/Screen_Shot_2016-07-27_at_1.29.57_PM.png)

Reduce `icon-container` width, before:
![Screen_Shot_2016-07-27_at_5.29.32_PM](/uploads/e3fe38edc262f6460572e20102ef9b6d/Screen_Shot_2016-07-27_at_5.29.32_PM.png)
Reduce `icon-container` width, after:
![Screen_Shot_2016-07-27_at_5.29.03_PM](/uploads/58b82e2c1491672c95dfe35911891891/Screen_Shot_2016-07-27_at_5.29.03_PM.png)

See merge request !5527
parents ab3dd9a1 cebda439
...@@ -18,6 +18,10 @@ ...@@ -18,6 +18,10 @@
.btn { .btn {
margin: 4px; margin: 4px;
} }
.table.builds {
min-width: 1200px;
}
} }
.content-list { .content-list {
...@@ -35,7 +39,7 @@ ...@@ -35,7 +39,7 @@
} }
.table.builds { .table.builds {
min-width: 1200px; min-width: 900px;
&.pipeline { &.pipeline {
min-width: 650px; min-width: 650px;
...@@ -128,7 +132,7 @@ ...@@ -128,7 +132,7 @@
.icon-container { .icon-container {
display: inline-block; display: inline-block;
text-align: right; text-align: right;
width: 20px; width: 15px;
.fa { .fa {
position: relative; position: relative;
......
...@@ -11,16 +11,18 @@ ...@@ -11,16 +11,18 @@
- else - else
%span.build-link ##{build.id} %span.build-link ##{build.id}
- if build.stuck?
%i.fa.fa-warning.text-warning
- if build.ref - if build.ref
.icon-container
= build.tag? ? icon('tag') : icon('code-fork')
= link_to build.ref, namespace_project_commits_path(build.project.namespace, build.project, build.ref), class: "monospace branch-name" = link_to build.ref, namespace_project_commits_path(build.project.namespace, build.project, build.ref), class: "monospace branch-name"
- else - else
.light none .light none
.icon-container
= custom_icon("icon_commit") = custom_icon("icon_commit")
= link_to build.short_sha, namespace_project_commit_path(build.project.namespace, build.project, build.sha), class: "monospace commit-id" = link_to build.short_sha, namespace_project_commit_path(build.project.namespace, build.project, build.sha), class: "monospace commit-id"
- if build.stuck?
%i.fa.fa-warning.text-warning
.label-container .label-container
- if build.tags.any? - if build.tags.any?
......
...@@ -13,13 +13,6 @@ ...@@ -13,13 +13,6 @@
- else - else
%span ##{build.id} %span ##{build.id}
- if build.stuck?
.icon-container
= icon('warning', class: 'text-warning has-tooltip', title: 'Build is stuck. Check runners.')
- if defined?(retried) && retried
.icon-container
= icon('warning', class: 'text-warning has-tooltip', title: 'Build was retried.')
- if defined?(ref) && ref - if defined?(ref) && ref
- if build.ref - if build.ref
.icon-container .icon-container
...@@ -33,6 +26,11 @@ ...@@ -33,6 +26,11 @@
- if defined?(commit_sha) && commit_sha - 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" = link_to build.short_sha, namespace_project_commit_path(build.project.namespace, build.project, build.sha), class: "commit-id monospace"
- if build.stuck?
= icon('warning', class: 'text-warning has-tooltip', title: 'Build is stuck. Check runners.')
- if defined?(retried) && retried
= icon('warning', class: 'text-warning has-tooltip', title: 'Build was retried.')
.label-container .label-container
- if build.tags.any? - if build.tags.any?
- build.tags.each do |tag| - build.tags.each do |tag|
...@@ -47,7 +45,6 @@ ...@@ -47,7 +45,6 @@
- if build.manual? - if build.manual?
%span.label.label-info manual %span.label.label-info manual
- if defined?(runner) && runner - if defined?(runner) && runner
%td %td
- if build.try(:runner) - if build.try(:runner)
......
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