This commit is contained in:
Morten Olsen
2022-05-23 10:36:28 +02:00
parent 42ca6c9559
commit 3c8ce8d2d2
14 changed files with 152 additions and 97 deletions

View File

@@ -1,4 +1,4 @@
import { Body1, Caption, Overline } from "../../../typography";
import { Title1, Title2, Body1, Caption, Overline } from "../../../typography";
import { Row, Cell, Icon, RowProps } from '../../base';
import styled from "styled-components/native"
import stringToColor from 'string-to-color';
@@ -61,8 +61,8 @@ const CalendarEntry = ({
height={height}
color={color}
>
<Overline color="background">{location}</Overline>
<Body1 color="background">{title}</Body1>
{!!location && <Overline color="background">{location}</Overline>}
<Title1 color="background">{title}</Title1>
<Caption color="background">{time}</Caption>
</Wrapper>
);

View File

@@ -70,7 +70,6 @@ const CalendarStrip: React.FC<Props> = ({ start, selected, onSelect }) => {
}, [firstDayOfWeek]);
const monthLabel = useMemo(() => {
console.log(months);
if (months[0] === months[1]) {
return new Date(0, months[0], 1).toLocaleString('en-us', { month: 'long' });
} else {

View File

@@ -50,7 +50,7 @@ const light: Theme = {
},
font: {
family: Platform.OS === 'web' ? 'Montserrat' : undefined,
baseSize: Platform.OS === 'web' ? 12 : 10,
baseSize: Platform.OS === 'web' ? 12 : 11,
},
};