Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
29dff7ba
Commit
29dff7ba
authored
Apr 12, 2016
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(graph): fixed color picker appearingunder pinned side nav, fixes #4556
parent
329ee8d9
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
12 deletions
+4
-12
public/app/core/components/colorpicker.ts
+2
-11
public/app/plugins/panel/graph/legend.js
+0
-1
public/app/plugins/panel/graph/series_overrides_ctrl.js
+1
-0
public/sass/components/_drop.scss
+1
-0
No files found.
public/app/core/components/colorpicker.ts
View file @
29dff7ba
...
...
@@ -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);"> </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
()
{
...
...
public/app/plugins/panel/graph/legend.js
View file @
29dff7ba
...
...
@@ -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
);
...
...
public/app/plugins/panel/graph/series_overrides_ctrl.js
View file @
29dff7ba
...
...
@@ -59,6 +59,7 @@ define([
openOn
:
'click'
,
template
:
'<gf-color-picker></gf-color-picker>'
,
model
:
{
autoClose
:
true
,
colorSelected
:
$scope
.
colorSelected
,
},
onClose
:
function
()
{
...
...
public/sass/components/_drop.scss
View file @
29dff7ba
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment