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
07331b4c
Commit
07331b4c
authored
Jan 28, 2019
by
Dominik Prokop
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Use the same panel loading indicator in explore as on dashboard's panel"
This reverts commit
05edb3e5
.
parent
957c6592
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
38 additions
and
7 deletions
+38
-7
public/app/features/explore/Panel.tsx
+2
-5
public/sass/pages/_dashboard.scss
+2
-2
public/sass/pages/_explore.scss
+34
-0
No files found.
public/app/features/explore/Panel.tsx
View file @
07331b4c
...
...
@@ -13,6 +13,7 @@ export default class Panel extends PureComponent<Props> {
render
()
{
const
{
isOpen
,
loading
}
=
this
.
props
;
const
iconClass
=
isOpen
?
'fa fa-caret-up'
:
'fa fa-caret-down'
;
const
loaderClass
=
loading
?
'explore-panel__loader explore-panel__loader--active'
:
'explore-panel__loader'
;
return
(
<
div
className=
"explore-panel panel-container"
>
<
div
className=
"explore-panel__header"
onClick=
{
this
.
onClickToggle
}
>
...
...
@@ -23,11 +24,7 @@ export default class Panel extends PureComponent<Props> {
</
div
>
{
isOpen
&&
(
<
div
className=
"explore-panel__body"
>
{
loading
&&
(
<
span
className=
"panel-loading"
>
<
i
className=
"fa fa-spinner fa-spin"
/>
</
span
>
)
}
<
div
className=
{
loaderClass
}
/>
{
this
.
props
.
children
}
</
div
>
)
}
...
...
public/sass/pages/_dashboard.scss
View file @
07331b4c
...
...
@@ -144,8 +144,8 @@ div.flot-text {
.panel-loading
{
position
:
absolute
;
top
:
0
;
right
:
3
px
;
top
:
-3px
;
right
:
0
px
;
z-index
:
800
;
font-size
:
$font-size-sm
;
color
:
$text-color-weak
;
...
...
public/sass/pages/_explore.scss
View file @
07331b4c
...
...
@@ -112,6 +112,40 @@
flex-wrap
:
wrap
;
}
.explore-panel__loader
{
height
:
2px
;
position
:
relative
;
overflow
:
hidden
;
background
:
none
;
margin
:
$panel-margin
/
2
;
transition
:
background-color
1s
ease
;
}
.explore-panel__loader--active
{
background
:
$text-color-faint
;
}
.explore-panel__loader--active
:after
{
content
:
' '
;
display
:
block
;
width
:
25%
;
top
:
0
;
top
:
-50%
;
height
:
250%
;
position
:
absolute
;
animation
:
loader
2s
cubic-bezier
(
0
.17
,
0
.67
,
0
.83
,
0
.67
);
animation-iteration-count
:
100
;
background
:
$blue
;
}
@keyframes
loader
{
from
{
left
:
-25%
;
}
to
{
left
:
100%
;
}
}
.datasource-picker
{
min-width
:
200px
;
...
...
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