mirror of
https://github.com/grafana/grafana.git
synced 2025-02-16 18:34:52 -06:00
Rebase fixes
This commit is contained in:
parent
acd52e6a93
commit
fb4925a8c2
@ -180,7 +180,7 @@ class Row extends PureComponent<RowProps, RowState> {
|
||||
{showDuplicates && (
|
||||
<div className="logs-row__duplicates">{row.duplicates > 0 ? `${row.duplicates + 1}x` : null}</div>
|
||||
)}
|
||||
<div className={row.logLevel ? `logs-row__level logs__row-level-${row.logLevel}` : ''} />
|
||||
<div className={row.logLevel ? `logs-row__level logs-row__level--${row.logLevel}` : ''} />
|
||||
{showUtc && (
|
||||
<div className="logs-row__time" title={`Local: ${row.timeLocal} (${row.timeFromNow})`}>
|
||||
{row.timestamp}
|
||||
@ -217,13 +217,15 @@ class Row extends PureComponent<RowProps, RowState> {
|
||||
)}
|
||||
{!parsed && !needsHighlighter && row.entry}
|
||||
{showFieldStats && (
|
||||
<Stats
|
||||
stats={fieldStats}
|
||||
label={fieldLabel}
|
||||
value={fieldValue}
|
||||
onClickClose={this.onClickClose}
|
||||
rowCount={fieldCount}
|
||||
/>
|
||||
<div className="logs-row__stats">
|
||||
<Stats
|
||||
stats={fieldStats}
|
||||
label={fieldLabel}
|
||||
value={fieldValue}
|
||||
onClickClose={this.onClickClose}
|
||||
rowCount={fieldCount}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
@ -171,6 +171,14 @@ $column-horizontal-spacing: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
.logs-row__stats {
|
||||
margin: 5px 0;
|
||||
background-color: $popover-bg;
|
||||
color: $popover-color;
|
||||
border: 1px solid $popover-border-color;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
.logs-row__field-highlight:hover {
|
||||
color: $typeahead-selected-color;
|
||||
border-bottom-style: solid;
|
||||
|
Loading…
Reference in New Issue
Block a user