Merge branch 'dthorell-datasources_scrollable' into develop

box · Sep 16, 2016 · 787f1dd · 787f1dd
2 parents af92cb5 + fff5a27
commit 787f1dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/css/bootstrap-combobox.css b/css/bootstrap-combobox.css
@@ -109,3 +109,9 @@
   max-height: 300px;
   overflow-y: auto;
 }
+
+.scrollable-menu {
+    height: auto;
+    max-height: 600px;
+    overflow-x: hidden;
+}
diff --git a/views/navbar.php b/views/navbar.php
@@ -21,7 +21,7 @@ class="dropdown-toggle"
                       <b class="caret"></b>
 
                 </a>
-                <ul class="dropdown-menu">
+                <ul class="dropdown-menu scrollable-menu">
                   <?php foreach ($datasources as $ds) { ?> 
                     <li><a href="<?php echo site_url().'?action=report&datasource='.$ds; ?>"><?php echo $ds; ?></a></li>
                   <?php } ?>