refactor(frontend): theme improvements

3 files changed, 52 insertions, 16 deletions

diff --git a/subprojects/frontend/src/editor/EditorPane.tsx b/subprojects/frontend/src/editor/EditorPane.tsx
index 935a84e8..df43d2c9 100644
--- a/subprojects/frontend/src/editor/EditorPane.tsx
+++ b/subprojects/frontend/src/editor/EditorPane.tsx
@@ -1,10 +1,10 @@
 import Box from '@mui/material/Box';
+import Skeleton from '@mui/material/Skeleton';
 import Stack from '@mui/material/Stack';
 import Toolbar from '@mui/material/Toolbar';
 import { observer } from 'mobx-react-lite';
-import React from 'react';
+import React, { useState } from 'react';
 
-import Loading from '../Loading';
 import { useRootStore } from '../RootStore';
 
 import EditorArea from './EditorArea';
@@ -12,6 +12,23 @@ import EditorButtons from './EditorButtons';
 import GenerateButton from './GenerateButton';
 import SearchPanelPortal from './SearchPanelPortal';
 
+function EditorLoading(): JSX.Element {
+  const [skeletonSizes] = useState(() =>
+    new Array(10).fill(0).map(() => Math.random() * 60 + 10),
+  );
+
+  return (
+    <Box mx={2}>
+      {skeletonSizes.map((length, i) => (
+        /* eslint-disable-next-line react/no-array-index-key --
+          Random placeholders have no identity.
+        */
+        <Skeleton key={i} width={`${length}%`} />
+      ))}
+    </Box>
+  );
+}
+
 function EditorPane(): JSX.Element {
   const { editorStore } = useRootStore();
 
@@ -23,7 +40,7 @@ function EditorPane(): JSX.Element {
       </Toolbar>
       <Box flexGrow={1} flexShrink={1} overflow="auto">
         {editorStore === undefined ? (
-          <Loading />
+          <EditorLoading />
         ) : (
           <>
             <SearchPanelPortal editorStore={editorStore} />
diff --git a/subprojects/frontend/src/editor/EditorTheme.ts b/subprojects/frontend/src/editor/EditorTheme.ts
index ca07d602..dfeeb547 100644
--- a/subprojects/frontend/src/editor/EditorTheme.ts
+++ b/subprojects/frontend/src/editor/EditorTheme.ts
@@ -14,8 +14,10 @@ export default styled('div', {
 })<{ showLineNumbers: boolean }>(({ theme, showLineNumbers }) => {
   const editorFontStyle = {
     ...theme.typography.editor,
+    fontWeight: theme.typography.fontWeightEditorNormal,
     [theme.breakpoints.down('sm')]: {
-      fontSize: '0.875rem',
+      // `rem` for JetBrains MonoVariable make the text too large in Safari.
+      fontSize: '14px',
       lineHeight: 1.43,
     },
   };
@@ -29,7 +31,12 @@ export default styled('div', {
       color: theme.palette.text.secondary,
     },
     '.cm-gutters': {
-      background: theme.palette.background.default,
+      background: `linear-gradient(
+        to right,
+        ${theme.palette.background.default} 0%,
+        ${theme.palette.background.default} calc(100% - 12px),
+        transparent 100%
+      )`,
       border: 'none',
     },
     '.cm-content': {
@@ -93,7 +100,7 @@ export default styled('div', {
       fontStyle: 'italic',
     },
     '.tok-problem-containment': {
-      fontWeight: theme.typography.fontWeightBold,
+      fontWeight: theme.typography.fontWeightEditorBold,
       textDecorationSkipInk: 'none',
     },
     '.tok-problem-error': {
diff --git a/subprojects/frontend/src/editor/SearchToolbar.tsx b/subprojects/frontend/src/editor/SearchToolbar.tsx
index 7e6ff4f7..895f1ca1 100644
--- a/subprojects/frontend/src/editor/SearchToolbar.tsx
+++ b/subprojects/frontend/src/editor/SearchToolbar.tsx
@@ -11,6 +11,7 @@ import Stack from '@mui/material/Stack';
 import TextField from '@mui/material/TextField';
 import ToggleButton from '@mui/material/ToggleButton';
 import Toolbar from '@mui/material/Toolbar';
+import { styled } from '@mui/material/styles';
 import useMediaQuery from '@mui/material/useMediaQuery';
 import { observer } from 'mobx-react-lite';
 import React, { useCallback, useState } from 'react';
@@ -18,7 +19,13 @@ import React, { useCallback, useState } from 'react';
 import type SearchPanelStore from './SearchPanelStore';
 
 const SPLIT_MEDIA_QUERY = '@media (max-width: 1200px)';
-const ABBREVIATE_MEDIA_QUERY = '@media (max-width: 720px)';
+
+const DimLabel = styled(FormControlLabel)(({ theme }) => ({
+  '.MuiFormControlLabel-label': {
+    ...theme.typography.body2,
+    color: theme.palette.text.secondary,
+  },
+}));
 
 function SearchToolbar({
   searchPanelStore,
@@ -31,7 +38,6 @@ function SearchToolbar({
     invalidRegexp,
   } = searchPanelStore;
   const split = useMediaQuery(SPLIT_MEDIA_QUERY);
-  const abbreviate = useMediaQuery(ABBREVIATE_MEDIA_QUERY);
   const [showRepalceState, setShowReplaceState] = useState(false);
 
   const showReplace = !split || showRepalceState || replace !== '';
@@ -132,7 +138,7 @@ function SearchToolbar({
             alignItems="center"
             rowGap={0.5}
           >
-            <FormControlLabel
+            <DimLabel
               control={
                 <Checkbox
                   checked={caseSensitive}
@@ -144,10 +150,9 @@ function SearchToolbar({
                   size="small"
                 />
               }
-              aria-label="Match case"
-              label={abbreviate ? 'Case' : 'Match case'}
+              label="Match case"
             />
-            <FormControlLabel
+            <DimLabel
               control={
                 <Checkbox
                   checked={literal}
@@ -159,10 +164,9 @@ function SearchToolbar({
                   size="small"
                 />
               }
-              aria-label="Literal"
-              label={abbreviate ? 'Lit' : 'Literal'}
+              label="Literal"
             />
-            <FormControlLabel
+            <DimLabel
               control={
                 <Checkbox
                   checked={regexp}
@@ -248,7 +252,15 @@ function SearchToolbar({
           </Stack>
         </Stack>
       </Stack>
-      <Stack direction="row" alignSelf="stretch" alignItems="start" mt="1px">
+      <Stack
+        direction="row"
+        alignSelf="stretch"
+        alignItems="start"
+        mt="1px"
+        sx={{
+          [SPLIT_MEDIA_QUERY]: { display: 'none' },
+        }}
+      >
         <IconButton
           aria-label="Close find/replace"
           onClick={() => searchPanelStore.close()}