Commit b6c670cf authored by Annabel Dunstone's avatar Annabel Dunstone

Style build container box; add check mark to active build

parent 162ef4b0
...@@ -222,3 +222,7 @@ header.header-pinned-nav { ...@@ -222,3 +222,7 @@ header.header-pinned-nav {
padding-right: $sidebar_collapsed_width; padding-right: $sidebar_collapsed_width;
} }
} }
.right-sidebar {
border-left: 1px solid $border-color;
}
...@@ -101,7 +101,6 @@ ...@@ -101,7 +101,6 @@
.right-sidebar.build-sidebar { .right-sidebar.build-sidebar {
padding: $gl-padding 0; padding: $gl-padding 0;
border-left: 1px solid $border-color;
&.right-sidebar-collapsed { &.right-sidebar-collapsed {
display: none; display: none;
...@@ -133,13 +132,19 @@ ...@@ -133,13 +132,19 @@
.build-dropdown { .build-dropdown {
padding: 0 $gl-padding; padding: 0 $gl-padding;
.dropdown-menu-toggle {
margin-top: 8px;
}
} }
.builds-container { .builds-container {
margin: $gl-padding 0; margin-top: $gl-padding;
background-color: $white-light; background-color: $white-light;
border-top: 1px solid $border-color; border-top: 1px solid $border-color;
border-bottom: 1px solid $border-color; border-bottom: 1px solid $border-color;
max-height: 300px;
overflow: scroll;
svg { svg {
position: relative; position: relative;
...@@ -150,7 +155,11 @@ ...@@ -150,7 +155,11 @@
a { a {
display: block; display: block;
padding: $gl-padding 10px; padding: $gl-padding 10px $gl-padding 40px;
width: 270px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
&:hover { &:hover {
background-color: $row-hover; background-color: $row-hover;
...@@ -159,8 +168,21 @@ ...@@ -159,8 +168,21 @@
} }
.build-job { .build-job {
position: relative;
.fa {
position: absolute;
left: 15px;
top: 20px;
display: none;
}
&.active { &.active {
font-weight: bold; font-weight: bold;
.fa {
display: block;
}
} }
} }
} }
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
- statuses = ["failed", "pending", "running", "canceled", "success", "skipped"] - statuses = ["failed", "pending", "running", "canceled", "success", "skipped"]
- if builds.size > 1 - if builds.size > 1
.dropdown.build-dropdown .dropdown.build-dropdown
.build-light-text Stage
%button.dropdown-menu-toggle{type: 'button', 'data-toggle' => 'dropdown'} %button.dropdown-menu-toggle{type: 'button', 'data-toggle' => 'dropdown'}
%span.stage-selection More %span.stage-selection More
= icon('caret-down') = icon('caret-down')
...@@ -28,6 +29,7 @@ ...@@ -28,6 +29,7 @@
- builds.select{|build| build.status == build_status}.each do |build| - builds.select{|build| build.status == build_status}.each do |build|
.build-job{class: ('active' if build == @build), data: {stage: build.stage}} .build-job{class: ('active' if build == @build), data: {stage: build.stage}}
= link_to namespace_project_build_path(@project.namespace, @project, build) do = link_to namespace_project_build_path(@project.namespace, @project, build) do
= icon('check')
= ci_icon_for_status(build.status) = ci_icon_for_status(build.status)
%span %span
- if build.name - if build.name
......
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