summaryrefslogtreecommitdiff
path: root/app/views/admin
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-10-14 21:11:05 +0000
committerFatih Acet <acetfatih@gmail.com>2016-10-14 21:11:05 +0000
commitecd7e99a0abbceafa3559a6cd9642f8ce6cea020 (patch)
tree1f7b2176a66fcff576fa9f57691d38983b61e263 /app/views/admin
parent05762f449e7620015923eedcbacde8cec1eabf52 (diff)
parent64609ba84845969ef084aee3058ce2fbea582a3f (diff)
downloadgitlab-ce-ecd7e99a0abbceafa3559a6cd9642f8ce6cea020.tar.gz
Merge branch '23167-min-row-height' into 'master'
Resolve "Build/Pipeline/Environment List Inconsistency Row Height" #### What does this MR do? * Changes generic table class from `builds` to `ci-table`. It was getting confusing using `builds` for `builds`, `pipelines`, `environments` * Sets height on builds rows for continuity #### Are there points in the code the reviewer needs to double check? Apparently you can't set `min-height` on any `table` elements but you _can_ set `height`. For some reason, even if the content within happens to start wrapping, the row height will grow instead of letting the content overlap. Which is a good thing. Just kind of weird. #### Why was this MR needed? Different row heights on builds depending on content #### Screenshots (if relevant) Before: ![Screen_Shot_2016-10-10_at_4.49.58_PM](/uploads/a4edb584f95c670f9815a8e5b1d725ee/Screen_Shot_2016-10-10_at_4.49.58_PM.png) After: ![Screen_Shot_2016-10-10_at_4.32.03_PM](/uploads/488a84b4ed292fbbb0ea7e372c017ae0/Screen_Shot_2016-10-10_at_4.32.03_PM.png) Before: ![Screen_Shot_2016-10-10_at_4.44.23_PM](/uploads/3cbcbada89d1aeb1fea35ea9b851e370/Screen_Shot_2016-10-10_at_4.44.23_PM.png) After: ![Screen_Shot_2016-10-10_at_4.42.56_PM](/uploads/0cb573670f60c7fdf54fdb027c95639f/Screen_Shot_2016-10-10_at_4.42.56_PM.png) ## What are the relevant issue numbers? Closes #23167 See merge request !6787
Diffstat (limited to 'app/views/admin')
-rw-r--r--app/views/admin/runners/show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/runners/show.html.haml b/app/views/admin/runners/show.html.haml
index a5e82e55cc1..10fea1996aa 100644
--- a/app/views/admin/runners/show.html.haml
+++ b/app/views/admin/runners/show.html.haml
@@ -71,7 +71,7 @@
.col-md-6
%h4 Recent builds served by this Runner
- %table.table.builds.runner-builds
+ %table.table.ci-table.runner-builds
%thead
%tr
%th Build