Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: daily notes pages shouldn't get squished #2305

Merged
merged 2 commits into from
Aug 24, 2022
Merged

fix: daily notes pages shouldn't get squished #2305

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7b8b16
fix: daily notes pages shouldn't get squished
shanberg Aug 23, 2022
c18e73d
Merge branch 'main' into fix-dailynotes-page-height
tangjeff0 Aug 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/js/components/Page/Page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from 'react';
import {
Button, VStack, Divider, Center, Box, Heading, Image, IconButton, ButtonGroup, FormControl, Input,
Tooltip, FormLabel, BoxProps, MenuGroup, MenuItem, MenuDivider
Tooltip, FormLabel, BoxProps, MenuGroup, MenuItem, MenuDivider, Text
} from '@chakra-ui/react';
import { ArrowRightOnBoxIcon, ArrowLeftOnBoxIcon, CalendarCircleFillIcon, CalendarTomorrowIcon, TemplateIcon, LinkedIcon } from '@/Icons/Icons';
import { ArrowRightOnBoxIcon, ArrowLeftOnBoxIcon, CalendarCircleFillIcon, CalendarTomorrowIcon, TemplateIcon, LinkedIcon, CalendarIcon } from '@/Icons/Icons';
import { useInView } from 'react-intersection-observer';
import { withErrorBoundary } from "react-error-boundary";

Expand Down Expand Up @@ -208,7 +208,7 @@ export const DailyNotesList = (props: DailyNotesListProps) => {
{boxProps.children}
<DailyNotesPage isReal={false}>
<Box ref={ref} />
<PageHeader overline="Daily Note">
<PageHeader overline={<Text as="span" display="flex" gap={1} alignItems="center"><CalendarIcon /> Daily Note</Text>}>
<TitleContainer isEditing="false">Earlier</TitleContainer>
</PageHeader>
</DailyNotesPage>
Expand All @@ -230,6 +230,7 @@ export const DailyNotesPage = withErrorBoundary((props: DailyNotesPageProps) =>
{...PAGE_PROPS}
{...boxProps}
ref={pageRef}
flex="0 0 auto"
className="node-page daily-notes"
minHeight="calc(100vh - 4rem)"
boxShadow="page"
Expand Down