Commit a31053af authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Align header items; put retry button back in sidebar on mobile

parent b7f66d1a
...@@ -52,10 +52,21 @@ ...@@ -52,10 +52,21 @@
.build-header { .build-header {
position: relative; position: relative;
padding: 0;
display: flex;
min-height: 58px;
align-items: center;
@media (max-width: $screen-sm-max) {
padding-right: 40px; padding-right: 40px;
@media (min-width: $screen-sm-min) { .btn-primary {
padding-right: 0; display: none;
}
}
.header-content {
flex: 1;
} }
a { a {
...@@ -135,6 +146,19 @@ ...@@ -135,6 +146,19 @@
} }
} }
.retry-link {
color: $gl-link-color;
display: none;
&:hover {
text-decoration: underline;
}
@media (max-width: $screen-sm-max) {
display: inline-block;
}
}
.stage-item { .stage-item {
cursor: pointer; cursor: pointer;
......
.content-block.build-header .content-block.build-header
.header-content
= ci_status_with_icon(@build.status) = ci_status_with_icon(@build.status)
Build Build
%strong ##{@build.id} %strong ##{@build.id}
...@@ -13,6 +14,6 @@ ...@@ -13,6 +14,6 @@
= render "user" = render "user"
= time_ago_with_tooltip(@build.created_at) = time_ago_with_tooltip(@build.created_at)
- if can?(current_user, :update_build, @build) && @build.retryable? - if can?(current_user, :update_build, @build) && @build.retryable?
= link_to "Retry", retry_namespace_project_build_path(@project.namespace, @project, @build), class: 'btn btn-white pull-right', method: :post = link_to "Retry build", retry_namespace_project_build_path(@project.namespace, @project, @build), class: 'btn btn-primary pull-right', method: :post
%button.btn.btn-default.pull-right.visible-xs-block.visible-sm-block.build-gutter-toggle.js-sidebar-build-toggle{ role: "button", type: "button" } %button.btn.btn-default.pull-right.visible-xs-block.visible-sm-block.build-gutter-toggle.js-sidebar-build-toggle{ role: "button", type: "button" }
= icon('angle-double-left') = icon('angle-double-left')
...@@ -43,6 +43,8 @@ ...@@ -43,6 +43,8 @@
.block{ class: ("block-first" if !@build.coverage && !(can?(current_user, :read_build, @project) && (@build.artifacts? || @build.artifacts_expired?))) } .block{ class: ("block-first" if !@build.coverage && !(can?(current_user, :read_build, @project) && (@build.artifacts? || @build.artifacts_expired?))) }
.title .title
Build details Build details
- if can?(current_user, :update_build, @build) && @build.retryable?
= link_to "Retry", retry_namespace_project_build_path(@project.namespace, @project, @build), class: 'pull-right retry-link', method: :post
- if @build.merge_request - if @build.merge_request
%p.build-detail-row %p.build-detail-row
%span.build-light-text Merge Request: %span.build-light-text Merge Request:
......
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