summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-07-19 15:54:16 +0000
committerPhil Hughes <me@iamphill.com>2019-07-19 15:54:16 +0000
commit2e56b134687ccc8043f14eef4c5d0bfa9e1fd370 (patch)
treeb16df1281279e32b3aad7248029dc4677c49b3b0
parent8291a58124e8f0987b3e17a22ca1123b5dc14f1b (diff)
parent25777183b48765698c61467590a17301c2cce9ab (diff)
downloadgitlab-ce-2e56b134687ccc8043f14eef4c5d0bfa9e1fd370.tar.gz
Merge branch '64265-center-loading-icon' into 'master'
Centers loading icon in CI action Closes #64265 See merge request gitlab-org/gitlab-ce!30947
-rw-r--r--app/assets/stylesheets/pages/pipelines.scss5
-rw-r--r--changelogs/unreleased/64265-center-loading-icon.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index ff4fa8aacdc..5f4db37c317 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -695,6 +695,10 @@
top: -1px;
}
+ .spinner {
+ top: 2px;
+ }
+
&.play {
svg {
left: 2px;
@@ -861,6 +865,7 @@ button.mini-pipeline-graph-dropdown-toggle {
}
}
+ .spinner,
svg {
width: $ci-action-dropdown-svg-size;
height: $ci-action-dropdown-svg-size;
diff --git a/changelogs/unreleased/64265-center-loading-icon.yml b/changelogs/unreleased/64265-center-loading-icon.yml
new file mode 100644
index 00000000000..cd4253b63c6
--- /dev/null
+++ b/changelogs/unreleased/64265-center-loading-icon.yml
@@ -0,0 +1,5 @@
+---
+title: Center loading icon in CI action component
+merge_request:
+author:
+type: fixed