From 871e19a9bbcbe1a983e4989482e644719943f74d Mon Sep 17 00:00:00 2001 From: Joel Keyser Date: Wed, 1 Mar 2023 17:48:33 -0600 Subject: [PATCH 1/3] touchup: increase transparency of claim overlay --- web/src/modules/topic/components/Diagram/Diagram.styles.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/modules/topic/components/Diagram/Diagram.styles.tsx b/web/src/modules/topic/components/Diagram/Diagram.styles.tsx index 4aea0325..f4650812 100644 --- a/web/src/modules/topic/components/Diagram/Diagram.styles.tsx +++ b/web/src/modules/topic/components/Diagram/Diagram.styles.tsx @@ -9,7 +9,7 @@ export const StyledReactFlow = styled(ReactFlow)` align-items: center; // maintain some visual context when overlaying diagrams - background-color: rgba(255, 255, 255, 0.97); + background-color: rgba(255, 255, 255, 0.87); `; export const PositionedCloseButton = styled(IconButton)` From ad96579d460e24b918e4a3b35fe905c2aee7ba6a Mon Sep 17 00:00:00 2001 From: Joel Keyser Date: Wed, 1 Mar 2023 17:49:37 -0600 Subject: [PATCH 2/3] touchup(node): no monospace & decrease font size --- .../topic/components/EditableNode/EditableNode.styles.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/src/modules/topic/components/EditableNode/EditableNode.styles.tsx b/web/src/modules/topic/components/EditableNode/EditableNode.styles.tsx index 8c11f5a8..487471f5 100644 --- a/web/src/modules/topic/components/EditableNode/EditableNode.styles.tsx +++ b/web/src/modules/topic/components/EditableNode/EditableNode.styles.tsx @@ -48,7 +48,8 @@ export const StyledTextareaAutosize = styled(TextareaAutosize) color}; width: 100%; - font-size: 24px; + font-size: 20px; + font-family: inherit; `; interface NodeDivProps { From 319114053deba3f12d74856ab2eaa5acd7b354ad Mon Sep 17 00:00:00 2001 From: Joel Keyser Date: Wed, 1 Mar 2023 17:52:33 -0600 Subject: [PATCH 3/3] touchup(pane): show claims if have explicit claims --- web/src/modules/topic/components/TopicPane/TopicPane.tsx | 4 ++-- web/src/modules/topic/store/store.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/src/modules/topic/components/TopicPane/TopicPane.tsx b/web/src/modules/topic/components/TopicPane/TopicPane.tsx index 0119a1b2..f3c21498 100644 --- a/web/src/modules/topic/components/TopicPane/TopicPane.tsx +++ b/web/src/modules/topic/components/TopicPane/TopicPane.tsx @@ -16,7 +16,7 @@ import { viewClaimDiagram, viewCriteriaTable, viewProblemDiagram } from "../../s import { useNodes } from "../../store/nodeHooks"; import { problemDiagramId, - useClaimDiagramIdentifiers, + useClaimDiagramsWithExplicitClaims, useRootTitle, useTopicViewId, } from "../../store/store"; @@ -36,7 +36,7 @@ export const TopicPane = () => { const topicViewId = useTopicViewId(); const rootTitle = useRootTitle(); - const claimDiagramIdentifiers = useClaimDiagramIdentifiers(); + const claimDiagramIdentifiers = useClaimDiagramsWithExplicitClaims(); const problems = useNodes(problemDiagramId, (node) => node.type === "problem"); const handleDrawerToggle = () => { diff --git a/web/src/modules/topic/store/store.ts b/web/src/modules/topic/store/store.ts index 610981dd..ee7d42bc 100644 --- a/web/src/modules/topic/store/store.ts +++ b/web/src/modules/topic/store/store.ts @@ -112,10 +112,10 @@ export const useActiveTableProblemId = () => { return useTopicStoreAfterHydration((state) => state.activeTableProblemId); }; -export const useClaimDiagramIdentifiers = () => { +export const useClaimDiagramsWithExplicitClaims = () => { return useTopicStoreAfterHydration((state) => Object.entries(state.diagrams) - .filter(([id, _]) => id !== problemDiagramId) + .filter(([id, diagram]) => id !== problemDiagramId && diagram.nodes.length > 1) .map(([id, diagram]) => [id, diagram.nodes[0].data.label]) ); };