From 36d981597ed1e6b22ada8c49884f99b7d02444d0 Mon Sep 17 00:00:00 2001 From: Patrick O'Carroll Date: Thu, 2 Aug 2018 11:18:21 +0200 Subject: [PATCH] removed table-panel-link class and add a class white to modify table-panel-cell-link class --- public/app/plugins/panel/table/renderer.ts | 18 ++++++------------ .../plugins/panel/table/specs/renderer.jest.ts | 2 +- public/sass/components/_panel_table.scss | 6 ++++++ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/public/app/plugins/panel/table/renderer.ts b/public/app/plugins/panel/table/renderer.ts index 474e9c89493..e4d3626c3b9 100644 --- a/public/app/plugins/panel/table/renderer.ts +++ b/public/app/plugins/panel/table/renderer.ts @@ -214,15 +214,10 @@ export class TableRenderer { var style = ''; var cellClasses = []; var cellClass = ''; - var linkClass = ''; - - if (this.colorState.row) { - linkClass = 'table-panel-link'; - } if (this.colorState.cell) { style = ' style="background-color:' + this.colorState.cell + ';color: white"'; - linkClass = 'table-panel-link'; + cellClasses.push('white'); this.colorState.cell = null; } else if (this.colorState.value) { style = ' style="color:' + this.colorState.value + '"'; @@ -257,13 +252,12 @@ export class TableRenderer { var cellTarget = column.style.linkTargetBlank ? '_blank' : ''; cellClasses.push('table-panel-cell-link'); + + if (this.colorState.row) { + cellClasses.push('white'); + } columnHtml += ` - + ${value} `; diff --git a/public/app/plugins/panel/table/specs/renderer.jest.ts b/public/app/plugins/panel/table/specs/renderer.jest.ts index f1a686fb739..22957d1aa66 100644 --- a/public/app/plugins/panel/table/specs/renderer.jest.ts +++ b/public/app/plugins/panel/table/specs/renderer.jest.ts @@ -268,7 +268,7 @@ describe('when rendering table', () => { var expectedHtml = ` + target="_blank" data-link-tooltip data-original-title="host1 1230 my.host.com" data-placement="right"> host1 diff --git a/public/sass/components/_panel_table.scss b/public/sass/components/_panel_table.scss index 99e91f8ff67..c793cd408b6 100644 --- a/public/sass/components/_panel_table.scss +++ b/public/sass/components/_panel_table.scss @@ -87,6 +87,12 @@ height: 100%; display: inline-block; } + + &.white { + a { + color: white; + } + } } &.cell-highlighted:hover {