Bladeren bron

Merge pull request #11416 from grafana/ie11_graphpanel_edit

Graphpanel Edit fix for IE11
Daniel Lee 7 jaren geleden
bovenliggende
commit
a6a08038d4
2 gewijzigde bestanden met toevoegingen van 5 en 2 verwijderingen
  1. 4 1
      public/app/plugins/panel/graph/legend.ts
  2. 1 1
      public/sass/pages/_dashboard.scss

+ 4 - 1
public/app/plugins/panel/graph/legend.ts

@@ -131,8 +131,11 @@ module.directive('graphLegend', function(popoverSrv, $timeout) {
         elem.empty();
 
         // Set min-width if side style and there is a value, otherwise remove the CSS propery
-        var width = panel.legend.rightSide && panel.legend.sideWidth ? panel.legend.sideWidth + 'px' : '';
+        // Set width so it works with IE11
+        var width: any = panel.legend.rightSide && panel.legend.sideWidth ? panel.legend.sideWidth + 'px' : '';
+        var ieWidth: any = panel.legend.rightSide && panel.legend.sideWidth ? panel.legend.sideWidth - 1 + 'px' : '';
         elem.css('min-width', width);
+        elem.css('width', ieWidth);
 
         elem.toggleClass('graph-legend-table', panel.legend.alignAsTable === true);
 

+ 1 - 1
public/sass/pages/_dashboard.scss

@@ -33,7 +33,7 @@ div.flot-text {
   border: $panel-border;
   position: relative;
   border-radius: 3px;
-  height: 100%;
+  //height: 100%;
 
   &.panel-transparent {
     background-color: transparent;