summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-12-02 15:04:35 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-12-02 15:04:35 +0000
commita1556200421f8e55fe1999a004694831553321dc (patch)
tree88069674a4fb57aeb292d958c3eb544c4e91a818 /app
parent90c0f610e29976608dbfeeb63bc4763982c5dbc3 (diff)
parent6bfe683d427daafbee3cbc73324e42b06e9f1fec (diff)
downloadgitlab-ce-a1556200421f8e55fe1999a004694831553321dc.tar.gz
Merge branch '25098-header-margins-on-pipeline-settings' into 'master'
Fixed row margins on Pipeline Settings page in order to unify styles On the ```project-name/pipelines/settings``` page, I removed the ```.row``` styling on ```.build-status``` and ```.coverage-report``` as it was causing those rows to not have the same margins as the "CI/CD Pipeline" row. Now, they are even as you can see below: ![Screen_Shot_2016-12-01_at_12_54_59_PM](/uploads/a7196ff2e8efcdcd072bc2d26634a42d/Screen_Shot_2016-12-01_at_12_54_59_PM.png) ![Screen_Shot_2016-12-01_at_12_53_18_PM](/uploads/615428bab476fcd1baab86837395d800/Screen_Shot_2016-12-01_at_12_53_18_PM.png) Closes #25098 cc: @filipa See merge request !7881
Diffstat (limited to 'app')
-rw-r--r--app/views/projects/pipelines_settings/_badge.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/pipelines_settings/_badge.html.haml b/app/views/projects/pipelines_settings/_badge.html.haml
index 7b7fa56d993..22a3b884520 100644
--- a/app/views/projects/pipelines_settings/_badge.html.haml
+++ b/app/views/projects/pipelines_settings/_badge.html.haml
@@ -1,4 +1,4 @@
-.row{ class: badge.title.gsub(' ', '-') }
+%div{ class: badge.title.gsub(' ', '-') }
.col-lg-3.profile-settings-sidebar
%h4.prepend-top-0
= badge.title.capitalize