public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed problem with prettier formatting after cherry picks

Browse Source
This commit is contained in:
Torkel Ödegaard
2019-02-21 15:24:09 +01:00
parent 115215d317
commit d85a4c3dd0
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/explore/LogRow.tsx
+8 -9
View File
@@ -166,15 +166,14 @@ export class LogRow extends PureComponent<Props, State> {
highlightClassName="logs-row__field-highlight" highlightClassName="logs-row__field-highlight"
/> />
)} )}
{!parsed && {!parsed && needsHighlighter && (
needsHighlighter && ( <Highlighter
<Highlighter textToHighlight={row.entry}
textToHighlight={row.entry} searchWords={highlights}
searchWords={highlights} findChunks={findHighlightChunksInText}
findChunks={findHighlightChunksInText} highlightClassName={highlightClassName}
highlightClassName={highlightClassName} />
/> )}
)}
{!parsed && !needsHighlighter && row.entry} {!parsed && !needsHighlighter && row.entry}
{showFieldStats && ( {showFieldStats && (
<div className="logs-row__stats"> <div className="logs-row__stats">
public/sass/components/_settings_permissions.scss
+1 -1
View File
@@ -1,6 +1,6 @@
.permissionlist { .permissionlist {
.permissionlist__section { .permissionlist__section {
margin-bottom: $spacer*2; margin-bottom: $spacer * 2;
} }
.permissionlist__section-header { .permissionlist__section-header {