diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-05-09 17:07:45 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-05-09 17:07:45 +0000 |
| commit | ca1e3823ca2fdd60cc14e82d67733e604269936c (patch) | |
| tree | afb1dba359e8729511abf70baca49a10333d031b | |
| parent | f2b72d79e8c075ff1aa0901deca7e11161643c7b (diff) | |
| parent | 3285803a2af10b45f4c388d70f035e8016907fea (diff) | |
| download | gitlab-ce-ca1e3823ca2fdd60cc14e82d67733e604269936c.tar.gz | |
Merge branch 'dm-pipeline-widget-padding' into 'master'
Make pipeline widget padding consistent between MR and commit pages
See merge request !11193
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 97019b19667..75c57e369e7 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -131,12 +131,6 @@ line-height: 16px; } - @media (min-width: $screen-sm-min) { - .stage-cell { - padding: 0 4px; - } - } - @media (max-width: $screen-xs-max) { order: 1; margin-top: $gl-padding-top; diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index eaf3dd49567..5ad0fc9082a 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -257,7 +257,7 @@ .stage-cell { font-size: 0; - padding: 10px 4px; + padding: 0 4px; > .stage-container > div > button > span > svg, > .stage-container > button > svg { |