summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-07-24 07:36:01 +0000
committerJose Ivan Vargas <jvargas@gitlab.com>2017-07-24 11:53:20 -0500
commit4cc26e6c5538fccd6e925506fdf53ca0059c90eb (patch)
treec4ba4844d533e4bdaf6772747eef00dadd4ad9f4
parentad69f367c298619a45ecb8f2f13612005fcbcacc (diff)
downloadgitlab-ce-4cc26e6c5538fccd6e925506fdf53ca0059c90eb.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 9db0f2075cb..9ada6b0eb44 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: