Commit ff0ca6b7 by Patrick O'Carroll

added two new classes for color, fixed so link has value color

parent b03e3242
...@@ -216,8 +216,8 @@ export class TableRenderer { ...@@ -216,8 +216,8 @@ export class TableRenderer {
var cellClass = ''; var cellClass = '';
if (this.colorState.cell) { if (this.colorState.cell) {
style = ' style="background-color:' + this.colorState.cell + ';color: white"'; style = ' style="background-color:' + this.colorState.cell + '"';
cellClasses.push('white'); cellClasses.push('table-panel-color-cell');
this.colorState.cell = null; this.colorState.cell = null;
} else if (this.colorState.value) { } else if (this.colorState.value) {
style = ' style="color:' + this.colorState.value + '"'; style = ' style="color:' + this.colorState.value + '"';
...@@ -253,11 +253,8 @@ export class TableRenderer { ...@@ -253,11 +253,8 @@ export class TableRenderer {
cellClasses.push('table-panel-cell-link'); cellClasses.push('table-panel-cell-link');
if (this.colorState.row) {
cellClasses.push('white');
}
columnHtml += ` columnHtml += `
<a href="${cellLink}" target="${cellTarget}" data-link-tooltip data-original-title="${cellLinkTooltip}" data-placement="right"> <a href="${cellLink}" target="${cellTarget}" data-link-tooltip data-original-title="${cellLinkTooltip}" data-placement="right"${style}>
${value} ${value}
</a> </a>
`; `;
...@@ -291,6 +288,8 @@ export class TableRenderer { ...@@ -291,6 +288,8 @@ export class TableRenderer {
let startPos = page * pageSize; let startPos = page * pageSize;
let endPos = Math.min(startPos + pageSize, this.table.rows.length); let endPos = Math.min(startPos + pageSize, this.table.rows.length);
var html = ''; var html = '';
let rowClasses = [];
let rowClass = '';
for (var y = startPos; y < endPos; y++) { for (var y = startPos; y < endPos; y++) {
let row = this.table.rows[y]; let row = this.table.rows[y];
...@@ -301,11 +300,16 @@ export class TableRenderer { ...@@ -301,11 +300,16 @@ export class TableRenderer {
} }
if (this.colorState.row) { if (this.colorState.row) {
rowStyle = ' style="background-color:' + this.colorState.row + ';color: white"'; rowStyle = ' style="background-color:' + this.colorState.row + '"';
rowClasses.push('table-panel-color-row');
this.colorState.row = null; this.colorState.row = null;
} }
html += '<tr ' + rowStyle + '>' + cellHtml + '</tr>'; if (rowClasses.length) {
rowClass = ' class="' + rowClasses.join(' ') + '"';
}
html += '<tr ' + rowClass + rowStyle + '>' + cellHtml + '</tr>';
} }
return html; return html;
......
...@@ -87,12 +87,6 @@ ...@@ -87,12 +87,6 @@
height: 100%; height: 100%;
display: inline-block; display: inline-block;
} }
&.white {
a {
color: white;
}
}
} }
&.cell-highlighted:hover { &.cell-highlighted:hover {
...@@ -139,3 +133,17 @@ ...@@ -139,3 +133,17 @@
height: 0px; height: 0px;
line-height: 0px; line-height: 0px;
} }
.table-panel-color-cell {
color: white;
a {
color: white;
}
}
.table-panel-color-row {
color: white;
a {
color: white;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment