diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-11-18 14:23:52 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-11-18 14:23:52 +0000 |
| commit | 344ece3b2f64fb7283e510d14c9be19d301a2c29 (patch) | |
| tree | 399960285a0ddf33abf255f2ef704c17a39160ec /app | |
| parent | 3be717a34c8a6717583a6ab2e26c246e4f7be965 (diff) | |
| parent | 7b520027f685797d2f0ecc8e2a8792acbb9f11d4 (diff) | |
| download | gitlab-ce-344ece3b2f64fb7283e510d14c9be19d301a2c29.tar.gz | |
Merge branch 'fix-admin-ci-table' into 'master'
Fix misaligned buttons on admin builds page
## What does this MR do?
Fix misaligned buttons on admin builds page
## Are there points in the code the reviewer needs to double check?
No
## Why was this MR needed?
Because buttons are misaligned.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Fixes #24371
See merge request !7424
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/admin.scss | 6 | ||||
| -rw-r--r-- | app/views/admin/builds/index.html.haml | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/admin.scss b/app/assets/stylesheets/pages/admin.scss index 6cefafd8fc7..14812e171fd 100644 --- a/app/assets/stylesheets/pages/admin.scss +++ b/app/assets/stylesheets/pages/admin.scss @@ -160,3 +160,9 @@ } } } + +.admin-builds-table { + .ci-table td:last-child { + min-width: 120px; + } +} diff --git a/app/views/admin/builds/index.html.haml b/app/views/admin/builds/index.html.haml index 26a8846b609..5e3f105d41f 100644 --- a/app/views/admin/builds/index.html.haml +++ b/app/views/admin/builds/index.html.haml @@ -14,5 +14,5 @@ .row-content-block.second-block #{(@scope || 'all').capitalize} builds - %ul.content-list.builds-content-list + %ul.content-list.builds-content-list.admin-builds-table = render "projects/builds/table", builds: @builds, admin: true |