diff options
| author | Phil Hughes <me@iamphill.com> | 2017-10-09 15:01:51 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-10-09 15:01:51 +0000 |
| commit | 11c67e7c2f992299ff5918ce67995b73d1e0be6d (patch) | |
| tree | c617fadf3d8735e0fbaf25120d97dc1c3b2cfdbc /app | |
| parent | a550942de1085eae4c60c498097ab191f8acfc0c (diff) | |
| parent | ceb317d7cd4ec3f0f953b91926cf49ce9bf2d4bf (diff) | |
| download | gitlab-ce-11c67e7c2f992299ff5918ce67995b73d1e0be6d.tar.gz | |
Merge branch '38534-minigraph' into 'master'
Fixes mini graph in commit view
Closes #38534
See merge request gitlab-org/gitlab-ce!14758
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/commits.scss | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 8 |
2 files changed, 9 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 { |