diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-09-30 13:11:24 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-09-30 13:11:24 +0000 |
commit | b9b38a6a0b72e0a50d8382c81296f53187e81c68 (patch) | |
tree | 57e12edd5220996ed86baa397660643016560ab1 /app/assets/stylesheets/pages | |
parent | 2dc3348f5ac83fe39e79c5a2829bb8e54d702ff6 (diff) | |
parent | a095a3a694091ac9a7387e89e06f12c8ba80815c (diff) | |
download | gitlab-ce-b9b38a6a0b72e0a50d8382c81296f53187e81c68.tar.gz |
Merge branch '22529-build-sidebar-weird-padding' into 'master'
Fix build sidebar build details padding
## What does this MR do?
Removes a `.block-first` overriding declaration that was added to fix the coverage padding and moved the padding that fixes the coverage block to a `.block.coverage` declaration.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
The build sidebar build details had too much padding as seen in #22529.
## Screenshots (if relevant)
![Screen_Shot_2016-09-24_at_19.38.40](/uploads/2c11a71f3022909fe8a5d1e983445667/Screen_Shot_2016-09-24_at_19.38.40.png)
![Screen_Shot_2016-09-24_at_19.39.06](/uploads/482af29f4bb7e284469466da59901087/Screen_Shot_2016-09-24_at_19.39.06.png)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #22529
See merge request !6506
Diffstat (limited to 'app/assets/stylesheets/pages')
-rw-r--r-- | app/assets/stylesheets/pages/builds.scss | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss index a5a260d4c8f..194a39a8377 100644 --- a/app/assets/stylesheets/pages/builds.scss +++ b/app/assets/stylesheets/pages/builds.scss @@ -107,10 +107,14 @@ .block { width: 100%; - } - .block-first { - padding: 5px 16px 11px; + &.coverage { + padding: 0 16px 11px; + } + + .btn-group-justified { + margin-top: 5px; + } } .js-build-variable { @@ -214,6 +218,9 @@ .build-detail-row { margin-bottom: 5px; + &:last-of-type { + margin-bottom: 0; + } } .build-light-text { |