summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-11-20 18:34:23 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-11-20 18:34:23 +0000
commit859720e2d0f88dd330030295335a949c9428e31b (patch)
tree289a25a6dcb26e1d4bec90038a20b1de3b027b08
parentc043ba67c2d6a9493518408fd198dea30ce6cfcb (diff)
parentff81c845e178a14293ec4b0675dd58a91dce3b02 (diff)
downloadgitlab-ce-859720e2d0f88dd330030295335a949c9428e31b.tar.gz
Merge branch '4080-align-retry-btn' into 'master'
Align retry button with job title with new grid size Closes #40342 See merge request gitlab-org/gitlab-ce!15462
-rw-r--r--app/assets/stylesheets/framework/common.scss1
-rw-r--r--app/views/projects/jobs/_sidebar.html.haml2
-rw-r--r--changelogs/unreleased/4080-align-retry-btn.yml5
3 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index bbbb73201be..5e4ddf366ef 100644
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -430,6 +430,7 @@ img.emoji {
/** COMMON CLASSES **/
.prepend-top-0 { margin-top: 0; }
.prepend-top-5 { margin-top: 5px; }
+.prepend-top-8 { margin-top: $grid-size; }
.prepend-top-10 { margin-top: 10px; }
.prepend-top-15 { margin-top: 15px; }
.prepend-top-default { margin-top: $gl-padding !important; }
diff --git a/app/views/projects/jobs/_sidebar.html.haml b/app/views/projects/jobs/_sidebar.html.haml
index b5067367802..17ac8a20a30 100644
--- a/app/views/projects/jobs/_sidebar.html.haml
+++ b/app/views/projects/jobs/_sidebar.html.haml
@@ -4,7 +4,7 @@
.sidebar-container
.blocks-container
.block
- %strong.prepend-top-10
+ %strong.inline.prepend-top-8
= @build.name
- if can?(current_user, :update_build, @build) && @build.retryable?
= link_to "Retry", retry_namespace_project_job_path(@project.namespace, @project, @build), class: 'js-retry-button pull-right btn btn-inverted-secondary btn-retry visible-md-block visible-lg-block', method: :post
diff --git a/changelogs/unreleased/4080-align-retry-btn.yml b/changelogs/unreleased/4080-align-retry-btn.yml
new file mode 100644
index 00000000000..c7d3997839c
--- /dev/null
+++ b/changelogs/unreleased/4080-align-retry-btn.yml
@@ -0,0 +1,5 @@
+---
+title: Align retry button with job title with new grid size
+merge_request:
+author:
+type: fixed