diff --git a/public/app/core/components/search/search.html b/public/app/core/components/search/search.html
index e8e2179ce5c..cc021bb69ed 100644
--- a/public/app/core/components/search/search.html
+++ b/public/app/core/components/search/search.html
@@ -27,17 +27,13 @@
-
diff --git a/public/app/core/services/keybindingSrv.ts b/public/app/core/services/keybindingSrv.ts
index 3f54722424d..6605b249176 100644
--- a/public/app/core/services/keybindingSrv.ts
+++ b/public/app/core/services/keybindingSrv.ts
@@ -11,7 +11,7 @@ export class KeybindingSrv {
helpModal: boolean;
/** @ngInject */
- constructor(private $rootScope, private $modal, private $location) {
+ constructor(private $rootScope, private $modal, private $location, private contextSrv) {
// clear out all shortcuts on route change
$rootScope.$on('$routeChangeSuccess', () => {
Mousetrap.reset();
@@ -26,6 +26,7 @@ export class KeybindingSrv {
setupGlobal() {
this.bind("?", this.showHelpModal);
this.bind("g h", this.goToHome);
+ this.bind("g a", this.openAlerting);
this.bind("g p", this.goToProfile);
this.bind("s s", this.openSearchStarred);
this.bind(['f'], this.openSearch);
@@ -39,12 +40,16 @@ export class KeybindingSrv {
this.$rootScope.appEvent('show-dash-search');
}
+ openAlerting() {
+ this.$location.url("/alerting");
+ }
+
goToHome() {
- this.$location.path("/");
+ this.$location.url("/");
}
goToProfile() {
- this.$location.path("/profile");
+ this.$location.url("/profile");
}
showHelpModal() {
diff --git a/public/app/features/panel/panel_ctrl.ts b/public/app/features/panel/panel_ctrl.ts
index 2cff5993543..40b7365da23 100644
--- a/public/app/features/panel/panel_ctrl.ts
+++ b/public/app/features/panel/panel_ctrl.ts
@@ -155,7 +155,7 @@ export class PanelCtrl {
if (this.fullscreen) {
var docHeight = $(window).height();
var editHeight = Math.floor(docHeight * 0.4);
- var fullscreenHeight = Math.floor(docHeight * 0.6);
+ var fullscreenHeight = Math.floor(docHeight * 0.8);
this.containerHeight = this.editMode ? editHeight : fullscreenHeight;
} else {
this.containerHeight = this.panel.height || this.row.height;
diff --git a/public/app/features/panel/panel_directive.ts b/public/app/features/panel/panel_directive.ts
index 0fd07d3b63d..70f3d1b3243 100644
--- a/public/app/features/panel/panel_directive.ts
+++ b/public/app/features/panel/panel_directive.ts
@@ -133,11 +133,11 @@ module.directive('grafanaPanel', function($rootScope) {
}
}, scope);
- panelContainer.on('mouseenter', mouseEnter);
- panelContainer.on('mouseleave', mouseLeave);
+ elem.on('mouseenter', mouseEnter);
+ elem.on('mouseleave', mouseLeave);
scope.$on('$destroy', function() {
- panelContainer.off();
+ elem.off();
});
}
};
diff --git a/public/sass/pages/_dashboard.scss b/public/sass/pages/_dashboard.scss
index 024567e0c39..29bda0d34c0 100644
--- a/public/sass/pages/_dashboard.scss
+++ b/public/sass/pages/_dashboard.scss
@@ -156,7 +156,7 @@ div.flot-text {
}
.panel-hover-highlight {
- box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 1px rgba(82,168,236,10.8)
+ box-shadow: inset 0 1px 1px rgba(0,0,0,0.025), 0 0 1px rgba(82,168,236,0.5)
}
.on-drag-hover {