From 84a933704b63f782649c1843179a2fb8c45f0d62 Mon Sep 17 00:00:00 2001
From: Jan Six <six7@github.com>
Date: Mon, 6 Nov 2023 09:19:42 +0000
Subject: [PATCH 1/3] fix: MarkdownEditor focus variable and border

---
 src/drafts/MarkdownEditor/MarkdownEditor.tsx | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/drafts/MarkdownEditor/MarkdownEditor.tsx b/src/drafts/MarkdownEditor/MarkdownEditor.tsx
index d7059d0e1da..a60444e52bb 100644
--- a/src/drafts/MarkdownEditor/MarkdownEditor.tsx
+++ b/src/drafts/MarkdownEditor/MarkdownEditor.tsx
@@ -403,7 +403,7 @@ const MarkdownEditor = forwardRef<MarkdownEditorHandle, MarkdownEditorProps>(
                 '&: focus-within':
                   view === 'edit'
                     ? {
-                        outline: '2px solid var(--borderColor-accent-emphasis)',
+                        outline: theme => `2px solid ${theme.colors.accent.emphasis}`,
                       }
                     : {},
                 ...sx,
@@ -424,13 +424,29 @@ const MarkdownEditor = forwardRef<MarkdownEditorHandle, MarkdownEditorProps>(
                 }}
                 as="header"
               >
-                <Box sx={{ml: '-1px', mt: '-1px', display: 'flex', alignItems: 'flex-end'}}>
+                <Box
+                  sx={{
+                    ml: '-1px',
+                    mt: '-1px',
+                    display: 'flex',
+                    alignItems: 'flex-end',
+                    flexGrow: 1,
+                    flexBasis: 0,
+                  }}
+                >
                   <ViewSwitch
                     selectedView={view}
                     onViewSelect={setView}
                     disabled={fileHandler?.uploadProgress !== undefined}
                     onLoadPreview={loadPreview}
                   />
+                  <Box
+                    sx={{
+                      borderBottom: '1px solid',
+                      borderBottomColor: 'border.subtle',
+                      flexGrow: 1,
+                    }}
+                  />
                 </Box>
 
                 <SavedRepliesContext.Provider value={savedRepliesContext}>

From 97de038361fe18de1ba62bd73961572608832f12 Mon Sep 17 00:00:00 2001
From: Jan Six <six7@github.com>
Date: Mon, 6 Nov 2023 12:07:15 +0100
Subject: [PATCH 2/3] Update src/drafts/MarkdownEditor/MarkdownEditor.tsx

Co-authored-by: Siddharth Kshetrapal <siddharthkp@github.com>
---
 src/drafts/MarkdownEditor/MarkdownEditor.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/drafts/MarkdownEditor/MarkdownEditor.tsx b/src/drafts/MarkdownEditor/MarkdownEditor.tsx
index a60444e52bb..0284cfb35b1 100644
--- a/src/drafts/MarkdownEditor/MarkdownEditor.tsx
+++ b/src/drafts/MarkdownEditor/MarkdownEditor.tsx
@@ -403,7 +403,8 @@ const MarkdownEditor = forwardRef<MarkdownEditorHandle, MarkdownEditorProps>(
                 '&: focus-within':
                   view === 'edit'
                     ? {
-                        outline: theme => `2px solid ${theme.colors.accent.emphasis}`,
+                        outline: '2px solid',
+                        outlineColor: 'accent.emphasis'
                       }
                     : {},
                 ...sx,

From b3e3c810fd8db2407892eb0711788516aa62c564 Mon Sep 17 00:00:00 2001
From: Jan Six <six7@github.com>
Date: Mon, 6 Nov 2023 11:24:10 +0000
Subject: [PATCH 3/3] fix lint

---
 src/drafts/MarkdownEditor/MarkdownEditor.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/drafts/MarkdownEditor/MarkdownEditor.tsx b/src/drafts/MarkdownEditor/MarkdownEditor.tsx
index 0284cfb35b1..08ce856eeac 100644
--- a/src/drafts/MarkdownEditor/MarkdownEditor.tsx
+++ b/src/drafts/MarkdownEditor/MarkdownEditor.tsx
@@ -404,7 +404,7 @@ const MarkdownEditor = forwardRef<MarkdownEditorHandle, MarkdownEditorProps>(
                   view === 'edit'
                     ? {
                         outline: '2px solid',
-                        outlineColor: 'accent.emphasis'
+                        outlineColor: 'accent.emphasis',
                       }
                     : {},
                 ...sx,