Merge branch 'graph_legend_height'
This commit is contained in:
@@ -90,6 +90,14 @@ function (angular, _, $) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function render() {
|
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) {
|
if (firstRender) {
|
||||||
elem.append($container);
|
elem.append($container);
|
||||||
$container.on('click', '.graph-legend-icon', openColorSelector);
|
$container.on('click', '.graph-legend-icon', openColorSelector);
|
||||||
|
|||||||
@@ -60,7 +60,6 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.graph-legend-table {
|
.graph-legend-table {
|
||||||
display: table;
|
|
||||||
width: 100%;
|
width: 100%;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
|
|
||||||
@@ -272,4 +271,6 @@
|
|||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.graph-legend-fixed-height {
|
||||||
|
overflow-y: scroll;
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user