summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-10-09 11:08:36 +0100
committerFilipa Lacerda <filipa@gitlab.com>2017-10-09 11:14:08 +0100
commitceb317d7cd4ec3f0f953b91926cf49ce9bf2d4bf (patch)
treeb5befc6f0c317dc8df95d90e6bd18724f56373ea
parent705d0e35da6058d95eb8f262fb2523c48d6b2fc6 (diff)
downloadgitlab-ce-38534-minigraph.tar.gz
Fixes mini graph in commit view38534-minigraph
-rw-r--r--app/assets/stylesheets/pages/commits.scss5
-rw-r--r--app/assets/stylesheets/pages/pipelines.scss8
-rw-r--r--changelogs/unreleased/38534-minigraph.yml5
3 files changed, 14 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss
index 994707422bb..ee3ca246374 100644
--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -54,12 +54,15 @@
.mr-widget-pipeline-graph {
display: inline-block;
vertical-align: middle;
- margin-right: 4px;
.stage-cell .stage-container {
margin: 3px 3px 3px 0;
}
+ .stage-container:last-child {
+ margin-right: 0;
+ }
+
.dropdown-menu {
margin-top: 11px;
}
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 086dd528579..8fc7a5eec9b 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -209,9 +209,11 @@
}
.stage-cell {
- @media (min-width: $screen-md-min) {
- min-width: 148px;
- margin-right: -4px;
+ &.table-section {
+ @media (min-width: $screen-md-min) {
+ min-width: 148px;
+ margin-right: -4px;
+ }
}
.mini-pipeline-graph-dropdown-toggle svg {
diff --git a/changelogs/unreleased/38534-minigraph.yml b/changelogs/unreleased/38534-minigraph.yml
new file mode 100644
index 00000000000..eed240eac2d
--- /dev/null
+++ b/changelogs/unreleased/38534-minigraph.yml
@@ -0,0 +1,5 @@
+---
+title: Fixes mini pipeline graph in commit view
+merge_request:
+author:
+type: fixed