Parcourir la source

Merge branch 'info-corner-refinements'

Torkel Ödegaard il y a 9 ans
Parent
commit
0a0b4f5533

+ 1 - 1
public/app/features/panel/panel_directive.ts

@@ -159,7 +159,7 @@ module.directive('grafanaPanel', function($rootScope) {
             position: 'right middle',
             position: 'right middle',
             classes: ctrl.error ? 'drop-error' : 'drop-help',
             classes: ctrl.error ? 'drop-error' : 'drop-help',
             openOn: 'hover',
             openOn: 'hover',
-            hoverOpenDelay: 400,
+            hoverOpenDelay: 100,
           });
           });
         }
         }
       }
       }

+ 1 - 0
public/sass/components/_modals.scss

@@ -67,6 +67,7 @@
 
 
 .modal-content {
 .modal-content {
   padding: $spacer*2;
   padding: $spacer*2;
+  min-height: $spacer*15;
 }
 }
 
 
 // Remove bottom margin if need be
 // Remove bottom margin if need be

+ 8 - 7
public/sass/pages/_dashboard.scss

@@ -90,7 +90,7 @@ div.flot-text {
 }
 }
 
 
 .panel-info-corner {
 .panel-info-corner {
-  color: $text-color;
+  color: $text-muted;
   cursor: pointer;
   cursor: pointer;
   position: absolute;
   position: absolute;
   display: none;
   display: none;
@@ -102,14 +102,14 @@ div.flot-text {
 
 
   .fa {
   .fa {
     position: relative;
     position: relative;
-    top: -2px;
-    left: -5px;
-    font-size: 90%;
+    top: -4px;
+    left: -6px;
+    font-size: 75%;
   }
   }
 
 
   &--info {
   &--info {
     display: block;
     display: block;
-    background: $blue-dark;
+    background: lighten($panel-bg, 4%);
     .fa:before {
     .fa:before {
       content: "\f129";
       content: "\f129";
     }
     }
@@ -117,9 +117,9 @@ div.flot-text {
 
 
   &--links {
   &--links {
     display: block;
     display: block;
-    background: $blue-dark;
+    background: lighten($panel-bg, 4%);
     .fa {
     .fa {
-      left: -3px;
+      left: -5px;
     }
     }
     .fa:before {
     .fa:before {
       content: "\f08e";
       content: "\f08e";
@@ -128,6 +128,7 @@ div.flot-text {
 
 
   &--error {
   &--error {
     display: block;
     display: block;
+    color: $text-color;
     background: $errorBackground !important;
     background: $errorBackground !important;
     .fa:before {
     .fa:before {
       content: "\f12a";
       content: "\f12a";