Rebase fixes

public/app/features/explore/Logs.tsx

@@ -180,7 +180,7 @@ class Row extends PureComponent<RowProps, RowState> {
         {showDuplicates && (
         {showDuplicates && (
           <div className="logs-row__duplicates">{row.duplicates > 0 ? `${row.duplicates + 1}x` : null}</div>
           <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 && (
         {showUtc && (
           <div className="logs-row__time" title={`Local: ${row.timeLocal} (${row.timeFromNow})`}>
           <div className="logs-row__time" title={`Local: ${row.timeLocal} (${row.timeFromNow})`}>
             {row.timestamp}
             {row.timestamp}
@@ -217,13 +217,15 @@ class Row extends PureComponent<RowProps, RowState> {
             )}
             )}
           {!parsed && !needsHighlighter && row.entry}
           {!parsed && !needsHighlighter && row.entry}
           {showFieldStats && (
           {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>
       </div>
       </div>

public/sass/components/_panel_logs.scss

@@ -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 {
 .logs-row__field-highlight:hover {
   color: $typeahead-selected-color;
   color: $typeahead-selected-color;
   border-bottom-style: solid;
   border-bottom-style: solid;