fix(graph): fixed color picker appearingunder pinned side nav, fixes #4556

This commit is contained in:
Torkel Ödegaard 2016-04-12 11:07:34 -04:00
parent 329ee8d9f1
commit 29dff7ba1a
4 changed files with 4 additions and 12 deletions

View File

@ -7,10 +7,6 @@ import coreModule from 'app/core/core_module';
var template = `
<div class="graph-legend-popover">
<a class="drop-popopver-close" ng-click="ctrl.close();" href="" ng-hide="ctrl.autoClose">
<i class="fa fa-times-circle"></i>
</a>
<div ng-show="ctrl.series" class="p-b-1">
<label>Y Axis:</label>
<button ng-click="ctrl.toggleAxis(yaxis);" class="btn btn-small"
@ -31,7 +27,6 @@ var template = `
ng-style="{color:color}"
ng-click="ctrl.colorSelected(color);">&nbsp;</i>
</p>
</div>
`;
@ -51,21 +46,17 @@ export class ColorPickerCtrl {
toggleAxis(yaxis) {
this.$scope.toggleAxis();
if (!this.$scope.autoClose) {
if (this.$scope.autoClose) {
this.$scope.dismiss();
}
}
colorSelected(color) {
this.$scope.colorSelected(color);
if (!this.$scope.autoClose) {
if (this.$scope.autoClose) {
this.$scope.dismiss();
}
}
close() {
this.$scope.dismiss();
}
}
export function colorPicker() {

View File

@ -49,7 +49,6 @@ function (angular, _, $) {
position: 'bottom center',
template: '<gf-color-picker></gf-color-picker>',
model: {
autoClose: true,
series: series,
toggleAxis: function() {
ctrl.toggleAxis(series);

View File

@ -59,6 +59,7 @@ define([
openOn: 'click',
template: '<gf-color-picker></gf-color-picker>',
model: {
autoClose: true,
colorSelected: $scope.colorSelected,
},
onClose: function() {

View File

@ -7,6 +7,7 @@ $attachmentOffset: 0%;
$easing: cubic-bezier(0, 0, 0.265, 1.00);
.drop-element {
z-index: 10000;
position: absolute;
display: none;
opacity: 0;