From cd02f1a6c35a1a10d822d851a2b5b179ca13fa4c Mon Sep 17 00:00:00 2001
From: Aria Minaei <aria.minaei@gmail.com>
Date: Fri, 20 Aug 2021 21:59:51 +0200
Subject: [PATCH] Style tweaks

---
 .../DetailPanel/ProjectDetails/StateConflictRow.tsx | 13 ++++++++++++-
 .../studio/src/panels/OutlinePanel/OutlinePanel.tsx |  2 +-
 .../OutlinePanel/ProjectsList/ProjectListItem.tsx   |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/theatre/studio/src/panels/DetailPanel/ProjectDetails/StateConflictRow.tsx b/theatre/studio/src/panels/DetailPanel/ProjectDetails/StateConflictRow.tsx
index 5fcfba5..2c51a7e 100644
--- a/theatre/studio/src/panels/DetailPanel/ProjectDetails/StateConflictRow.tsx
+++ b/theatre/studio/src/panels/DetailPanel/ProjectDetails/StateConflictRow.tsx
@@ -27,6 +27,9 @@ const Container = styled.div`
 
 const Message = styled.div`
   margin-bottom: 1em;
+  & a {
+    color: inherit;
+  }
 `
 
 const ChooseStateRow = styled.div`
@@ -100,7 +103,15 @@ const InConflict: React.FC<{
 
   return (
     <Container>
-      <Message>Browser state is not based on disk state.</Message>
+      <Message>
+        Browser state is not based on disk state.{' '}
+        <a
+          href="https://docs.theatrejs.com/export.html#conflict"
+          target="_blank"
+        >
+          Learn more.
+        </a>
+      </Message>
       <ChooseStateRow>
         {browserStateNode}
         <DetailPanelButton
diff --git a/theatre/studio/src/panels/OutlinePanel/OutlinePanel.tsx b/theatre/studio/src/panels/OutlinePanel/OutlinePanel.tsx
index 2689833..f107083 100644
--- a/theatre/studio/src/panels/OutlinePanel/OutlinePanel.tsx
+++ b/theatre/studio/src/panels/OutlinePanel/OutlinePanel.tsx
@@ -141,7 +141,7 @@ const OutlinePanel: React.FC<{}> = (props) => {
   }, [])
 
   const [errorTooltip, triggerButtonRef] = useTooltip(
-    {enabled: conflicts.length > 0, delay: 0},
+    {enabled: conflicts.length > 0, enterDelay: 0},
     () => (
       <ErrorTooltip>
         {conflicts.length === 1
diff --git a/theatre/studio/src/panels/OutlinePanel/ProjectsList/ProjectListItem.tsx b/theatre/studio/src/panels/OutlinePanel/ProjectsList/ProjectListItem.tsx
index b529ee9..ea38b9e 100644
--- a/theatre/studio/src/panels/OutlinePanel/ProjectsList/ProjectListItem.tsx
+++ b/theatre/studio/src/panels/OutlinePanel/ProjectsList/ProjectListItem.tsx
@@ -11,7 +11,7 @@ import styled from 'styled-components'
 const ConflictNotice = styled.div`
   color: #ff6363;
   margin-left: 11px;
-  background: #ff00002b;
+  background: #4c282d;
   padding: 2px 8px;
   border-radius: 2px;
   font-size: 10px;