summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-05-08 18:56:07 -0500
committerDouwe Maan <douwe@selenight.nl>2017-05-08 19:14:56 -0500
commit3285803a2af10b45f4c388d70f035e8016907fea (patch)
treec29b70d93bc09108d44f84b70f7cd0a827463e6c
parent9ada13d343a4736275d2c026ee980abe5c5e5763 (diff)
downloadgitlab-ce-3285803a2af10b45f4c388d70f035e8016907fea.tar.gz
Make pipeline widget padding consistent between MR and commit pagesdm-pipeline-widget-padding
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss6
-rw-r--r--app/assets/stylesheets/pages/pipelines.scss2
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 72660113e3c..7460ee2973d 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -138,12 +138,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 {