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
097fa743
Commit
097fa743
authored
Aug 14, 2017
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ux: minor navbar update
parent
8aa73401
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
5 deletions
+12
-5
public/app/core/components/navbar/navbar.html
+1
-2
public/app/features/plugins/ds_edit_ctrl.ts
+4
-0
public/app/features/plugins/partials/ds_edit.html
+2
-1
public/sass/_variables.dark.scss
+1
-1
tasks/options/watch.js
+4
-1
No files found.
public/app/core/components/navbar/navbar.html
View file @
097fa743
<div
class=
"page-nav container"
>
<div
class=
"page-breadcrumb"
>
<div
class=
"page-breadcrumb__item dropdown"
ng-repeat=
"item in
::
ctrl.model.items"
>
<div
class=
"page-breadcrumb__item dropdown"
ng-repeat=
"item in ctrl.model.items"
>
<a
class=
"pointer"
ng-href=
"{{::item.url}}"
data-toggle=
"dropdown"
ng-if=
"::item.items"
>
{{::item.title}}
<i
class=
"page-breadcrumb__caret fa fa-caret-down"
></i>
...
...
@@ -14,7 +14,6 @@
<ul
class=
"dropdown-menu dropdown-menu--navbar"
>
<li
ng-repeat=
"subItem in ::item.items"
>
<a
class=
"pointer"
ng-href=
"{{::subItem.url}}"
ng-click=
"ctrl.navItemClicked(subItem, $event)"
>
<i
class=
"{{::subItem.icon}}"
ng-show=
"::subItem.icon"
></i>
{{::subItem.title}}
</a>
</li>
...
...
public/app/features/plugins/ds_edit_ctrl.ts
View file @
097fa743
...
...
@@ -59,6 +59,7 @@ export class DataSourceEditCtrl {
initNewDatasourceModel
()
{
this
.
isNew
=
true
;
this
.
current
=
angular
.
copy
(
defaults
);
this
.
navModel
.
items
.
push
({
title
:
'New data source'
});
// We are coming from getting started
if
(
this
.
$location
.
search
().
gettingstarted
)
{
...
...
@@ -85,10 +86,13 @@ export class DataSourceEditCtrl {
this
.
backendSrv
.
get
(
'/api/datasources/'
+
id
).
then
(
ds
=>
{
this
.
isNew
=
false
;
this
.
current
=
ds
;
this
.
navModel
.
items
.
push
({
title
:
ds
.
name
});
if
(
datasourceCreated
)
{
datasourceCreated
=
false
;
this
.
testDatasource
();
}
return
this
.
typeChanged
();
});
}
...
...
public/app/features/plugins/partials/ds_edit.html
View file @
097fa743
...
...
@@ -4,7 +4,8 @@
<div
class=
"page-header"
>
<h1>
<i
class=
"icon-gf icon-gf-datasources"
></i>
Settings
<span
ng-show=
"ctrl.isNew"
class=
"muted"
>
(new)
</span>
<span
ng-show=
"ctrl.isNew"
>
New data source
</span>
<span
ng-hide=
"ctrl.isNew"
>
{{ctrl.current.name}}
</span>
</h1>
<a
class=
"page-header__cta btn btn-success"
href=
"datasources/new"
ng-show=
"ctrl.isNew"
>
...
...
public/sass/_variables.dark.scss
View file @
097fa743
...
...
@@ -230,7 +230,7 @@ $navbarButtonBackgroundHighlight: $body-bg;
// Sidemenu
// -------------------------
$side-menu-bg
:
$
dark-3
;
$side-menu-bg
:
$
black
;
$side-menu-item-hover-bg
:
$dark-2
;
// Menu dropdowns
...
...
tasks/options/watch.js
View file @
097fa743
...
...
@@ -21,7 +21,10 @@ module.exports = function(config, grunt) {
return
;
}
gaze
(
config
.
srcDir
+
'/**/*'
,
function
(
err
,
watcher
)
{
gaze
([
config
.
srcDir
+
'/sass/**/*'
,
config
.
srcDir
+
'/app/**/*'
,
],
function
(
err
,
watcher
)
{
console
.
log
(
'Gaze watchers setup'
);
...
...
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