diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-02 15:04:35 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-02 15:04:35 +0000 |
| commit | a1556200421f8e55fe1999a004694831553321dc (patch) | |
| tree | 88069674a4fb57aeb292d958c3eb544c4e91a818 | |
| parent | 90c0f610e29976608dbfeeb63bc4763982c5dbc3 (diff) | |
| parent | 6bfe683d427daafbee3cbc73324e42b06e9f1fec (diff) | |
| download | gitlab-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:
Closes #25098
cc: @filipa
See merge request !7881
| -rw-r--r-- | app/views/projects/pipelines_settings/_badge.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/25098-header-margins-on-pipeline-settings.yml | 5 |
2 files changed, 6 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 diff --git a/changelogs/unreleased/25098-header-margins-on-pipeline-settings.yml b/changelogs/unreleased/25098-header-margins-on-pipeline-settings.yml new file mode 100644 index 00000000000..1799fad1631 --- /dev/null +++ b/changelogs/unreleased/25098-header-margins-on-pipeline-settings.yml @@ -0,0 +1,5 @@ +--- +title: Adjusted margins for Build Status and Coverage Report rows to match those of + the CI/CD Pipeline row +merge_request: +author: Ryan Harris |