Merge branch 'graph_legend_height'

2016-02-08 10:07:53 +01:00
parent edebdb166e 73bed3880f
commit 2f3d1ec2ef
2 changed files with 11 additions and 2 deletions
@@ -90,6 +90,14 @@ function (angular, _, $) {
        }

        function render() {
+          if (panel.legend.rightSide) {
+            var panelheight = scope.ctrl.height || scope.ctrl.panel.height || scope.ctrl.row.height;
+            $container.css("height", panelheight);
+            $container.toggleClass('graph-legend-fixed-height', true);
+          } else {
+            $container.css("height", "");
+          }
+
          if (firstRender) {
            elem.append($container);
            $container.on('click', '.graph-legend-icon', openColorSelector);
@@ -60,7 +60,6 @@
 }

 .graph-legend-table {
-  display: table;
  width: 100%;
  margin: 0;

@@ -272,4 +271,6 @@
  font-size: 12px;
 }

-
+.graph-legend-fixed-height {
+  overflow-y: scroll;
+}