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) ![fix-admin-ci-table](/uploads/49472f7a12f868556e1bf482c9f837c4/fix-admin-ci-table.gif) ## 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

Merge branch 'fix-admin-ci-table' into 'master'
344ece3b · Annabel Dunstone Gray · 3be717a3 · 7b520027 · 344ece3b · 344ece3b
Commit 344ece3b authored Nov 18, 2016 by Annabel Dunstone Gray
Showing with 11 additions and 1 deletion

admin.scss app/assets/stylesheets/pages/admin.scss +6 -0

index.html.haml app/views/admin/builds/index.html.haml +1 -1

fix-admin-ci-table.yml changelogs/unreleased/fix-admin-ci-table.yml +4 -0

No files found.
--- 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;
+  }
+}
--- 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
--- a/changelogs/unreleased/fix-admin-ci-table.yml
+++ b/changelogs/unreleased/fix-admin-ci-table.yml
+---
+title: Fix misaligned buttons on admin builds page
+merge_request: 7424
+author: Didem Acet