From d85a4c3dd09465dfa59f7cde2694be35fe647f45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Thu, 21 Feb 2019 15:24:09 +0100
Subject: [PATCH] Fixed problem with prettier formatting after cherry picks

---
 public/app/features/explore/LogRow.tsx          | 17 ++++++++---------
 .../sass/components/_settings_permissions.scss  |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/public/app/features/explore/LogRow.tsx b/public/app/features/explore/LogRow.tsx
index 66b0e6a69fe..8b24154bed6 100644
--- a/public/app/features/explore/LogRow.tsx
+++ b/public/app/features/explore/LogRow.tsx
@@ -166,15 +166,14 @@ export class LogRow extends PureComponent<Props, State> {
               highlightClassName="logs-row__field-highlight"
             />
           )}
-          {!parsed &&
-            needsHighlighter && (
-              <Highlighter
-                textToHighlight={row.entry}
-                searchWords={highlights}
-                findChunks={findHighlightChunksInText}
-                highlightClassName={highlightClassName}
-              />
-            )}
+          {!parsed && needsHighlighter && (
+            <Highlighter
+              textToHighlight={row.entry}
+              searchWords={highlights}
+              findChunks={findHighlightChunksInText}
+              highlightClassName={highlightClassName}
+            />
+          )}
           {!parsed && !needsHighlighter && row.entry}
           {showFieldStats && (
             <div className="logs-row__stats">
diff --git a/public/sass/components/_settings_permissions.scss b/public/sass/components/_settings_permissions.scss
index 5864c58679e..9fe7ec73a4b 100644
--- a/public/sass/components/_settings_permissions.scss
+++ b/public/sass/components/_settings_permissions.scss
@@ -1,6 +1,6 @@
 .permissionlist {
   .permissionlist__section {
-    margin-bottom: $spacer*2;
+    margin-bottom: $spacer * 2;
   }
 
   .permissionlist__section-header {