diff --git a/packages/frontend/component/src/ui/date-picker/calendar/calendar.css.ts b/packages/frontend/component/src/ui/date-picker/calendar/calendar.css.ts index 2387b77e5d..edc4fc808c 100644 --- a/packages/frontend/component/src/ui/date-picker/calendar/calendar.css.ts +++ b/packages/frontend/component/src/ui/date-picker/calendar/calendar.css.ts @@ -5,6 +5,8 @@ import { createVar, style } from '@vanilla-extract/css'; export const vars = { gapX: createVar('gapX'), gapY: createVar('gapY'), + cellFontSize: createVar('cellFontSize'), + cellSize: createVar('cellSize'), }; // basic @@ -82,9 +84,9 @@ export const basicCell = style({ display: 'flex', alignItems: 'center', justifyContent: 'center', - minWidth: '28px', - maxWidth: '56px', - flex: '1', + width: vars.cellSize, + height: vars.cellSize, + flexBasis: vars.cellSize, userSelect: 'none', }); @@ -138,11 +140,16 @@ export const calendarHeaderTriggerButton = style([ { display: 'inline-flex', lineHeight: '22px', - fontSize: 'var(--affine-font-sm)', + fontSize: vars.cellFontSize, fontWeight: 600, - padding: '2px 6px', + padding: '0 6px', borderRadius: 4, whiteSpace: 'nowrap', + selectors: { + '[data-mobile="true"] &': { + padding: '0px 4px', + }, + }, }, ]); export const headerNavButtons = style({ @@ -156,7 +163,7 @@ export const headerNavGapFallback = style({ export const headerNavToday = style([ interactive, { - fontSize: 'var(--affine-font-sm)', + fontSize: vars.cellFontSize, fontWeight: 400, lineHeight: '22px', padding: '0 4px', @@ -181,18 +188,13 @@ export const monthViewRow = style({ export const monthViewHeaderCell = style([ basicCell, { - fontSize: 'var(--affine-font-xs)', + fontSize: vars.cellFontSize, fontWeight: 500, color: cssVar('textSecondaryColor'), height: 28, }, ]); -export const monthViewBodyCell = style([ - basicCell, - { - height: '28px', - }, -]); +export const monthViewBodyCell = style([basicCell]); export const monthViewBodyCellInner = style([ interactive, @@ -200,7 +202,7 @@ export const monthViewBodyCellInner = style([ width: '100%', height: '100%', borderRadius: 8, - fontSize: cssVar('fontSm'), + fontSize: vars.cellFontSize, color: cssVar('textPrimaryColor'), fontWeight: 400, diff --git a/packages/frontend/component/src/ui/date-picker/calendar/calendar.tsx b/packages/frontend/component/src/ui/date-picker/calendar/calendar.tsx index 329f9db250..d8b078b6f4 100644 --- a/packages/frontend/component/src/ui/date-picker/calendar/calendar.tsx +++ b/packages/frontend/component/src/ui/date-picker/calendar/calendar.tsx @@ -18,7 +18,7 @@ export type { DatePickerProps } from './types'; */ export const DatePicker = (props: DatePickerProps) => { const finalProps = { ...defaultDatePickerProps, ...props }; - const { value, gapX, gapY, onChange } = finalProps; + const { value, gapX, gapY, cellFontSize, cellSize, onChange } = finalProps; const [mode, setMode] = useState('day'); const [cursor, setCursor] = useState(dayjs(value)); @@ -26,6 +26,8 @@ export const DatePicker = (props: DatePickerProps) => { const variables = assignInlineVars({ [styles.vars.gapX]: `${gapX}px`, [styles.vars.gapY]: `${gapY}px`, + [styles.vars.cellFontSize]: `${cellFontSize}px`, + [styles.vars.cellSize]: `${cellSize}px`, }); const Component = mode === 'day' ? DayPicker : mode === 'month' ? MonthPicker : YearPicker; diff --git a/packages/frontend/component/src/ui/date-picker/calendar/items.tsx b/packages/frontend/component/src/ui/date-picker/calendar/items.tsx index a2258bdb36..a92899509a 100644 --- a/packages/frontend/component/src/ui/date-picker/calendar/items.tsx +++ b/packages/frontend/component/src/ui/date-picker/calendar/items.tsx @@ -80,7 +80,12 @@ export const CalendarLayout = forwardRef( ref ) => { return ( -
+
void; onNext?: () => void; } + +const iconButtonSize = BUILD_CONFIG.isMobileEdition ? 28 : 16; + export const NavButtons = memo(function NavButtons({ children, prevDisabled, @@ -135,7 +143,7 @@ export const NavButtons = memo(function NavButtons({
{ onClick: e => e.stopPropagation(), sideOffset: 10, alignOffset: -30, - style: { padding: 20 }, + style: { padding: '15px 20px' }, }} rootOptions={{ modal: true, diff --git a/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/journal.css.ts b/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/journal.css.ts index 25dff600af..5a037341b9 100644 --- a/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/journal.css.ts +++ b/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/journal.css.ts @@ -251,7 +251,3 @@ export const journalDateCellDot = style({ left: '50%', transform: 'translateX(-50%)', }); - -export const journalDateCellWrapper = style({ - height: 34, -}); diff --git a/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/journal.tsx b/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/journal.tsx index 63be78c04b..b21460eaac 100644 --- a/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/journal.tsx +++ b/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/journal.tsx @@ -154,8 +154,7 @@ export const EditorJournalPanel = () => { customDayRenderer={customDayRenderer} value={journalDate?.format('YYYY-MM-DD')} onChange={onDateSelect} - monthHeaderCellClassName={styles.journalDateCellWrapper} - monthBodyCellClassName={styles.journalDateCellWrapper} + cellSize={34} />
{journalDate ? (