From 0c85e845df25b5cbb3bc5e39ac4d5e9c82cba154 Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 16 Dec 2016 12:11:29 -0500 Subject: [PATCH 1/3] Softened the color a bit by mixing in the panel-bg, so it's not introducing any new variables. Was too start as pure body-bg --- public/sass/components/_modals.scss | 1 + public/sass/pages/_dashboard.scss | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/public/sass/components/_modals.scss b/public/sass/components/_modals.scss index 78293ef801a..76539c0035a 100644 --- a/public/sass/components/_modals.scss +++ b/public/sass/components/_modals.scss @@ -67,6 +67,7 @@ .modal-content { padding: $spacer*2; + min-height: $spacer*15; } // Remove bottom margin if need be diff --git a/public/sass/pages/_dashboard.scss b/public/sass/pages/_dashboard.scss index 24dc6f1a238..fa5d773bdb7 100644 --- a/public/sass/pages/_dashboard.scss +++ b/public/sass/pages/_dashboard.scss @@ -90,7 +90,7 @@ div.flot-text { } .panel-info-corner { - color: $text-color; + color: $text-muted; cursor: pointer; position: absolute; display: none; @@ -102,14 +102,14 @@ div.flot-text { .fa { position: relative; - top: -2px; + top: -4px; left: -5px; - font-size: 90%; + font-size: 75%; } &--info { display: block; - background: $blue-dark; + background: mix($panel-bg, $body-bg, 35%); .fa:before { content: "\f129"; } @@ -117,7 +117,7 @@ div.flot-text { &--links { display: block; - background: $blue-dark; + background: mix($panel-bg, $body-bg, 35%); .fa { left: -3px; } From 594207b6d3ca86e6acb5645e2d6485140b1b6b31 Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 16 Dec 2016 12:51:22 -0500 Subject: [PATCH 2/3] Polish on icon placement, incorporated torkel's better idea for going slightly lighter, make sure error icon color was white now --- public/sass/pages/_dashboard.scss | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/public/sass/pages/_dashboard.scss b/public/sass/pages/_dashboard.scss index fa5d773bdb7..548d5228fd6 100644 --- a/public/sass/pages/_dashboard.scss +++ b/public/sass/pages/_dashboard.scss @@ -103,13 +103,13 @@ div.flot-text { .fa { position: relative; top: -4px; - left: -5px; + left: -6px; font-size: 75%; } &--info { display: block; - background: mix($panel-bg, $body-bg, 35%); + background: lighten($panel-bg, 4%); .fa:before { content: "\f129"; } @@ -117,9 +117,9 @@ div.flot-text { &--links { display: block; - background: mix($panel-bg, $body-bg, 35%); + background: lighten($panel-bg, 4%); .fa { - left: -3px; + left: -5px; } .fa:before { content: "\f08e"; @@ -128,6 +128,7 @@ div.flot-text { &--error { display: block; + color: $text-color; background: $errorBackground !important; .fa:before { content: "\f12a"; From 2fc2cc721e97e817a4ba5a758bd26e2bb2b6f56c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 16 Dec 2016 21:16:35 +0100 Subject: [PATCH 3/3] change(panel): changed hover delay for #6998 --- public/app/features/panel/panel_directive.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/features/panel/panel_directive.ts b/public/app/features/panel/panel_directive.ts index b405dc67178..9960daabfbe 100644 --- a/public/app/features/panel/panel_directive.ts +++ b/public/app/features/panel/panel_directive.ts @@ -159,7 +159,7 @@ module.directive('grafanaPanel', function($rootScope) { position: 'right middle', classes: ctrl.error ? 'drop-error' : 'drop-help', openOn: 'hover', - hoverOpenDelay: 400, + hoverOpenDelay: 100, }); } }