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
b369b7e4
Commit
b369b7e4
authored
Feb 12, 2016
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ux(): added page-dashboard body class
parent
8c1195b2
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
38 additions
and
18 deletions
+38
-18
public/app/core/components/grafana_app.ts
+10
-1
public/app/core/core.ts
+1
-1
public/app/core/directives/dash_class.js
+1
-1
public/app/core/routes/routes.ts
+5
-0
public/app/partials/dashboard.html
+3
-3
public/less/gfbox.less
+0
-0
public/less/grafana.less
+17
-0
public/less/overrides.less
+0
-11
public/less/sidemenu.less
+1
-1
No files found.
public/app/core/components/grafana_app.ts
View file @
b369b7e4
...
...
@@ -171,7 +171,16 @@ export function grafanaAppDirective(playlistSrv, contextSrv) {
});
// tooltip removal fix
scope
.
$on
(
"$routeChangeSuccess"
,
function
()
{
// manage page classes
var
pageClass
;
scope
.
$on
(
"$routeChangeSuccess"
,
function
(
evt
,
data
)
{
if
(
pageClass
)
{
body
.
removeClass
(
pageClass
);
}
pageClass
=
data
.
$$route
.
pageClass
;
if
(
pageClass
)
{
body
.
addClass
(
pageClass
);
}
$
(
"#tooltip, .tooltip"
).
remove
();
});
...
...
public/app/core/core.ts
View file @
b369b7e4
...
...
@@ -2,7 +2,7 @@
///<reference path="./mod_defs.d.ts" />
import
"./directives/annotation_tooltip"
;
import
"./directives/
body
_class"
;
import
"./directives/
dash
_class"
;
import
"./directives/confirm_click"
;
import
"./directives/dash_edit_link"
;
import
"./directives/dash_upload"
;
...
...
public/app/core/directives/
body
_class.js
→
public/app/core/directives/
dash
_class.js
View file @
b369b7e4
...
...
@@ -6,7 +6,7 @@ define([
function
(
_
,
$
,
coreModule
)
{
'use strict'
;
coreModule
.
default
.
directive
(
'
body
Class'
,
function
()
{
coreModule
.
default
.
directive
(
'
dash
Class'
,
function
()
{
return
{
link
:
function
(
$scope
,
elem
)
{
...
...
public/app/core/routes/routes.ts
View file @
b369b7e4
...
...
@@ -18,25 +18,30 @@ function setupAngularRoutes($routeProvider, $locationProvider) {
templateUrl
:
'public/app/partials/dashboard.html'
,
controller
:
'LoadDashboardCtrl'
,
reloadOnSearch
:
false
,
pageClass
:
'page-dashboard'
,
})
.
when
(
'/dashboard/:type/:slug'
,
{
templateUrl
:
'public/app/partials/dashboard.html'
,
controller
:
'LoadDashboardCtrl'
,
reloadOnSearch
:
false
,
pageClass
:
'page-dashboard'
,
})
.
when
(
'/dashboard-solo/:type/:slug'
,
{
templateUrl
:
'public/app/features/panel/partials/soloPanel.html'
,
controller
:
'SoloPanelCtrl'
,
pageClass
:
'page-dashboard'
,
})
.
when
(
'/dashboard-import/:file'
,
{
templateUrl
:
'public/app/partials/dashboard.html'
,
controller
:
'DashFromImportCtrl'
,
reloadOnSearch
:
false
,
pageClass
:
'page-dashboard'
,
})
.
when
(
'/dashboard/new'
,
{
templateUrl
:
'public/app/partials/dashboard.html'
,
controller
:
'NewDashboardCtrl'
,
reloadOnSearch
:
false
,
pageClass
:
'page-dashboard'
,
})
.
when
(
'/import/dashboard'
,
{
templateUrl
:
'public/app/features/dashboard/partials/import.html'
,
...
...
public/app/partials/dashboard.html
View file @
b369b7e4
<div
body-class
class=
"dashboard"
ng-if=
"dashboard"
>
<div
dash-class
ng-if=
"dashboard"
>
<dashnav></dashnav>
<div
class=
"
main-view
-container"
>
<div
class=
"
dashboard
-container"
>
<div
dash-editor-view
></div>
<dashboard-search></dashboard-search>
...
...
@@ -105,5 +105,5 @@
</span>
</div>
</div>
</div>
</div>
public/less/gfbox.less
View file @
b369b7e4
public/less/grafana.less
View file @
b369b7e4
...
...
@@ -88,6 +88,23 @@
overflow: auto;
}
.dashboard-container {
padding: 5px 5px;
width: 100%;
box-sizing: border-box;
}
.main-view {
background-image: url(/img/grafana_pattern.png);
background-position: 100% -550px;
background-repeat: no-repeat;
}
.page-dashboard {
.main-view {
background-image: none;
}
}
//
// Srollbars
...
...
public/less/overrides.less
View file @
b369b7e4
...
...
@@ -14,19 +14,8 @@
padding-right: 0px;
}
.main-view-container {
padding: 5px 10px;
width: 100%;
box-sizing: border-box;
}
// Backgrounds
// ---------------------
.main-view {
// background: url(/img/grafana_pattern.png);
background-position: 100% -550px;
background-repeat: no-repeat;
}
.bgNav {
background: @navbarBackground;
...
...
public/less/sidemenu.less
View file @
b369b7e4
...
...
@@ -31,7 +31,7 @@
.sidemenu-wrapper {
min-height: 100%;
}
.
main-view
-container {
.
dashboard
-container {
padding-left: @sideMenuWidth;
}
.page-container {
...
...
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