summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-07-24 07:36:01 +0000
committerPhil Hughes <me@iamphill.com>2017-07-24 07:36:01 +0000
commitc66db38dda077c4edeefde78d6221f0c898f1418 (patch)
tree95ec5db6521c03c8989675a2a57ce291c4a9a937
parent9e8ea0746f40953610f1b59f96b28f5bc95c8de4 (diff)
parent59fd9646a6a5b6db3c043f9c244d081b2aa3b118 (diff)
downloadgitlab-ce-c66db38dda077c4edeefde78d6221f0c898f1418.tar.gz
Merge branch '35399-mini-graph-commits-box' into 'master'
Fix margin in mini graph for commits box Closes #35399 and #35383 See merge request !13014
-rw-r--r--app/assets/stylesheets/pages/commits.scss6
-rw-r--r--changelogs/unreleased/35399-mini-graph-commits-box.yml4
2 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss
index a5e4c3311f8..fd0871ec0b8 100644
--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -54,7 +54,11 @@
.mr-widget-pipeline-graph {
display: inline-block;
vertical-align: middle;
- margin: 0 -6px 0 0;
+ margin-right: 4px;
+
+ .stage-cell .stage-container {
+ margin: 3px 3px 3px 0;
+ }
.dropdown-menu {
margin-top: 11px;
diff --git a/changelogs/unreleased/35399-mini-graph-commits-box.yml b/changelogs/unreleased/35399-mini-graph-commits-box.yml
new file mode 100644
index 00000000000..ed080ed86b4
--- /dev/null
+++ b/changelogs/unreleased/35399-mini-graph-commits-box.yml
@@ -0,0 +1,4 @@
+---
+title: Fix margins in the mini graph for pipeline in commits box
+merge_request:
+author: