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
b3ddcc80
Commit
b3ddcc80
authored
Nov 23, 2017
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ux: sass fixes and polish
parent
d9ecb59d
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
97 additions
and
20 deletions
+97
-20
public/app/core/components/search/search.html
+1
-1
public/app/core/components/search/search.ts
+3
-4
public/app/features/panel/panel_directive.ts
+1
-1
public/app/plugins/panel/alertlist/module.html
+1
-1
public/sass/components/_scrollbar.scss
+91
-5
public/sass/components/_search.scss
+0
-8
yarn.lock
+0
-0
No files found.
public/app/core/components/search/search.html
View file @
b3ddcc80
...
@@ -52,7 +52,7 @@
...
@@ -52,7 +52,7 @@
</div>
</div>
<div
class=
"search-results-container"
ng-if=
"!ctrl.tagsMode"
grafana-scrollbar
>
<div
class=
"search-results-container"
ng-if=
"!ctrl.tagsMode"
grafana-scrollbar
>
<h6
ng-
hide=
"ctrl.
results.length"
>
No dashboards matching your query were found.
</h6>
<h6
ng-
show=
"!ctrl.isLoading &&
results.length"
>
No dashboards matching your query were found.
</h6>
<div
ng-repeat=
"section in ctrl.results"
class=
"search-section"
>
<div
ng-repeat=
"section in ctrl.results"
class=
"search-section"
>
<a
class=
"search-section__header pointer"
ng-hide=
"section.hideHeader"
ng-click=
"ctrl.toggleFolder(section)"
>
<a
class=
"search-section__header pointer"
ng-hide=
"section.hideHeader"
ng-click=
"ctrl.toggleFolder(section)"
>
...
...
public/app/core/components/search/search.ts
View file @
b3ddcc80
...
@@ -13,8 +13,7 @@ export class SearchCtrl {
...
@@ -13,8 +13,7 @@ export class SearchCtrl {
showImport
:
boolean
;
showImport
:
boolean
;
dismiss
:
any
;
dismiss
:
any
;
ignoreClose
:
any
;
ignoreClose
:
any
;
// triggers fade animation class
isLoading
:
boolean
;
openCompleted
:
boolean
;
/** @ngInject */
/** @ngInject */
constructor
(
$scope
,
private
$location
,
private
$timeout
,
private
searchSrv
:
SearchSrv
,
$rootScope
)
{
constructor
(
$scope
,
private
$location
,
private
$timeout
,
private
searchSrv
:
SearchSrv
,
$rootScope
)
{
...
@@ -24,7 +23,6 @@ export class SearchCtrl {
...
@@ -24,7 +23,6 @@ export class SearchCtrl {
closeSearch
()
{
closeSearch
()
{
this
.
isOpen
=
this
.
ignoreClose
;
this
.
isOpen
=
this
.
ignoreClose
;
this
.
openCompleted
=
false
;
}
}
openSearch
(
evt
,
payload
)
{
openSearch
(
evt
,
payload
)
{
...
@@ -40,6 +38,7 @@ export class SearchCtrl {
...
@@ -40,6 +38,7 @@ export class SearchCtrl {
this
.
query
=
{
query
:
''
,
tag
:
[],
starred
:
false
};
this
.
query
=
{
query
:
''
,
tag
:
[],
starred
:
false
};
this
.
currentSearchId
=
0
;
this
.
currentSearchId
=
0
;
this
.
ignoreClose
=
true
;
this
.
ignoreClose
=
true
;
this
.
isLoading
=
true
;
if
(
payload
&&
payload
.
starred
)
{
if
(
payload
&&
payload
.
starred
)
{
this
.
query
.
starred
=
true
;
this
.
query
.
starred
=
true
;
...
@@ -54,7 +53,6 @@ export class SearchCtrl {
...
@@ -54,7 +53,6 @@ export class SearchCtrl {
}
}
this
.
$timeout
(()
=>
{
this
.
$timeout
(()
=>
{
this
.
openCompleted
=
true
;
this
.
ignoreClose
=
false
;
this
.
ignoreClose
=
false
;
this
.
giveSearchFocus
=
this
.
giveSearchFocus
+
1
;
this
.
giveSearchFocus
=
this
.
giveSearchFocus
+
1
;
this
.
search
();
this
.
search
();
...
@@ -102,6 +100,7 @@ export class SearchCtrl {
...
@@ -102,6 +100,7 @@ export class SearchCtrl {
return
this
.
searchSrv
.
search
(
this
.
query
).
then
(
results
=>
{
return
this
.
searchSrv
.
search
(
this
.
query
).
then
(
results
=>
{
if
(
localSearchId
<
this
.
currentSearchId
)
{
return
;
}
if
(
localSearchId
<
this
.
currentSearchId
)
{
return
;
}
this
.
results
=
results
;
this
.
results
=
results
;
this
.
isLoading
=
false
;
});
});
}
}
...
...
public/app/features/panel/panel_directive.ts
View file @
b3ddcc80
...
@@ -86,7 +86,7 @@ module.directive('grafanaPanel', function($rootScope, $document) {
...
@@ -86,7 +86,7 @@ module.directive('grafanaPanel', function($rootScope, $document) {
}
}
function
panelHeightUpdated
()
{
function
panelHeightUpdated
()
{
panelContent
.
height
(
ctrl
.
height
);
panelContent
.
css
({
height
:
ctrl
.
height
+
'px'
}
);
if
(
panelScrollbar
)
{
if
(
panelScrollbar
)
{
panelScrollbar
.
update
();
panelScrollbar
.
update
();
}
}
...
...
public/app/plugins/panel/alertlist/module.html
View file @
b3ddcc80
<div
class=
"panel-alert-list"
ng-style=
"{height: ctrl.height + 'px'}"
>
<div
class=
"panel-alert-list"
>
<div
class=
"panel-alert-list__no-alerts"
ng-show=
"ctrl.noAlertsMessage"
>
<div
class=
"panel-alert-list__no-alerts"
ng-show=
"ctrl.noAlertsMessage"
>
{{ctrl.noAlertsMessage}}
{{ctrl.noAlertsMessage}}
</div>
</div>
...
...
public/sass/components/_scrollbar.scss
View file @
b3ddcc80
@import
"~perfect-scrollbar/css/perfect-scrollbar.css"
;
/*
* Container style
*/
.ps
{
overflow
:
hidden
!
important
;
overflow-anchor
:
none
;
-ms-overflow-style
:
none
;
touch-action
:
auto
;
-ms-touch-action
:
auto
;
}
/*
* Scrollbar rail styles
*/
.ps__rail-x
{
display
:
none
;
opacity
:
0
;
transition
:
background-color
.2s
linear
,
opacity
.2s
linear
;
-webkit-transition
:
background-color
.2s
linear
,
opacity
.2s
linear
;
height
:
15px
;
/* there must be 'bottom' or 'top' for ps__rail-x */
bottom
:
0px
;
/* please don't change 'position' */
position
:
absolute
;
}
.ps__rail-y
{
display
:
none
;
opacity
:
0
;
transition
:
background-color
.2s
linear
,
opacity
.2s
linear
;
-webkit-transition
:
background-color
.2s
linear
,
opacity
.2s
linear
;
width
:
15px
;
/* there must be 'right' or 'left' for ps__rail-y */
right
:
0
;
/* please don't change 'position' */
position
:
absolute
;
}
.ps--active-x
>
.ps__rail-x
,
.ps--active-y
>
.ps__rail-y
{
display
:
block
;
background-color
:
transparent
;
}
.ps--focus
>
.ps__rail-x
,
.ps--focus
>
.ps__rail-y
,
.ps--scrolling-x
>
.ps__rail-x
,
.ps--scrolling-y
>
.ps__rail-y
{
opacity
:
0
.6
;
}
.ps__rail-x
:hover
,
.ps__rail-x
:hover
,
.ps__rail-y
:hover
,
.ps__rail-y
:hover
,
...
@@ -8,14 +57,51 @@
...
@@ -8,14 +57,51 @@
opacity
:
0
.9
;
opacity
:
0
.9
;
}
}
/*
* Scrollbar thumb styles
*/
.ps__thumb-x
{
background-color
:
#aaa
;
border-radius
:
6px
;
height
:
6px
;
/* there must be 'bottom' for ps__thumb-x */
bottom
:
2px
;
/* please don't change 'position' */
position
:
absolute
;
}
.ps__thumb-y
{
.ps__thumb-y
{
@include
gradient-vertical
(
$blue
,
lighten
(
$blue
,
20%
));
@include
gradient-vertical
(
$blue
,
lighten
(
$blue
,
20%
));
border-radius
:
6px
;
width
:
6px
;
/* there must be 'right' for ps__thumb-y */
right
:
2px
;
/* please don't change 'position' */
position
:
absolute
;
}
}
.ps__rail-y
:hover
>
.ps__thumb-y
,
.ps__rail-y
:focus
>
.ps__thumb-y
{
/* MS supports */
background-color
:
#999
;
@supports
(
-ms-overflow-style
:
none
)
{
width
:
6px
;
.ps
{
overflow
:
auto
!
important
;
}
}
@media
screen
and
(
-
ms-high-contrast
:
active
)
,
(
-
ms-high-contrast
:
none
)
{
.ps
{
overflow
:
auto
!
important
;
}
}
.ps
:hover
>
.ps__rail-x
,
.ps
:hover
>
.ps__rail-y
{
}
.ps__rail-x
:hover
,
.ps__rail-y
:hover
,
.ps__rail-x
:focus
,
.ps__rail-y
:focus
{
background-color
:
transparent
;
opacity
:
0
.9
;
}
}
// Srollbars
// Srollbars
...
...
public/sass/components/_search.scss
View file @
b3ddcc80
...
@@ -59,16 +59,8 @@
...
@@ -59,16 +59,8 @@
display
:
flex
;
display
:
flex
;
flex-direction
:
column
;
flex-direction
:
column
;
max-width
:
800px
;
max-width
:
800px
;
visibility
:
none
;
opacity
:
0
;
background
:
$page-bg
;
background
:
$page-bg
;
height
:
calc
(
100%
-
#{
$navbarHeight
}
);
height
:
calc
(
100%
-
#{
$navbarHeight
}
);
&
--fade-in
{
visibility
:
visible
;
opacity
:
1
;
transition
:
opacity
0
.3s
;
}
}
}
.search-results-container
{
.search-results-container
{
...
...
yarn.lock
deleted
100644 → 0
View file @
d9ecb59d
This source diff could not be displayed because it is too large. You can
view the blob
instead.
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