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
8c1195b2
Commit
8c1195b2
authored
Feb 12, 2016
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor(): no change, only minor refactor, and update of fontsize to 14px
parent
6cdc1e4d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
13 deletions
+15
-13
public/app/core/components/grafana_app.ts
+12
-10
public/less/variables.dark.less
+2
-2
public/less/variables.light.less
+1
-1
No files found.
public/app/core/components/grafana_app.ts
View file @
8c1195b2
...
...
@@ -77,8 +77,8 @@ export class GrafanaCtrl {
});
};
f
(
root
);
$rootScope
.
performance
.
scopeCount
=
scopes
;
f
(
root
);
return
count
;
};
...
...
@@ -140,21 +140,23 @@ export class GrafanaCtrl {
}
/** @ngInject */
export
function
grafanaAppDirective
(
playlistSrv
)
{
export
function
grafanaAppDirective
(
playlistSrv
,
contextSrv
)
{
return
{
restrict
:
'E'
,
controller
:
GrafanaCtrl
,
link
:
(
scope
,
elem
)
=>
{
var
ignoreSideMenuHide
;
var
body
=
$
(
'body'
);
// handle sidemenu open state
scope
.
$watch
(
'contextSrv.sidemenu'
,
newVal
=>
{
if
(
newVal
!==
undefined
)
{
elem
.
toggleClass
(
'sidemenu-open'
,
scope
.
contextSrv
.
sidemenu
);
body
.
toggleClass
(
'sidemenu-open'
,
scope
.
contextSrv
.
sidemenu
);
if
(
!
newVal
)
{
scope
.
contextSrv
.
setPinnedState
(
false
);
contextSrv
.
setPinnedState
(
false
);
}
}
if
(
scope
.
contextSrv
.
sidemenu
)
{
if
(
contextSrv
.
sidemenu
)
{
ignoreSideMenuHide
=
true
;
setTimeout
(()
=>
{
ignoreSideMenuHide
=
false
;
...
...
@@ -164,7 +166,7 @@ export function grafanaAppDirective(playlistSrv) {
scope
.
$watch
(
'contextSrv.pinned'
,
newVal
=>
{
if
(
newVal
!==
undefined
)
{
elem
.
toggleClass
(
'sidemenu-pinned'
,
newVal
);
body
.
toggleClass
(
'sidemenu-pinned'
,
newVal
);
}
});
...
...
@@ -174,18 +176,18 @@ export function grafanaAppDirective(playlistSrv) {
});
// handle document clicks that should hide things
elem
.
click
(
function
(
evt
)
{
body
.
click
(
function
(
evt
)
{
var
target
=
$
(
evt
.
target
);
if
(
target
.
parents
().
length
===
0
)
{
return
;
}
if
(
target
.
parents
(
'.dash-playlist-actions'
).
length
===
0
)
{
playlistSrv
.
stop
();
playlistSrv
.
stop
();
}
// hide search
if
(
elem
.
find
(
'.search-container'
).
length
>
0
)
{
if
(
body
.
find
(
'.search-container'
).
length
>
0
)
{
if
(
target
.
parents
(
'.search-container'
).
length
===
0
)
{
scope
.
$apply
(
function
()
{
scope
.
appEvent
(
'hide-dash-search'
);
...
...
@@ -193,7 +195,7 @@ export function grafanaAppDirective(playlistSrv) {
}
}
// hide sidemenu
if
(
!
ignoreSideMenuHide
&&
!
scope
.
contextSrv
.
pinned
&&
elem
.
find
(
'.sidemenu'
).
length
>
0
)
{
if
(
!
ignoreSideMenuHide
&&
!
contextSrv
.
pinned
&&
body
.
find
(
'.sidemenu'
).
length
>
0
)
{
if
(
target
.
parents
(
'.sidemenu'
).
length
===
0
)
{
scope
.
$apply
(
function
()
{
scope
.
contextSrv
.
toggleSideMenu
();
...
...
public/less/variables.dark.less
View file @
8c1195b2
...
...
@@ -71,8 +71,8 @@
@serifFontFamily: Georgia, "Times New Roman", Times, serif;
@monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace;
@baseFontSize: 1
3
px;
@baseFontWeight: 400;
@baseFontSize: 1
4
px;
@baseFontWeight:
400;
@baseFontFamily: @sansFontFamily;
@baseLineHeight: 20px;
@altFontFamily: @serifFontFamily;
...
...
public/less/variables.light.less
View file @
8c1195b2
...
...
@@ -85,7 +85,7 @@
@monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace;
@baseFontSize: 14px;
@baseFontWeight: 400;
@baseFontWeight:
400;
@baseFontFamily: @sansFontFamily;
@baseLineHeight: 20px;
@altFontFamily: @serifFontFamily;
...
...
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