IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

playlist: fixed playlist buttons in dashboard header, fixes #10213

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-12-14 14:27:47 +01:00
parent 0085114d4e
commit 4e38526404
6 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/core/components/grafana_app.ts
View File

@@ -203,7 +203,7 @@ export function grafanaAppDirective(playlistSrv, contextSrv, $timeout, $rootScop
}, 100); }, 100);
} }
if (target.parents('.dash-playlist-actions').length === 0) { if (target.parents('.navbar-buttons--playlist').length === 0) {
playlistSrv.stop(); playlistSrv.stop();
} }

1
public/app/core/services/backend_srv.ts
View File

@@ -248,4 +248,5 @@ export class BackendSrv {
} }
} }
coreModule.service('backendSrv', BackendSrv); coreModule.service('backendSrv', BackendSrv);

1
public/app/features/dashboard/dashgrid/RowOptions.ts
View File

@@ -6,6 +6,7 @@ export class RowOptionsCtrl {
dismiss: any; dismiss: any;
onUpdated: any; onUpdated: any;
onDelete: any; onDelete: any;
showDelete: boolean;
/** @ngInject */ /** @ngInject */
constructor() { constructor() {

16
public/app/features/dashboard/dashnav/dashnav.html
View File

@@ -8,17 +8,11 @@
</a> </a>
</div> </div>
<ul class="nav dash-playlist-actions" ng-if="ctrl.playlistSrv.isPlaying"> <div class="navbar-buttons navbar-buttons--playlist" ng-if="ctrl.playlistSrv.isPlaying">
<li> <a class="navbar-button navbar-button--tight" ng-click="ctrl.playlistSrv.prev()"><i class="fa fa-step-backward"></i></a>
<a ng-click="ctrl.playlistSrv.prev()"><i class="fa fa-step-backward"></i></a> <a class="navbar-button navbar-button--tight" ng-click="ctrl.playlistSrv.stop()"><i class="fa fa-stop"></i></a>
</li> <a class="navbar-button navbar-button--tight" ng-click="ctrl.playlistSrv.next()"><i class="fa fa-step-forward"></i></a>
<li> </div>
<a ng-click="ctrl.playlistSrv.stop()"><i class="fa fa-stop"></i></a>
</li>
<li>
<a ng-click="ctrl.playlistSrv.next()"><i class="fa fa-step-forward"></i></a>
</li>
</ul>
<div class="navbar__spacer"></div> <div class="navbar__spacer"></div>

8
public/sass/components/_row.scss
View File

@@ -17,6 +17,13 @@
opacity: 1; opacity: 1;
} }
} }
&:hover {
.dashboard-row__actions {
visibility: visible;
opacity: 1;
}
}
} }
.dashboard-row__title { .dashboard-row__title {
@@ -37,6 +44,7 @@
visibility: hidden; visibility: hidden;
opacity: 0; opacity: 0;
flex-grow: 1; flex-grow: 1;
transition: 200ms opacity ease-in 200ms;
a { a {
color: $text-color-weak; color: $text-color-weak;

8
public/sass/components/_view_states.scss
View File

@@ -38,11 +38,3 @@
} }
} }
.playlist-active {
.dash-playlist-actions {
.fa {
opacity: 1;
color: $text-color-faint !important;
}
}
}