summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-10-13 10:46:56 +0000
committerFatih Acet <acetfatih@gmail.com>2016-10-13 10:46:56 +0000
commit3f95461f8aeec5ce7da1ae7cd7c0c7d867384a58 (patch)
tree52fcc41ce5fc5089f397230b4a1d85a81281b3cc
parent4eed16cf98a343329ec80e0d168ef8b1b3837f5b (diff)
parent4e9783e4ddffdb550c362e7bc93f31c904d638e3 (diff)
downloadgitlab-ce-3f95461f8aeec5ce7da1ae7cd7c0c7d867384a58.tar.gz
Merge branch 'grouped-builds-arrow' into 'master'
Fix overflow to show grouped builds arrow ## What does this MR do? Removes overflow style so that the arrow shows up again ## Screenshots (if relevant) Before: ![Screen_Shot_2016-10-11_at_9.11.55_AM](/uploads/92d2a0c34d2af050e58468c8d61f4cd3/Screen_Shot_2016-10-11_at_9.11.55_AM.png) After: ![Screen_Shot_2016-10-11_at_9.11.41_AM](/uploads/2c4c422a21fb6450d00ae638aef29d89/Screen_Shot_2016-10-11_at_9.11.41_AM.png) Scrolling: ![Screen_Shot_2016-10-11_at_9.40.36_AM](/uploads/e5b1e3125d881c5882cf199026110d48/Screen_Shot_2016-10-11_at_9.40.36_AM.png) See merge request !6808
-rw-r--r--app/assets/stylesheets/pages/pipelines.scss7
-rw-r--r--app/views/projects/commit/_pipeline_status_group.html.haml11
2 files changed, 11 insertions, 7 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 05f59279637..7843355f0ab 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -420,8 +420,11 @@
left: auto;
right: -197px;
top: -9px;
- max-height: 245px;
- overflow-y: scroll;
+
+ 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