summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-10-11 09:42:34 -0500
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-10-11 09:42:34 -0500
commit4e9783e4ddffdb550c362e7bc93f31c904d638e3 (patch)
tree2c51a1385bdbe8822d83447f4936d95a3ca3c655
parentdd11c8f5c6984aed434c73197b9b592eee2646e1 (diff)
downloadgitlab-ce-grouped-builds-arrow.tar.gz
Allow scrolling within grouped pipelinesgrouped-builds-arrow
-rw-r--r--app/assets/stylesheets/pages/pipelines.scss6
-rw-r--r--app/views/projects/commit/_pipeline_status_group.html.haml11
2 files changed, 11 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 28e850767b7..7843355f0ab 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -420,7 +420,11 @@
left: auto;
right: -197px;
top: -9px;
- max-height: 245px;
+
+ ul {
+ max-height: 245px;
+ overflow: auto;
+ }
a {
color: $gl-text-color;
diff --git a/app/views/projects/commit/_pipeline_status_group.html.haml b/app/views/projects/commit/_pipeline_status_group.html.haml
index 6ada719e006..5d0d5ba0262 100644
--- a/app/views/projects/commit/_pipeline_status_group.html.haml
+++ b/app/views/projects/commit/_pipeline_status_group.html.haml
@@ -5,8 +5,9 @@
%span.ci-status-text
= name
%span.badge= subject.size
-%ul.dropdown-menu.grouped-pipeline-dropdown
- %li.arrow
- - subject.each do |status|
- %li
- = render "projects/#{status.to_partial_path}_pipeline", subject: status
+.dropdown-menu.grouped-pipeline-dropdown
+ .arrow
+ %ul
+ - subject.each do |status|
+ %li
+ = render "projects/#{status.to_partial_path}_pipeline", subject: status