From 8bfff9df339d7bc1a9adb502862c76fbad25a721 Mon Sep 17 00:00:00 2001
From: Stuart Hanberg <shanberg@users.noreply.github.com>
Date: Thu, 14 Apr 2022 15:17:28 -0400
Subject: [PATCH 01/12] fix: proper indentation for blocks in embeds

---
 src/js/components/Block/components/Container.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/js/components/Block/components/Container.tsx b/src/js/components/Block/components/Container.tsx
index 6854e3b52e..483723ea0e 100644
--- a/src/js/components/Block/components/Container.tsx
+++ b/src/js/components/Block/components/Container.tsx
@@ -84,7 +84,10 @@ const _Container = ({ children, isDragging, isSelected, isOpen, hasChildren, has
         borderRadius: "sm",
         "--block-surface-color": "background.basement",
         bg: "background.basement",
-        ".block-container": { marginLeft: 0.5 },
+        // Blocks nested in an embed get normal indentation...
+        ".block-container": { marginLeft: 8 },
+        // ...except for the first one, where that would be excessive
+        "& > .block-container": { marginLeft: 0.5 },
       },
       ".block-content": {
         gridArea: "content",

From 528487497663689b2f892a06be6a761b3f11b184 Mon Sep 17 00:00:00 2001
From: Stuart Hanberg <shanberg@users.noreply.github.com>
Date: Thu, 14 Apr 2022 19:13:05 -0400
Subject: [PATCH 02/12] fix: can scroll to items in sidebar again

---
 src/cljs/athens/views/right_sidebar.cljs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cljs/athens/views/right_sidebar.cljs b/src/cljs/athens/views/right_sidebar.cljs
index aa2aa8ce63..f1d53f10e1 100644
--- a/src/cljs/athens/views/right_sidebar.cljs
+++ b/src/cljs/athens/views/right_sidebar.cljs
@@ -87,7 +87,8 @@
                                     :on-mouse-down #(swap! state assoc :dragging true)
                                     :class (when (:dragging @state) "is-dragging")}]
                                   [:> Flex
-                                   {:flexDirection "column"
+                                   {:class "right-sidebar-content"
+                                    :flexDirection "column"
                                     :flex 1;
                                     :maxHeight "calc(100vh - 3.25rem - 1px)"
                                     :width (str (:width @state) "vw")

From 1e0555b6d02ce2af7a4971debd954c39eae4b9d4 Mon Sep 17 00:00:00 2001
From: Stuart Hanberg <shanberg@users.noreply.github.com>
Date: Thu, 14 Apr 2022 21:23:37 -0400
Subject: [PATCH 03/12] improvement: update favicon

---
 resources/public/favicon.png | Bin 5689 -> 2017 bytes
 resources/public/favicon.svg |   8 ++++++++
 resources/public/index.html  |   1 +
 3 files changed, 9 insertions(+)
 create mode 100644 resources/public/favicon.svg

diff --git a/resources/public/favicon.png b/resources/public/favicon.png
index 97d3422b0059a7d33b07f2b6e19eb1da5481e84f..94946cac9c563384bc5c1daafa261736eb1df9e1 100644
GIT binary patch
delta 1989
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
X@JE|ZZ=G+;00000NkvXXu0mjfcRkx|

literal 5689
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

diff --git a/resources/public/favicon.svg b/resources/public/favicon.svg
new file mode 100644
index 0000000000..fbdb8245a3
--- /dev/null
+++ b/resources/public/favicon.svg
@@ -0,0 +1,8 @@
+<svg width="124" height="124" viewBox="0 0 124 124" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="124" height="124" rx="32" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M51.5026 66.3331H67.7171L59.8311 42.5445H59.4625L51.5026 66.3331ZM36.7625 82.8596H40.595L57.2514 35.2818H66.1694L82.8252 82.8596H86.6578V87.0092H66.8322V82.8596H73.1712L68.97 70.6318H50.1764L46.1229 82.8596H52.4607V87.0092H36.7625V82.8596Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.0727 28.6769H12.0002V32.7619V91.2381V95.3231H16.0727H20.7212V91.2381H16.0727V32.7619H20.7212V28.6769H16.0727Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.2095 24V28.117V95.8836V100H38.163V95.8836H28.2871V28.117H38.163V24H24.2095Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M98.6279 24V28.117V95.8836V100H84.6744V95.8836H94.5503V28.117H84.6744V24H98.6279Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M106.765 28.6769H110.837V32.7619V91.2381V95.3231H106.765H102.116V91.2381H106.765V32.7619H102.116V28.6769H106.765Z" fill="black"/>
+</svg>
diff --git a/resources/public/index.html b/resources/public/index.html
index edf0a8f736..01d34543c8 100644
--- a/resources/public/index.html
+++ b/resources/public/index.html
@@ -3,6 +3,7 @@
   <head>
     <meta charset='utf-8'>
     <meta name="viewport" content="width=device-width,initial-scale=1">
+      <link rel="shortcut icon" type="image/svg+xml" href="favicon.svg" />
       <link rel="shortcut icon" type="image/png" href="favicon.png" />
       <link href="./css/katex.min.css" rel="stylesheet" />
       <noscript>

From 8a35ace7528b5b155d75d6f0de4be0dd980a388e Mon Sep 17 00:00:00 2001
From: Stuart Hanberg <shanberg@users.noreply.github.com>
Date: Thu, 14 Apr 2022 21:23:54 -0400
Subject: [PATCH 04/12] fix: 404 shows properly on page-by-title

---
 src/cljs/athens/views/pages/page.cljs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cljs/athens/views/pages/page.cljs b/src/cljs/athens/views/pages/page.cljs
index 72e2b484a1..02a3e8a6d5 100644
--- a/src/cljs/athens/views/pages/page.cljs
+++ b/src/cljs/athens/views/pages/page.cljs
@@ -14,11 +14,11 @@
   []
   (let [title    (rf/subscribe [:current-route/page-title])
         page-eid (common-db/e-by-av @db/dsdb :node/title @title)]
-    (if (int? page-eid)
       [:> PageContainer {:uid page-eid :type "node"}
-       [node-page/page page-eid]]
-      [:> PageNotFound {:title @title
-                        :onClickHome #(router/navigate :pages)}])))
+       (if (int? page-eid)
+         [node-page/page page-eid]
+         [:> PageNotFound {:title @title
+                           :onClickHome #(router/navigate :pages)}])]))
 
 
 (defn page

From 7540f3963b48413f672eea0dfc15dcf11a355c33 Mon Sep 17 00:00:00 2001
From: Stuart Hanberg <shanberg@users.noreply.github.com>
Date: Thu, 14 Apr 2022 22:17:56 -0400
Subject: [PATCH 05/12] improvement: misc polish, mostly page spacing

---
 src/cljs/athens/views/pages/core.cljs       |  5 ++-
 src/cljs/athens/views/pages/node_page.cljs  |  5 +--
 src/js/components/AppToolbar/AppToolbar.tsx | 13 +++++--
 src/js/components/Icons/Icons.tsx           |  8 +++++
 src/js/components/Layout/Layout.tsx         | 25 +++++++++++---
 src/js/components/Page/Page.tsx             | 38 +++++++++------------
 6 files changed, 61 insertions(+), 33 deletions(-)

diff --git a/src/cljs/athens/views/pages/core.cljs b/src/cljs/athens/views/pages/core.cljs
index 636c435827..b876dedae2 100644
--- a/src/cljs/athens/views/pages/core.cljs
+++ b/src/cljs/athens/views/pages/core.cljs
@@ -26,6 +26,7 @@
       (toast (clj->js {:status "info"
                        :title "Reconnecting to server..."})))
     [:> Box {:flex "1 1 100%"
+             :class "main-content"
              :position "relative"
              :gridArea "main-content"
              :alignItems "flex-start"
@@ -59,7 +60,9 @@
                                        :height "0.5rem"}
                   "::WebkitScrollbar-corner" {:bg "background.basement"}
                   "::WebkitScrollbar-thumb" {:bg "background.upper"
-                                             :borderRadius "full"}}
+                                             :borderRadius "full"}
+                  "> .node-page:first-child, .block-page:first-child" {:mt 0
+                                                                       :pt "var(--app-header-height)"}}
              :on-scroll (when (= @route-name :home)
                           throttled-scroll)}
      (case @route-name
diff --git a/src/cljs/athens/views/pages/node_page.cljs b/src/cljs/athens/views/pages/node_page.cljs
index 3a0d83cf12..8ed4548888 100644
--- a/src/cljs/athens/views/pages/node_page.cljs
+++ b/src/cljs/athens/views/pages/node_page.cljs
@@ -213,10 +213,11 @@
                      "aria-label" "Page menu"
                      :gridArea "menu"
                      :justifySelf "flex-end"
-                     :size "md"
+                     :size "sm"
                      :alignSelf "center"
+                     :fontSize "75%"
+                     :color "foreground.secondary"
                      :bg "transparent"
-                     :width "2.25em"
                      :mr "0.5em"
                      :borderRadius "full"
                      :sx {"span" {:display "contents"}
diff --git a/src/js/components/AppToolbar/AppToolbar.tsx b/src/js/components/AppToolbar/AppToolbar.tsx
index b24b182d19..41b9106cfd 100644
--- a/src/js/components/AppToolbar/AppToolbar.tsx
+++ b/src/js/components/AppToolbar/AppToolbar.tsx
@@ -12,7 +12,7 @@ import {
   ContrastIcon,
   DailyNotesIcon,
   GraphIcon,
-  EllipsisHorizontalIcon
+  EllipsisHorizontalCircleIcon
 } from '@/Icons/Icons';
 
 import {
@@ -72,6 +72,7 @@ const ToolbarIconButton = React.forwardRef((props: ToolbarIconButtonProps, ref)
 });
 
 const AppToolbarWrapper = ({ children, ...props }) => <Flex
+  className="app-toolbar"
   gridArea="app-header"
   borderBottom="1px solid transparent"
   justifyContent="space-between"
@@ -227,7 +228,7 @@ const SecondaryToolbarItems = (items) => {
 const SecondaryToolbarOverflowMenu = (items) => {
   return <Menu>
     {({ isOpen }) => <>
-      <ToolbarIconButton size="sm" as={MenuButton} isActive={isOpen}><EllipsisHorizontalIcon /></ToolbarIconButton>
+      <ToolbarIconButton size="sm" as={MenuButton} isActive={isOpen}><EllipsisHorizontalCircleIcon /></ToolbarIconButton>
       <Portal>
         <MenuList>
           {items.map((item) => (<MenuItem
@@ -316,7 +317,13 @@ export const AppToolbar = (props: AppToolbarProps): React.ReactElement => {
   ];
 
   return (
-    <AppToolbarWrapper className={isRightSidebarOpen ? 'is-right-sidebar-open' : ''} {...rest}>
+    <AppToolbarWrapper
+      className={[
+        "app-toolbar",
+        isRightSidebarOpen && 'is-right-sidebar-open',
+      ].filter(Boolean).join(' ')}
+      {...rest}
+    >
       <HStack flex="1">
         <ButtonGroup size="sm" mr="auto">
           {databaseMenu}
diff --git a/src/js/components/Icons/Icons.tsx b/src/js/components/Icons/Icons.tsx
index 7cd251ce43..35cc6077f9 100644
--- a/src/js/components/Icons/Icons.tsx
+++ b/src/js/components/Icons/Icons.tsx
@@ -224,6 +224,14 @@ export const EllipsisHorizontalIcon = createIcon({
   ),
 });
 
+export const EllipsisHorizontalCircleIcon = createIcon({
+  displayName: 'EllipsisHorizontalCircleIcon',
+  viewBox: '0 0 24 24',
+  path: (
+    <path fillRule="evenodd" clipRule="evenodd" d="M12 20.48C16.6834 20.48 20.48 16.6834 20.48 12C20.48 7.31663 16.6834 3.52 12 3.52C7.31663 3.52 3.52 7.31663 3.52 12C3.52 16.6834 7.31663 20.48 12 20.48ZM12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22ZM7.33333 10.5833C6.55093 10.5833 5.91667 11.2176 5.91667 12C5.91667 12.7824 6.55093 13.4167 7.33333 13.4167C8.11574 13.4167 8.75 12.7824 8.75 12C8.75 11.2176 8.11574 10.5833 7.33333 10.5833ZM12 10.5833C11.2176 10.5833 10.5833 11.2176 10.5833 12C10.5833 12.7824 11.2176 13.4167 12 13.4167C12.7824 13.4167 13.4167 12.7824 13.4167 12C13.4167 11.2176 12.7824 10.5833 12 10.5833ZM16.6667 10.5833C15.8843 10.5833 15.25 11.2176 15.25 12C15.25 12.7824 15.8843 13.4167 16.6667 13.4167C17.4491 13.4167 18.0833 12.7824 18.0833 12C18.0833 11.2176 17.4491 10.5833 16.6667 10.5833Z" fill="currentColor" />
+  ),
+});
+
 export const ExclamationCircleFillIcon = createIcon({
   displayName: 'ExclamationCircleFillIcon',
   viewBox: '0 0 24 24',
diff --git a/src/js/components/Layout/Layout.tsx b/src/js/components/Layout/Layout.tsx
index 8b56e12330..ba398ede31 100644
--- a/src/js/components/Layout/Layout.tsx
+++ b/src/js/components/Layout/Layout.tsx
@@ -1,5 +1,5 @@
 import { AnimatePresence, motion } from 'framer-motion';
-import { XmarkIcon, ChevronRightIcon, PageFillIcon, BlockFillIcon, GraphIcon } from '@/Icons/Icons';
+import { XmarkIcon, ChevronRightIcon, PageIcon, PageFillIcon, BlockIcon, BlockFillIcon, GraphIcon } from '@/Icons/Icons';
 import { Button, IconButton, Box, useDisclosure, Collapse, Text, VStack, HStack } from '@chakra-ui/react';
 import { withErrorBoundary } from 'react-error-boundary';
 
@@ -23,9 +23,18 @@ export const RightSidebarContainer = ({ isOpen, width, isDragging, children }) =
         position="relative"
         gridArea="secondary-content"
         sx={{
-          "--page-padding-v": "1rem",
-          "--page-padding-h": "0rem",
           "--page-title-font-size": "1.25rem",
+          ".node-page, .block-page": {
+            "--page-padding": "1rem",
+          },
+          ".page-header": {
+            pb: 1
+          },
+          ".page-body": {},
+          ".page-footer": {
+            px: 0,
+            py: 4
+          }
         }}
         initial={{
           width: 0,
@@ -46,7 +55,10 @@ export const RightSidebarContainer = ({ isOpen, width, isDragging, children }) =
   </AnimatePresence>
 }
 
-const typeIcon = (type) => { return { "node": <PageFillIcon />, "graph": <GraphIcon />, "block": <BlockFillIcon /> }[type] };
+const typeIcon = (type, isOpen) => {
+  return isOpen ? { "node": <PageFillIcon />, "graph": <GraphIcon />, "block": <BlockFillIcon /> }[type]
+    : { "node": <PageIcon />, "graph": <GraphIcon />, "block": <BlockIcon /> }[type]
+};
 
 export const SidebarItem = ({ title, type, isOpen, onToggle, onRemove, children }) => {
 
@@ -97,10 +109,13 @@ export const SidebarItem = ({ title, type, isOpen, onToggle, onRemove, children
           {canToggle && (
             <ChevronRightIcon
               transform={isOpen ? "rotate(90deg)" : null}
+              transitionProperty="common"
+              transitionDuration="0.15s"
+              transitionTimingFunction="ease-in-out"
               justifySelf="center"
             />
           )}
-          {typeIcon(type)}
+          {typeIcon(type, isOpen)}
           <Box
             flex="1 1 100%"
             tabIndex={-1}
diff --git a/src/js/components/Page/Page.tsx b/src/js/components/Page/Page.tsx
index 3961c69663..3155e8767e 100644
--- a/src/js/components/Page/Page.tsx
+++ b/src/js/components/Page/Page.tsx
@@ -11,8 +11,10 @@ const PAGE_PROPS = {
   gridTemplateRows: "auto 1fr auto",
   marginInline: "auto",
   sx: {
-    "--page-padding-v": "6rem",
-    "--page-padding-h": "2rem"
+    "--page-padding": "3rem",
+    "&:not(.right-sidebar &)": {
+      mt: 2,
+    }
   }
 }
 
@@ -41,7 +43,7 @@ export const PageNotFound = ({ title, onClickHome, children }) => {
 
 export const PageContainer = ({ children, uid, type }) => <Box
   {...PAGE_PROPS}
-  minHeight="100vh"
+  flexGrow={1}
   data-ui={uid}
   className={type + '-page'}
   flexDirection="column"
@@ -68,8 +70,9 @@ export const HeaderImage = ({ src }) => <Box
 
 export const PageHeader = ({ children, image, onClickOpenInSidebar, onClickOpenInMainView }) => <Box
   as="header"
-  px="var(--page-padding-h)"
-  pt="var(--page-padding-v)"
+  className="page-header"
+  pt="var(--page-padding)"
+  px="var(--page-padding)"
   pb={4}
   gridArea="header"
   display="grid"
@@ -78,13 +81,6 @@ export const PageHeader = ({ children, image, onClickOpenInSidebar, onClickOpenI
   alignItems="center"
   gridTemplateAreas="'breadcrumb breadcrumb' 
   'title extras'"
-  className="page-header"
-  borderBottom="1px solid transparent"
-
-  // Page headers without images get a nice border
-  {...!image && ({
-    borderBottomColor: "separator.divider"
-  })}
 >
   {image && <HeaderImage src={image} />}
   {children}
@@ -113,20 +109,22 @@ export const PageHeader = ({ children, image, onClickOpenInSidebar, onClickOpenI
 
 export const PageBody = ({ children }) => <Box
   as="main"
-  pt={4}
-  // inset the left margin to account for block toggles
-  px="calc(var(--page-padding-h) - 1em)"
-  pr="var(--page-padding-h)"
+  className="page-body"
+  // outset slightly for block toggles
+  pl="calc(var(--page-padding) - 1em)"
+  pr="var(--page-padding)"
   gridArea="content"
 >{children}</Box>
 
 export const PageFooter = ({ children }) => <Box
   as="footer"
-  pt={4}
+  className="page-footer"
+  p="var(--page-padding)"
+  pb="var(--page-padding)"
   gridArea="footer"
-  px="var(--page-padding-h)"
 >{children}</Box>
 
+
 export const DailyNotesPage = ({ isReal, children }) => <Box
   {...PAGE_PROPS}
   className="node-page daily-notes"
@@ -139,10 +137,6 @@ export const DailyNotesPage = ({ isReal, children }) => <Box
   transitionDuration="0s"
   borderRadius="0.5rem"
   minHeight="calc(100vh - 10rem)"
-  sx={{
-    "--page-padding-v": "1rem",
-    "--page-padding-h": "2.5rem"
-  }}
 >{children}</Box>
 
 

From f049f607b30d1be14e3d8ea86af9d435c0ab078d Mon Sep 17 00:00:00 2001
From: Stuart Hanberg <shanberg@users.noreply.github.com>
Date: Thu, 14 Apr 2022 22:19:36 -0400
Subject: [PATCH 06/12] rfct: move block components out of redundant comps
 folder

---
 .clj-kondo/rewrite-clj/rewrite-clj/config.edn             | 5 +++++
 src/cljs/athens/views/blocks/autocomplete_search.cljs     | 2 +-
 src/cljs/athens/views/blocks/autocomplete_slash.cljs      | 2 +-
 src/cljs/athens/views/blocks/content.cljs                 | 2 +-
 src/cljs/athens/views/blocks/core.cljs                    | 6 +++---
 src/cljs/athens/views/pages/node_page.cljs                | 2 +-
 src/js/components/Block/{components => }/Anchor.tsx       | 0
 src/js/components/Block/{components => }/Autocomplete.tsx | 0
 src/js/components/Block/{components => }/Container.tsx    | 0
 src/js/components/Block/{components => }/Content.tsx      | 0
 src/js/components/Block/{components => }/Toggle.tsx       | 0
 11 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 .clj-kondo/rewrite-clj/rewrite-clj/config.edn
 rename src/js/components/Block/{components => }/Anchor.tsx (100%)
 rename src/js/components/Block/{components => }/Autocomplete.tsx (100%)
 rename src/js/components/Block/{components => }/Container.tsx (100%)
 rename src/js/components/Block/{components => }/Content.tsx (100%)
 rename src/js/components/Block/{components => }/Toggle.tsx (100%)

diff --git a/.clj-kondo/rewrite-clj/rewrite-clj/config.edn b/.clj-kondo/rewrite-clj/rewrite-clj/config.edn
new file mode 100644
index 0000000000..19ecae96a0
--- /dev/null
+++ b/.clj-kondo/rewrite-clj/rewrite-clj/config.edn
@@ -0,0 +1,5 @@
+{:lint-as
+ {rewrite-clj.zip/subedit-> clojure.core/->
+  rewrite-clj.zip/subedit->> clojure.core/->>
+  rewrite-clj.zip/edit-> clojure.core/->
+  rewrite-clj.zip/edit->> clojure.core/->>}}
diff --git a/src/cljs/athens/views/blocks/autocomplete_search.cljs b/src/cljs/athens/views/blocks/autocomplete_search.cljs
index 83c9812e52..ee2a445ba9 100644
--- a/src/cljs/athens/views/blocks/autocomplete_search.cljs
+++ b/src/cljs/athens/views/blocks/autocomplete_search.cljs
@@ -1,6 +1,6 @@
 (ns athens.views.blocks.autocomplete-search
   (:require
-    ["/components/Block/components/Autocomplete" :refer [Autocomplete AutocompleteButton]]
+    ["/components/Block/Autocomplete" :refer [Autocomplete AutocompleteButton]]
     ["@chakra-ui/react" :refer [Text]]
     [athens.views.blocks.textarea-keydown :as textarea-keydown]
     [clojure.string :as string]))
diff --git a/src/cljs/athens/views/blocks/autocomplete_slash.cljs b/src/cljs/athens/views/blocks/autocomplete_slash.cljs
index 05910bb20b..a630374286 100644
--- a/src/cljs/athens/views/blocks/autocomplete_slash.cljs
+++ b/src/cljs/athens/views/blocks/autocomplete_slash.cljs
@@ -1,6 +1,6 @@
 (ns athens.views.blocks.autocomplete-slash
   (:require
-    ["/components/Block/components/Autocomplete" :refer [Autocomplete AutocompleteButton]]
+    ["/components/Block/Autocomplete" :refer [Autocomplete AutocompleteButton]]
     [athens.views.blocks.textarea-keydown :as textarea-keydown]
     [reagent.core :as r]))
 
diff --git a/src/cljs/athens/views/blocks/content.cljs b/src/cljs/athens/views/blocks/content.cljs
index 6cf3a656e7..b49f8d1848 100644
--- a/src/cljs/athens/views/blocks/content.cljs
+++ b/src/cljs/athens/views/blocks/content.cljs
@@ -1,6 +1,6 @@
 (ns athens.views.blocks.content
   (:require
-    ["/components/Block/components/Content" :refer [Content]]
+    ["/components/Block/Content" :refer [Content]]
     [athens.config :as config]
     [athens.db :as db]
     [athens.events.selection :as select-events]
diff --git a/src/cljs/athens/views/blocks/core.cljs b/src/cljs/athens/views/blocks/core.cljs
index cb56363d2a..f365090ded 100644
--- a/src/cljs/athens/views/blocks/core.cljs
+++ b/src/cljs/athens/views/blocks/core.cljs
@@ -1,8 +1,8 @@
 (ns athens.views.blocks.core
   (:require
-    ["/components/Block/components/Anchor"   :refer [Anchor]]
-    ["/components/Block/components/Container" :refer [Container]]
-    ["/components/Block/components/Toggle"   :refer [Toggle]]
+    ["/components/Block/Anchor"   :refer [Anchor]]
+    ["/components/Block/Container" :refer [Container]]
+    ["/components/Block/Toggle"   :refer [Toggle]]
     ["/components/Layout/Layout"   :refer [ReferenceGroup ReferenceBlock]]
     ["@chakra-ui/react" :refer [VStack Button Breadcrumb BreadcrumbItem BreadcrumbLink HStack]]
     [athens.common.logging                   :as log]
diff --git a/src/cljs/athens/views/pages/node_page.cljs b/src/cljs/athens/views/pages/node_page.cljs
index 8ed4548888..439b4ab767 100644
--- a/src/cljs/athens/views/pages/node_page.cljs
+++ b/src/cljs/athens/views/pages/node_page.cljs
@@ -1,6 +1,6 @@
 (ns athens.views.pages.node-page
   (:require
-    ["/components/Block/components/Anchor" :refer [Anchor]]
+    ["/components/Block/Anchor" :refer [Anchor]]
     ["/components/Confirmation/Confirmation" :refer [Confirmation]]
     ["/components/Icons/Icons" :refer [EllipsisHorizontalIcon GraphIcon BookmarkIcon BookmarkFillIcon TrashIcon ArrowRightOnBoxIcon]]
     ["/components/Layout/Layout" :refer [PageReferences ReferenceBlock ReferenceGroup]]
diff --git a/src/js/components/Block/components/Anchor.tsx b/src/js/components/Block/Anchor.tsx
similarity index 100%
rename from src/js/components/Block/components/Anchor.tsx
rename to src/js/components/Block/Anchor.tsx
diff --git a/src/js/components/Block/components/Autocomplete.tsx b/src/js/components/Block/Autocomplete.tsx
similarity index 100%
rename from src/js/components/Block/components/Autocomplete.tsx
rename to src/js/components/Block/Autocomplete.tsx
diff --git a/src/js/components/Block/components/Container.tsx b/src/js/components/Block/Container.tsx
similarity index 100%
rename from src/js/components/Block/components/Container.tsx
rename to src/js/components/Block/Container.tsx
diff --git a/src/js/components/Block/components/Content.tsx b/src/js/components/Block/Content.tsx
similarity index 100%
rename from src/js/components/Block/components/Content.tsx
rename to src/js/components/Block/Content.tsx
diff --git a/src/js/components/Block/components/Toggle.tsx b/src/js/components/Block/Toggle.tsx
similarity index 100%
rename from src/js/components/Block/components/Toggle.tsx
rename to src/js/components/Block/Toggle.tsx

From c1686b16c0b4acb6740c155acb54fe65ee751752 Mon Sep 17 00:00:00 2001
From: Stuart Hanberg <shanberg@users.noreply.github.com>
Date: Thu, 14 Apr 2022 22:21:30 -0400
Subject: [PATCH 07/12] rfct: new file for sidebar components

---
 src/cljs/athens/views/right_sidebar.cljs  |   2 +-
 src/js/components/Layout/Layout.tsx       | 154 +---------------------
 src/js/components/Layout/RightSidebar.tsx | 148 +++++++++++++++++++++
 3 files changed, 151 insertions(+), 153 deletions(-)
 create mode 100644 src/js/components/Layout/RightSidebar.tsx

diff --git a/src/cljs/athens/views/right_sidebar.cljs b/src/cljs/athens/views/right_sidebar.cljs
index f1d53f10e1..f3a38e647b 100644
--- a/src/cljs/athens/views/right_sidebar.cljs
+++ b/src/cljs/athens/views/right_sidebar.cljs
@@ -1,7 +1,7 @@
 (ns athens.views.right-sidebar
   (:require
     ["/components/Icons/Icons" :refer [RightSidebarAddIcon]]
-    ["/components/Layout/Layout" :refer [RightSidebarContainer SidebarItem]]
+    ["/components/Layout/RightSidebar" :refer [RightSidebarContainer SidebarItem]]
     ["@chakra-ui/react" :refer [Flex Text Box]]
     [athens.parse-renderer :as parse-renderer]
     [athens.views.pages.block-page :as block-page]
diff --git a/src/js/components/Layout/Layout.tsx b/src/js/components/Layout/Layout.tsx
index ba398ede31..5d76a2e8b9 100644
--- a/src/js/components/Layout/Layout.tsx
+++ b/src/js/components/Layout/Layout.tsx
@@ -1,157 +1,7 @@
-import { AnimatePresence, motion } from 'framer-motion';
-import { XmarkIcon, ChevronRightIcon, PageIcon, PageFillIcon, BlockIcon, BlockFillIcon, GraphIcon } from '@/Icons/Icons';
-import { Button, IconButton, Box, useDisclosure, Collapse, Text, VStack, HStack } from '@chakra-ui/react';
+import { ChevronRightIcon } from '@/Icons/Icons';
+import { Button, Box, useDisclosure, Collapse, Text, VStack, HStack } from '@chakra-ui/react';
 import { withErrorBoundary } from 'react-error-boundary';
 
-const Container = motion(Box);
-
-export const RightSidebarContainer = ({ isOpen, width, isDragging, children }) => {
-  return <AnimatePresence initial={false}>
-    {isOpen &&
-      <Container
-        className="right-sidebar"
-        display="flex"
-        WebkitAppRegion="no-drag"
-        flexDirection="column"
-        height="calc(100% - 3.25rem)"
-        marginTop="3.25rem"
-        alignItems="stretch"
-        justifySelf="stretch"
-        transformOrigin="right"
-        justifyContent="space-between"
-        overflowX="visible"
-        position="relative"
-        gridArea="secondary-content"
-        sx={{
-          "--page-title-font-size": "1.25rem",
-          ".node-page, .block-page": {
-            "--page-padding": "1rem",
-          },
-          ".page-header": {
-            pb: 1
-          },
-          ".page-body": {},
-          ".page-footer": {
-            px: 0,
-            py: 4
-          }
-        }}
-        initial={{
-          width: 0,
-          opacity: 0
-        }}
-        transition={isDragging ? { duration: 0 } : undefined}
-        animate={{
-          width: isOpen ? `${width}vw` : 0,
-          opacity: 1
-        }}
-        exit={{
-          width: 0,
-          opacity: 0
-        }}
-      >
-        {children}
-      </Container>}
-  </AnimatePresence>
-}
-
-const typeIcon = (type, isOpen) => {
-  return isOpen ? { "node": <PageFillIcon />, "graph": <GraphIcon />, "block": <BlockFillIcon /> }[type]
-    : { "node": <PageIcon />, "graph": <GraphIcon />, "block": <BlockIcon /> }[type]
-};
-
-export const SidebarItem = ({ title, type, isOpen, onToggle, onRemove, children }) => {
-
-  const canToggle = type !== 'graph';
-
-  return (
-    <VStack
-      align="stretch"
-      position="relative"
-      spacing={0}
-      ml="1px" // Account for the floating separator
-      _notFirst={{
-        borderTop: "1px solid",
-        borderColor: "separator.divider"
-      }}>
-      <Box
-        top="-1px"
-        zIndex={2}
-        position="sticky"
-        background="background.floor"
-        display="grid"
-        gridTemplateColumns="1fr 3rem"
-        pr={2}
-        alignItems="center"
-        justifyContent="center"
-      >
-        <Button
-          onClick={canToggle ? onToggle : undefined}
-          as={canToggle ? undefined : 'div'}
-          {...(!canToggle && {
-            _hover: {},
-            _focus: {},
-            _active: {},
-          })}
-          display="flex"
-          bg="transparent"
-          borderRadius="0"
-          gap={2}
-          py={3}
-          pl={5}
-          pr={0}
-          height="auto"
-          textAlign="left"
-          overflow="hidden"
-          whiteSpace="nowrap"
-          sx={{ maskImage: "linear-gradient(to right, black, black calc(100% - 1rem), transparent calc(100%))" }}
-        >
-          {canToggle && (
-            <ChevronRightIcon
-              transform={isOpen ? "rotate(90deg)" : null}
-              transitionProperty="common"
-              transitionDuration="0.15s"
-              transitionTimingFunction="ease-in-out"
-              justifySelf="center"
-            />
-          )}
-          {typeIcon(type, isOpen)}
-          <Box
-            flex="1 1 100%"
-            tabIndex={-1}
-            pointerEvents="none"
-            position="relative"
-            bottom="1px"
-            overflow="hidden"
-            color="foreground.secondary"
-          >{title}</Box>
-        </Button>
-        <IconButton
-          onClick={onRemove}
-          size="sm"
-          color="foreground.secondary"
-          alignSelf="center"
-          justifySelf="center"
-          bg="transparent"
-          aria-label="Close"
-        >
-          <XmarkIcon />
-        </IconButton>
-      </Box>
-      <Box
-        as={Collapse}
-        in={isOpen}
-        className={`${type}-page`}
-        animateOpacity
-        unmountOnExit
-        zIndex={1}
-        px={4}
-      >
-        {children}
-      </Box>
-    </VStack>)
-}
-
 export const PageReference = ({ children }) => {
   return (
     <Box>
diff --git a/src/js/components/Layout/RightSidebar.tsx b/src/js/components/Layout/RightSidebar.tsx
new file mode 100644
index 0000000000..e0098c3185
--- /dev/null
+++ b/src/js/components/Layout/RightSidebar.tsx
@@ -0,0 +1,148 @@
+import { AnimatePresence, motion } from 'framer-motion';
+import { XmarkIcon, ChevronRightIcon, PageIcon, PageFillIcon, BlockIcon, BlockFillIcon, GraphIcon } from '@/Icons/Icons';
+import { Button, IconButton, Box, Collapse, VStack } from '@chakra-ui/react';
+
+const Container = motion(Box);
+
+export const RightSidebarContainer = ({ isOpen, width, isDragging, children }) => {
+  return <AnimatePresence initial={false}>
+    {isOpen &&
+      <Container
+        className="right-sidebar"
+        display="flex"
+        WebkitAppRegion="no-drag"
+        flexDirection="column"
+        height="calc(100% - 3.25rem)"
+        marginTop="3.25rem"
+        alignItems="stretch"
+        justifySelf="stretch"
+        transformOrigin="right"
+        justifyContent="space-between"
+        overflowX="visible"
+        position="relative"
+        gridArea="secondary-content"
+        sx={{
+          "--page-title-font-size": "1.25rem",
+          ".node-page, .block-page": {
+            "--page-padding": "1rem",
+          },
+          ".page-header": {
+            pb: 1
+          },
+          ".page-body": {},
+          ".page-footer": {
+            px: 0,
+            py: 4
+          }
+        }}
+        initial={{
+          width: 0,
+          opacity: 0
+        }}
+        transition={isDragging ? { duration: 0 } : undefined}
+        animate={{
+          width: isOpen ? `${width}vw` : 0,
+          opacity: 1
+        }}
+        exit={{
+          width: 0,
+          opacity: 0
+        }}
+      >
+        {children}
+      </Container>}
+  </AnimatePresence>;
+};
+const typeIcon = (type, isOpen) => {
+  return isOpen ? { "node": <PageFillIcon />, "graph": <GraphIcon />, "block": <BlockFillIcon /> }[type]
+    : { "node": <PageIcon />, "graph": <GraphIcon />, "block": <BlockIcon /> }[type];
+};
+
+export const SidebarItem = ({ title, type, isOpen, onToggle, onRemove, children }) => {
+  const canToggle = type !== 'graph';
+  return (
+    <VStack
+      align="stretch"
+      position="relative"
+      spacing={0}
+      ml="1px" // Account for the floating separator
+      _notFirst={{
+        borderTop: "1px solid",
+        borderColor: "separator.divider"
+      }}>
+      <Box
+        top="-1px"
+        zIndex={2}
+        position="sticky"
+        background="background.floor"
+        display="grid"
+        gridTemplateColumns="1fr 3rem"
+        pr={2}
+        alignItems="center"
+        justifyContent="center"
+      >
+        <Button
+          onClick={canToggle ? onToggle : undefined}
+          as={canToggle ? undefined : 'div'}
+          {...(!canToggle && {
+            _hover: {},
+            _focus: {},
+            _active: {},
+          })}
+          display="flex"
+          bg="transparent"
+          borderRadius="0"
+          gap={2}
+          py={3}
+          pl={5}
+          pr={0}
+          height="auto"
+          textAlign="left"
+          overflow="hidden"
+          whiteSpace="nowrap"
+          sx={{ maskImage: "linear-gradient(to right, black, black calc(100% - 1rem), transparent calc(100%))" }}
+        >
+          {canToggle && (
+            <ChevronRightIcon
+              transform={isOpen ? "rotate(90deg)" : null}
+              transitionProperty="common"
+              transitionDuration="0.15s"
+              transitionTimingFunction="ease-in-out"
+              justifySelf="center" />
+          )}
+          {typeIcon(type, isOpen)}
+          <Box
+            flex="1 1 100%"
+            tabIndex={-1}
+            pointerEvents="none"
+            position="relative"
+            bottom="1px"
+            overflow="hidden"
+            color="foreground.secondary"
+          >{title}</Box>
+        </Button>
+        <IconButton
+          onClick={onRemove}
+          size="sm"
+          color="foreground.secondary"
+          alignSelf="center"
+          justifySelf="center"
+          bg="transparent"
+          aria-label="Close"
+        >
+          <XmarkIcon />
+        </IconButton>
+      </Box>
+      <Box
+        as={Collapse}
+        in={isOpen}
+        className={`${type}-page`}
+        animateOpacity
+        unmountOnExit
+        zIndex={1}
+        px={4}
+      >
+        {children}
+      </Box>
+    </VStack>);
+};

From 79502a72394b5c5b45f0134ed82336b3510c3c2f Mon Sep 17 00:00:00 2001
From: Stuart Hanberg <shanberg@users.noreply.github.com>
Date: Thu, 14 Apr 2022 22:25:33 -0400
Subject: [PATCH 08/12] rfct: move reference components to new file

---
 src/cljs/athens/views/pages/block_page.cljs                     | 2 +-
 src/cljs/athens/views/pages/node_page.cljs                      | 2 +-
 .../components/{Layout/Layout.tsx => References/References.tsx} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/js/components/{Layout/Layout.tsx => References/References.tsx} (100%)

diff --git a/src/cljs/athens/views/pages/block_page.cljs b/src/cljs/athens/views/pages/block_page.cljs
index 3b402a3911..6cb7467a59 100644
--- a/src/cljs/athens/views/pages/block_page.cljs
+++ b/src/cljs/athens/views/pages/block_page.cljs
@@ -1,7 +1,7 @@
 (ns athens.views.pages.block-page
   (:require
-    ["/components/Layout/Layout" :refer [PageReferences ReferenceBlock ReferenceGroup]]
     ["/components/Page/Page" :refer [PageHeader PageBody PageFooter TitleContainer]]
+    ["/components/References/References" :refer [PageReferences ReferenceBlock ReferenceGroup]]
     ["@chakra-ui/react" :refer [Breadcrumb BreadcrumbItem BreadcrumbLink]]
     [athens.parse-renderer :as parse-renderer]
     [athens.reactive :as reactive]
diff --git a/src/cljs/athens/views/pages/node_page.cljs b/src/cljs/athens/views/pages/node_page.cljs
index 439b4ab767..e22a0813ed 100644
--- a/src/cljs/athens/views/pages/node_page.cljs
+++ b/src/cljs/athens/views/pages/node_page.cljs
@@ -3,8 +3,8 @@
     ["/components/Block/Anchor" :refer [Anchor]]
     ["/components/Confirmation/Confirmation" :refer [Confirmation]]
     ["/components/Icons/Icons" :refer [EllipsisHorizontalIcon GraphIcon BookmarkIcon BookmarkFillIcon TrashIcon ArrowRightOnBoxIcon]]
-    ["/components/Layout/Layout" :refer [PageReferences ReferenceBlock ReferenceGroup]]
     ["/components/Page/Page" :refer [PageHeader PageBody PageFooter TitleContainer]]
+    ["/components/References/References" :refer [PageReferences ReferenceBlock ReferenceGroup]]
     ["@chakra-ui/react" :refer [Box HStack Button Portal IconButton MenuDivider MenuButton Menu MenuList MenuItem Breadcrumb BreadcrumbItem BreadcrumbLink VStack]]
     [athens.common-db :as common-db]
     [athens.common.sentry :refer-macros [wrap-span-no-new-tx]]
diff --git a/src/js/components/Layout/Layout.tsx b/src/js/components/References/References.tsx
similarity index 100%
rename from src/js/components/Layout/Layout.tsx
rename to src/js/components/References/References.tsx

From 5c238ab6da968b8ad5c9ab02456306879f63b42c Mon Sep 17 00:00:00 2001
From: Stuart Hanberg <shanberg@users.noreply.github.com>
Date: Thu, 14 Apr 2022 22:26:47 -0400
Subject: [PATCH 09/12] rfct: blocks use new inline refs component

---
 src/cljs/athens/views/blocks/core.cljs        |   8 +-
 .../References/InlineReferences.tsx           | 129 ++++++++++++++++++
 2 files changed, 133 insertions(+), 4 deletions(-)
 create mode 100644 src/js/components/References/InlineReferences.tsx

diff --git a/src/cljs/athens/views/blocks/core.cljs b/src/cljs/athens/views/blocks/core.cljs
index f365090ded..b81a82137f 100644
--- a/src/cljs/athens/views/blocks/core.cljs
+++ b/src/cljs/athens/views/blocks/core.cljs
@@ -1,9 +1,9 @@
 (ns athens.views.blocks.core
   (:require
-    ["/components/Block/Anchor"   :refer [Anchor]]
-    ["/components/Block/Container" :refer [Container]]
-    ["/components/Block/Toggle"   :refer [Toggle]]
-    ["/components/Layout/Layout"   :refer [ReferenceGroup ReferenceBlock]]
+    ["/components/Block/Anchor"              :refer [Anchor]]
+    ["/components/Block/Container"           :refer [Container]]
+    ["/components/Block/Toggle"              :refer [Toggle]]
+    ["/components/References/InlineReferences" :refer [ReferenceGroup ReferenceBlock]]
     ["@chakra-ui/react" :refer [VStack Button Breadcrumb BreadcrumbItem BreadcrumbLink HStack]]
     [athens.common.logging                   :as log]
     [athens.db                               :as db]
diff --git a/src/js/components/References/InlineReferences.tsx b/src/js/components/References/InlineReferences.tsx
new file mode 100644
index 0000000000..5d76a2e8b9
--- /dev/null
+++ b/src/js/components/References/InlineReferences.tsx
@@ -0,0 +1,129 @@
+import { ChevronRightIcon } from '@/Icons/Icons';
+import { Button, Box, useDisclosure, Collapse, Text, VStack, HStack } from '@chakra-ui/react';
+import { withErrorBoundary } from 'react-error-boundary';
+
+export const PageReference = ({ children }) => {
+  return (
+    <Box>
+      {children}
+    </Box>
+  )
+}
+
+interface PageReferences {
+  children: React.ReactNode,
+  extras: React.ReactNode,
+  showIfEmpty: boolean,
+  count: number,
+  title: string,
+  defaultIsOpen: boolean,
+  onOpen: () => void,
+  onClose: () => void,
+}
+
+export const ReferenceHeader = ({ onClick, title }) => {
+  return <Button
+    variant="link"
+    aria-role="heading"
+    aria-level={4}
+    onClick={onClick}
+    textAlign="left"
+    justifyContent="flex-start"
+    textTransform="uppercase"
+    fontWeight="bold"
+    fontSize="xs"
+    color="foreground.secondary"
+    display="flex"
+  >{title}</Button>
+}
+
+export const ReferenceGroup = ({ title, onClickTitle, children }) => {
+  return (
+    <VStack
+      className="reference-group"
+      align="stretch"
+      spacing={2}
+      py={2}
+    >
+      {title && <ReferenceHeader onClick={onClickTitle} title={title} />}
+      {children}
+    </VStack>
+  )
+}
+
+export const ReferenceBlock = ({ children, actions }) => {
+  if (actions) {
+    return (<HStack pr={2}><Box flex="1 1 100%">{children}</Box> {actions}</HStack>)
+  } else {
+    return <Box>{children}</Box>
+  }
+}
+
+const EmptyReferencesNotice = ({ title }: { title: string }) => {
+  return (<Text
+    background="background.floor"
+    color="foreground.secondary"
+    borderRadius="md"
+    p={4}>
+    No {title.toLowerCase()}
+  </Text>)
+}
+
+export const PageReferences = withErrorBoundary(({ children, count, title, defaultIsOpen, onOpen, onClose, extras }: PageReferences) => {
+
+  const { isOpen, onToggle } = useDisclosure({
+    defaultIsOpen: defaultIsOpen,
+    onClose: onClose,
+    onOpen: onOpen
+  });
+
+  const isShowingContent = isOpen && !!children;
+
+  return (
+    <VStack
+      align="stretch"
+      position="relative"
+      spacing={0}
+    >
+      <HStack>
+        <Button onClick={onToggle}
+          flex="1 1 100%"
+          borderRadius="sm"
+          isActive={isShowingContent}
+          color="foreground.secondary"
+          textAlign="left"
+          justifyContent="flex-start"
+          overflow="hidden"
+          whiteSpace="nowrap"
+          leftIcon={
+            <ChevronRightIcon
+              transform={isOpen ? "rotate(90deg)" : null}
+              transitionProperty="common"
+              transitionDuration="0.15s"
+              transitionTimingFunction="ease-in-out"
+              fontSize="xs"
+              justifySelf="center"
+            />
+          }
+        >
+          {title}
+          {!!count && <Text
+            marginInlineStart={2}
+            minWidth="1.75em"
+            textAlign="center"
+            background="background.basement"
+            borderRadius="full"
+            p={1}
+            fontSize="sm"
+          >{count}</Text>}
+        </Button>
+        {isShowingContent && extras}
+      </HStack>
+      <Collapse in={isShowingContent} unmountOnExit>
+        <VStack spacing={0} pl={4} py={0} align="stretch">
+          {children}
+        </VStack>
+      </Collapse>
+    </VStack>)
+},
+  { fallback: <Text>Error displaying references</Text> })

From 831f0b08f58aa508d12ff534e98d60bbbe454730 Mon Sep 17 00:00:00 2001
From: Stuart Hanberg <shanberg@users.noreply.github.com>
Date: Thu, 14 Apr 2022 22:40:54 -0400
Subject: [PATCH 10/12] improvement: better style for full-size linked refs

---
 src/cljs/athens/views/pages/node_page.cljs  |  3 +--
 src/js/components/References/References.tsx | 16 ++++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/cljs/athens/views/pages/node_page.cljs b/src/cljs/athens/views/pages/node_page.cljs
index e22a0813ed..657f1d4d96 100644
--- a/src/cljs/athens/views/pages/node_page.cljs
+++ b/src/cljs/athens/views/pages/node_page.cljs
@@ -215,10 +215,9 @@
                      :justifySelf "flex-end"
                      :size "sm"
                      :alignSelf "center"
-                     :fontSize "75%"
+                     :fontSize "70%"
                      :color "foreground.secondary"
                      :bg "transparent"
-                     :mr "0.5em"
                      :borderRadius "full"
                      :sx {"span" {:display "contents"}
                           "button svg:first-of-type" {:marginRight "0.25rem"}}}
diff --git a/src/js/components/References/References.tsx b/src/js/components/References/References.tsx
index 5d76a2e8b9..7c05ae9d03 100644
--- a/src/js/components/References/References.tsx
+++ b/src/js/components/References/References.tsx
@@ -29,9 +29,6 @@ export const ReferenceHeader = ({ onClick, title }) => {
     onClick={onClick}
     textAlign="left"
     justifyContent="flex-start"
-    textTransform="uppercase"
-    fontWeight="bold"
-    fontSize="xs"
     color="foreground.secondary"
     display="flex"
   >{title}</Button>
@@ -40,10 +37,12 @@ export const ReferenceHeader = ({ onClick, title }) => {
 export const ReferenceGroup = ({ title, onClickTitle, children }) => {
   return (
     <VStack
+      borderTop="1px solid"
+      borderColor="separator.divider"
       className="reference-group"
       align="stretch"
-      spacing={2}
-      py={2}
+      spacing={4}
+      py={6}
     >
       {title && <ReferenceHeader onClick={onClickTitle} title={title} />}
       {children}
@@ -120,7 +119,12 @@ export const PageReferences = withErrorBoundary(({ children, count, title, defau
         {isShowingContent && extras}
       </HStack>
       <Collapse in={isShowingContent} unmountOnExit>
-        <VStack spacing={0} pl={4} py={0} align="stretch">
+        <VStack
+          spacing={0}
+          pl={4}
+          py={0}
+          align="stretch"
+        >
           {children}
         </VStack>
       </Collapse>

From c8d5d2ef4974a5f337502515e13427cb76164c57 Mon Sep 17 00:00:00 2001
From: Stuart Hanberg <shanberg@users.noreply.github.com>
Date: Thu, 14 Apr 2022 22:49:43 -0400
Subject: [PATCH 11/12] improvement: better linked refs style

---
 src/cljs/athens/views/pages/node_page.cljs  | 167 ++++++++++----------
 src/js/components/References/References.tsx |   6 +-
 2 files changed, 89 insertions(+), 84 deletions(-)

diff --git a/src/cljs/athens/views/pages/node_page.cljs b/src/cljs/athens/views/pages/node_page.cljs
index 657f1d4d96..76bca03096 100644
--- a/src/cljs/athens/views/pages/node_page.cljs
+++ b/src/cljs/athens/views/pages/node_page.cljs
@@ -1,31 +1,31 @@
 (ns athens.views.pages.node-page
   (:require
-    ["/components/Block/Anchor" :refer [Anchor]]
-    ["/components/Confirmation/Confirmation" :refer [Confirmation]]
-    ["/components/Icons/Icons" :refer [EllipsisHorizontalIcon GraphIcon BookmarkIcon BookmarkFillIcon TrashIcon ArrowRightOnBoxIcon]]
-    ["/components/Page/Page" :refer [PageHeader PageBody PageFooter TitleContainer]]
-    ["/components/References/References" :refer [PageReferences ReferenceBlock ReferenceGroup]]
-    ["@chakra-ui/react" :refer [Box HStack Button Portal IconButton MenuDivider MenuButton Menu MenuList MenuItem Breadcrumb BreadcrumbItem BreadcrumbLink VStack]]
-    [athens.common-db :as common-db]
-    [athens.common.sentry :refer-macros [wrap-span-no-new-tx]]
-    [athens.common.utils :as utils]
-    [athens.dates :as dates]
-    [athens.db :as db :refer [get-unlinked-references]]
-    [athens.parse-renderer :as parse-renderer :refer [parse-and-render]]
-    [athens.reactive :as reactive]
-    [athens.router :as router]
-    [athens.util :refer [escape-str get-caret-position recursively-modify-block-for-embed]]
-    [athens.views.blocks.core :as blocks]
-    [athens.views.blocks.textarea-keydown :as textarea-keydown]
-    [athens.views.hoc.perf-mon :as perf-mon]
-    [clojure.string :as str]
-    [datascript.core :as d]
-    [komponentit.autosize :as autosize]
-    [re-frame.core :as rf :refer [dispatch subscribe]]
-    [reagent.core :as r])
+   ["/components/Block/Anchor" :refer [Anchor]]
+   ["/components/Confirmation/Confirmation" :refer [Confirmation]]
+   ["/components/Icons/Icons" :refer [EllipsisHorizontalIcon GraphIcon BookmarkIcon BookmarkFillIcon TrashIcon ArrowRightOnBoxIcon]]
+   ["/components/Page/Page" :refer [PageHeader PageBody PageFooter TitleContainer]]
+   ["/components/References/References" :refer [PageReferences ReferenceBlock ReferenceGroup]]
+   ["@chakra-ui/react" :refer [Box HStack Button Portal IconButton MenuDivider MenuButton Menu MenuList MenuItem Breadcrumb BreadcrumbItem BreadcrumbLink VStack]]
+   [athens.common-db :as common-db]
+   [athens.common.sentry :refer-macros [wrap-span-no-new-tx]]
+   [athens.common.utils :as utils]
+   [athens.dates :as dates]
+   [athens.db :as db :refer [get-unlinked-references]]
+   [athens.parse-renderer :as parse-renderer :refer [parse-and-render]]
+   [athens.reactive :as reactive]
+   [athens.router :as router]
+   [athens.util :refer [escape-str get-caret-position recursively-modify-block-for-embed]]
+   [athens.views.blocks.core :as blocks]
+   [athens.views.blocks.textarea-keydown :as textarea-keydown]
+   [athens.views.hoc.perf-mon :as perf-mon]
+   [clojure.string :as str]
+   [datascript.core :as d]
+   [komponentit.autosize :as autosize]
+   [re-frame.core :as rf :refer [dispatch subscribe]]
+   [reagent.core :as r])
   (:import
-    (goog.events
-      KeyCodes)))
+   (goog.events
+    KeyCodes)))
 
 
 ;; Helpers
@@ -271,16 +271,19 @@
     (fn [_]
       (let [{:keys [block parents embed-id]} @state
             block (reactive/get-reactive-block-document (:db/id block))]
-        [:> VStack {:spacing 0 :align "stretch"}
-         [:> Breadcrumb {:fontSize "sm" :pl 4 :variant "strict" :color "foreground.secondary"}
+        [:> VStack {:spacing 0
+                    :align "stretch"}
+         [:> Breadcrumb {:fontSize "sm"
+                         :variant "strict"
+                         :color "foreground.secondary"}
           (doall
-            (for [{:keys [node/title block/string block/uid]} parents]
-              [:> BreadcrumbItem {:key (str "breadcrumb-" uid)}
-               [:> BreadcrumbLink
-                {:onClick #(let [new-B (db/get-block [:block/uid uid])
-                                 new-P (drop-last parents)]
-                             (swap! state assoc :block new-B :parents new-P))}
-                [parse-and-render (or title string) uid]]]))]
+           (for [{:keys [node/title block/string block/uid]} parents]
+             [:> BreadcrumbItem {:key (str "breadcrumb-" uid)}
+              [:> BreadcrumbLink
+               {:onClick #(let [new-B (db/get-block [:block/uid uid])
+                                new-P (drop-last parents)]
+                            (swap! state assoc :block new-B :parents new-P))}
+               [parse-and-render (or title string) uid]]]))]
          [:> Box {:class "block-embed"}
           [blocks/block-el
            (recursively-modify-block-for-embed block embed-id)
@@ -300,22 +303,22 @@
                           :onClose (fn [] (swap! state update linked? not))
                           :defaultIsOpen (get @state linked?)}
        (doall
-         (for [[group-title group] linked-refs]
-           [:> ReferenceGroup {:key (str "group-" group-title)
-                               :title group-title
-                               :onClickTitle (fn [e]
-                                               (let [shift?       (.-shiftKey e)
-                                                     parsed-title (parse-renderer/parse-title group-title)]
-                                                 (rf/dispatch [:reporting/navigation {:source :main-page-linked-refs ; NOTE: this might be also used in right-pane situation
-                                                                                      :target :page
-                                                                                      :pane   (if shift?
-                                                                                                :right-pane
-                                                                                                :main-pane)}])
-                                                 (router/navigate-page parsed-title e)))}
-            (doall
-              (for [block group]
-                [:> ReferenceBlock {:key (str "ref-" (:block/uid block))}
-                 [ref-comp block]]))]))])))
+        (for [[group-title group] linked-refs]
+          [:> ReferenceGroup {:key (str "group-" group-title)
+                              :title group-title
+                              :onClickTitle (fn [e]
+                                              (let [shift?       (.-shiftKey e)
+                                                    parsed-title (parse-renderer/parse-title group-title)]
+                                                (rf/dispatch [:reporting/navigation {:source :main-page-linked-refs ; NOTE: this might be also used in right-pane situation
+                                                                                     :target :page
+                                                                                     :pane   (if shift?
+                                                                                               :right-pane
+                                                                                               :main-pane)}])
+                                                (router/navigate-page parsed-title e)))}
+           (doall
+            (for [block group]
+              [:> ReferenceBlock {:key (str "ref-" (:block/uid block))}
+               [ref-comp block]]))]))])))
 
 
 (defn unlinked-ref-el
@@ -344,39 +347,39 @@
                                     (reset! unlinked-refs un-refs))
                         :onClose #(swap! state assoc unlinked? false)}
      (doall
-       (for [[[group-title] group] @unlinked-refs]
-         [:> ReferenceGroup
-          {:title group-title
-           :onClickTitle (fn [e]
-                           (let [shift?       (.-shiftKey e)
-                                 parsed-title (parse-renderer/parse-title group-title)]
-                             (rf/dispatch [:reporting/navigation {:source :main-unlinked-refs ; NOTE: this isn't always `:main-unlinked-refs` it can also be `:right-pane-unlinked-refs`
-                                                                  :target :page
-                                                                  :pane   (if shift?
-                                                                            :right-pane
-                                                                            :main-pane)}])
-                             (router/navigate-page parsed-title e)))}
-          (doall
-            (for [block group]
-              [:> ReferenceBlock
-               {:key (str "ref-" (:block/uid block))
-                :actions (when unlinked?
-                           (r/as-element [:> Button {:marginTop "1.5em"
-                                                     :size "xs"
-                                                     :flex "0 0"
-                                                     :float "right"
-                                                     :variant "link"
-                                                     :onClick (fn []
-                                                                (let [hm                (into (hash-map) @unlinked-refs)
-                                                                      new-unlinked-refs (->> (update-in hm [group-title] #(filter (fn [{:keys [block/uid]}]
-                                                                                                                                    (= uid (:block/uid block)))
-                                                                                                                                  %))
-                                                                                             seq)]
+      (for [[[group-title] group] @unlinked-refs]
+        [:> ReferenceGroup
+         {:title group-title
+          :onClickTitle (fn [e]
+                          (let [shift?       (.-shiftKey e)
+                                parsed-title (parse-renderer/parse-title group-title)]
+                            (rf/dispatch [:reporting/navigation {:source :main-unlinked-refs ; NOTE: this isn't always `:main-unlinked-refs` it can also be `:right-pane-unlinked-refs`
+                                                                 :target :page
+                                                                 :pane   (if shift?
+                                                                           :right-pane
+                                                                           :main-pane)}])
+                            (router/navigate-page parsed-title e)))}
+         (doall
+          (for [block group]
+            [:> ReferenceBlock
+             {:key (str "ref-" (:block/uid block))
+              :actions (when unlinked?
+                         (r/as-element [:> Button {:marginTop "1.5em"
+                                                   :size "xs"
+                                                   :flex "0 0"
+                                                   :float "right"
+                                                   :variant "link"
+                                                   :onClick (fn []
+                                                              (let [hm                (into (hash-map) @unlinked-refs)
+                                                                    new-unlinked-refs (->> (update-in hm [group-title] #(filter (fn [{:keys [block/uid]}]
+                                                                                                                                  (= uid (:block/uid block)))
+                                                                                                                                %))
+                                                                                           seq)]
                                                                   ;; ctrl-z doesn't work though, because Unlinked Refs aren't reactive to datascript.
-                                                                  (reset! unlinked-refs new-unlinked-refs)
-                                                                  (dispatch [:unlinked-references/link block title])))}
-                                          "Link"]))}
-               [ref-comp block]]))]))]))
+                                                                (reset! unlinked-refs new-unlinked-refs)
+                                                                (dispatch [:unlinked-references/link block title])))}
+                                        "Link"]))}
+             [ref-comp block]]))]))]))
 
 
 ;; TODO: where to put page-level link filters?
diff --git a/src/js/components/References/References.tsx b/src/js/components/References/References.tsx
index 7c05ae9d03..417484f92e 100644
--- a/src/js/components/References/References.tsx
+++ b/src/js/components/References/References.tsx
@@ -85,7 +85,9 @@ export const PageReferences = withErrorBoundary(({ children, count, title, defau
       spacing={0}
     >
       <HStack>
-        <Button onClick={onToggle}
+        <Button
+          variant="ghost"
+          onClick={onToggle}
           flex="1 1 100%"
           borderRadius="sm"
           isActive={isShowingContent}
@@ -100,7 +102,7 @@ export const PageReferences = withErrorBoundary(({ children, count, title, defau
               transitionProperty="common"
               transitionDuration="0.15s"
               transitionTimingFunction="ease-in-out"
-              fontSize="xs"
+              fontSize="sm"
               justifySelf="center"
             />
           }

From 259622af6ad83042b0c0b1e65373bc4fd7597d19 Mon Sep 17 00:00:00 2001
From: Stuart Hanberg <shanberg@users.noreply.github.com>
Date: Thu, 14 Apr 2022 22:50:22 -0400
Subject: [PATCH 12/12] chore: lint fixes

---
 src/cljs/athens/views/pages/node_page.cljs | 160 ++++++++++-----------
 src/cljs/athens/views/pages/page.cljs      |  10 +-
 2 files changed, 85 insertions(+), 85 deletions(-)

diff --git a/src/cljs/athens/views/pages/node_page.cljs b/src/cljs/athens/views/pages/node_page.cljs
index 76bca03096..70cfe55761 100644
--- a/src/cljs/athens/views/pages/node_page.cljs
+++ b/src/cljs/athens/views/pages/node_page.cljs
@@ -1,31 +1,31 @@
 (ns athens.views.pages.node-page
   (:require
-   ["/components/Block/Anchor" :refer [Anchor]]
-   ["/components/Confirmation/Confirmation" :refer [Confirmation]]
-   ["/components/Icons/Icons" :refer [EllipsisHorizontalIcon GraphIcon BookmarkIcon BookmarkFillIcon TrashIcon ArrowRightOnBoxIcon]]
-   ["/components/Page/Page" :refer [PageHeader PageBody PageFooter TitleContainer]]
-   ["/components/References/References" :refer [PageReferences ReferenceBlock ReferenceGroup]]
-   ["@chakra-ui/react" :refer [Box HStack Button Portal IconButton MenuDivider MenuButton Menu MenuList MenuItem Breadcrumb BreadcrumbItem BreadcrumbLink VStack]]
-   [athens.common-db :as common-db]
-   [athens.common.sentry :refer-macros [wrap-span-no-new-tx]]
-   [athens.common.utils :as utils]
-   [athens.dates :as dates]
-   [athens.db :as db :refer [get-unlinked-references]]
-   [athens.parse-renderer :as parse-renderer :refer [parse-and-render]]
-   [athens.reactive :as reactive]
-   [athens.router :as router]
-   [athens.util :refer [escape-str get-caret-position recursively-modify-block-for-embed]]
-   [athens.views.blocks.core :as blocks]
-   [athens.views.blocks.textarea-keydown :as textarea-keydown]
-   [athens.views.hoc.perf-mon :as perf-mon]
-   [clojure.string :as str]
-   [datascript.core :as d]
-   [komponentit.autosize :as autosize]
-   [re-frame.core :as rf :refer [dispatch subscribe]]
-   [reagent.core :as r])
+    ["/components/Block/Anchor" :refer [Anchor]]
+    ["/components/Confirmation/Confirmation" :refer [Confirmation]]
+    ["/components/Icons/Icons" :refer [EllipsisHorizontalIcon GraphIcon BookmarkIcon BookmarkFillIcon TrashIcon ArrowRightOnBoxIcon]]
+    ["/components/Page/Page" :refer [PageHeader PageBody PageFooter TitleContainer]]
+    ["/components/References/References" :refer [PageReferences ReferenceBlock ReferenceGroup]]
+    ["@chakra-ui/react" :refer [Box HStack Button Portal IconButton MenuDivider MenuButton Menu MenuList MenuItem Breadcrumb BreadcrumbItem BreadcrumbLink VStack]]
+    [athens.common-db :as common-db]
+    [athens.common.sentry :refer-macros [wrap-span-no-new-tx]]
+    [athens.common.utils :as utils]
+    [athens.dates :as dates]
+    [athens.db :as db :refer [get-unlinked-references]]
+    [athens.parse-renderer :as parse-renderer :refer [parse-and-render]]
+    [athens.reactive :as reactive]
+    [athens.router :as router]
+    [athens.util :refer [escape-str get-caret-position recursively-modify-block-for-embed]]
+    [athens.views.blocks.core :as blocks]
+    [athens.views.blocks.textarea-keydown :as textarea-keydown]
+    [athens.views.hoc.perf-mon :as perf-mon]
+    [clojure.string :as str]
+    [datascript.core :as d]
+    [komponentit.autosize :as autosize]
+    [re-frame.core :as rf :refer [dispatch subscribe]]
+    [reagent.core :as r])
   (:import
-   (goog.events
-    KeyCodes)))
+    (goog.events
+      KeyCodes)))
 
 
 ;; Helpers
@@ -277,13 +277,13 @@
                          :variant "strict"
                          :color "foreground.secondary"}
           (doall
-           (for [{:keys [node/title block/string block/uid]} parents]
-             [:> BreadcrumbItem {:key (str "breadcrumb-" uid)}
-              [:> BreadcrumbLink
-               {:onClick #(let [new-B (db/get-block [:block/uid uid])
-                                new-P (drop-last parents)]
-                            (swap! state assoc :block new-B :parents new-P))}
-               [parse-and-render (or title string) uid]]]))]
+            (for [{:keys [node/title block/string block/uid]} parents]
+              [:> BreadcrumbItem {:key (str "breadcrumb-" uid)}
+               [:> BreadcrumbLink
+                {:onClick #(let [new-B (db/get-block [:block/uid uid])
+                                 new-P (drop-last parents)]
+                             (swap! state assoc :block new-B :parents new-P))}
+                [parse-and-render (or title string) uid]]]))]
          [:> Box {:class "block-embed"}
           [blocks/block-el
            (recursively-modify-block-for-embed block embed-id)
@@ -303,22 +303,22 @@
                           :onClose (fn [] (swap! state update linked? not))
                           :defaultIsOpen (get @state linked?)}
        (doall
-        (for [[group-title group] linked-refs]
-          [:> ReferenceGroup {:key (str "group-" group-title)
-                              :title group-title
-                              :onClickTitle (fn [e]
-                                              (let [shift?       (.-shiftKey e)
-                                                    parsed-title (parse-renderer/parse-title group-title)]
-                                                (rf/dispatch [:reporting/navigation {:source :main-page-linked-refs ; NOTE: this might be also used in right-pane situation
-                                                                                     :target :page
-                                                                                     :pane   (if shift?
-                                                                                               :right-pane
-                                                                                               :main-pane)}])
-                                                (router/navigate-page parsed-title e)))}
-           (doall
-            (for [block group]
-              [:> ReferenceBlock {:key (str "ref-" (:block/uid block))}
-               [ref-comp block]]))]))])))
+         (for [[group-title group] linked-refs]
+           [:> ReferenceGroup {:key (str "group-" group-title)
+                               :title group-title
+                               :onClickTitle (fn [e]
+                                               (let [shift?       (.-shiftKey e)
+                                                     parsed-title (parse-renderer/parse-title group-title)]
+                                                 (rf/dispatch [:reporting/navigation {:source :main-page-linked-refs ; NOTE: this might be also used in right-pane situation
+                                                                                      :target :page
+                                                                                      :pane   (if shift?
+                                                                                                :right-pane
+                                                                                                :main-pane)}])
+                                                 (router/navigate-page parsed-title e)))}
+            (doall
+              (for [block group]
+                [:> ReferenceBlock {:key (str "ref-" (:block/uid block))}
+                 [ref-comp block]]))]))])))
 
 
 (defn unlinked-ref-el
@@ -347,39 +347,39 @@
                                     (reset! unlinked-refs un-refs))
                         :onClose #(swap! state assoc unlinked? false)}
      (doall
-      (for [[[group-title] group] @unlinked-refs]
-        [:> ReferenceGroup
-         {:title group-title
-          :onClickTitle (fn [e]
-                          (let [shift?       (.-shiftKey e)
-                                parsed-title (parse-renderer/parse-title group-title)]
-                            (rf/dispatch [:reporting/navigation {:source :main-unlinked-refs ; NOTE: this isn't always `:main-unlinked-refs` it can also be `:right-pane-unlinked-refs`
-                                                                 :target :page
-                                                                 :pane   (if shift?
-                                                                           :right-pane
-                                                                           :main-pane)}])
-                            (router/navigate-page parsed-title e)))}
-         (doall
-          (for [block group]
-            [:> ReferenceBlock
-             {:key (str "ref-" (:block/uid block))
-              :actions (when unlinked?
-                         (r/as-element [:> Button {:marginTop "1.5em"
-                                                   :size "xs"
-                                                   :flex "0 0"
-                                                   :float "right"
-                                                   :variant "link"
-                                                   :onClick (fn []
-                                                              (let [hm                (into (hash-map) @unlinked-refs)
-                                                                    new-unlinked-refs (->> (update-in hm [group-title] #(filter (fn [{:keys [block/uid]}]
-                                                                                                                                  (= uid (:block/uid block)))
-                                                                                                                                %))
-                                                                                           seq)]
+       (for [[[group-title] group] @unlinked-refs]
+         [:> ReferenceGroup
+          {:title group-title
+           :onClickTitle (fn [e]
+                           (let [shift?       (.-shiftKey e)
+                                 parsed-title (parse-renderer/parse-title group-title)]
+                             (rf/dispatch [:reporting/navigation {:source :main-unlinked-refs ; NOTE: this isn't always `:main-unlinked-refs` it can also be `:right-pane-unlinked-refs`
+                                                                  :target :page
+                                                                  :pane   (if shift?
+                                                                            :right-pane
+                                                                            :main-pane)}])
+                             (router/navigate-page parsed-title e)))}
+          (doall
+            (for [block group]
+              [:> ReferenceBlock
+               {:key (str "ref-" (:block/uid block))
+                :actions (when unlinked?
+                           (r/as-element [:> Button {:marginTop "1.5em"
+                                                     :size "xs"
+                                                     :flex "0 0"
+                                                     :float "right"
+                                                     :variant "link"
+                                                     :onClick (fn []
+                                                                (let [hm                (into (hash-map) @unlinked-refs)
+                                                                      new-unlinked-refs (->> (update-in hm [group-title] #(filter (fn [{:keys [block/uid]}]
+                                                                                                                                    (= uid (:block/uid block)))
+                                                                                                                                  %))
+                                                                                             seq)]
                                                                   ;; ctrl-z doesn't work though, because Unlinked Refs aren't reactive to datascript.
-                                                                (reset! unlinked-refs new-unlinked-refs)
-                                                                (dispatch [:unlinked-references/link block title])))}
-                                        "Link"]))}
-             [ref-comp block]]))]))]))
+                                                                  (reset! unlinked-refs new-unlinked-refs)
+                                                                  (dispatch [:unlinked-references/link block title])))}
+                                          "Link"]))}
+               [ref-comp block]]))]))]))
 
 
 ;; TODO: where to put page-level link filters?
diff --git a/src/cljs/athens/views/pages/page.cljs b/src/cljs/athens/views/pages/page.cljs
index 02a3e8a6d5..0302629b91 100644
--- a/src/cljs/athens/views/pages/page.cljs
+++ b/src/cljs/athens/views/pages/page.cljs
@@ -14,11 +14,11 @@
   []
   (let [title    (rf/subscribe [:current-route/page-title])
         page-eid (common-db/e-by-av @db/dsdb :node/title @title)]
-      [:> PageContainer {:uid page-eid :type "node"}
-       (if (int? page-eid)
-         [node-page/page page-eid]
-         [:> PageNotFound {:title @title
-                           :onClickHome #(router/navigate :pages)}])]))
+    [:> PageContainer {:uid page-eid :type "node"}
+     (if (int? page-eid)
+       [node-page/page page-eid]
+       [:> PageNotFound {:title @title
+                         :onClickHome #(router/navigate :pages)}])]))
 
 
 (defn page