From a4ff94d78b11c54e83b2698b41f26b929a67f7d2 Mon Sep 17 00:00:00 2001 From: Jordan Knott Date: Mon, 20 Jul 2020 17:34:33 -0500 Subject: [PATCH] fix: add roboto & sans-serif fallback font --- frontend/src/shared/components/AddList/Styles.ts | 1 - frontend/src/shared/components/DueDateManager/Styles.ts | 1 - frontend/src/shared/components/List/Styles.ts | 2 -- frontend/src/shared/components/MemberManager/Styles.ts | 1 - frontend/src/shared/components/TaskDetails/Styles.ts | 1 - frontend/src/shared/utils/styles.ts | 6 +++--- 6 files changed, 3 insertions(+), 9 deletions(-) diff --git a/frontend/src/shared/components/AddList/Styles.ts b/frontend/src/shared/components/AddList/Styles.ts index 708de3f..d09d65f 100644 --- a/frontend/src/shared/components/AddList/Styles.ts +++ b/frontend/src/shared/components/AddList/Styles.ts @@ -74,7 +74,6 @@ export const ListNameEditor = styled(TextareaAutosize)` line-height: 20px; padding: 8px 12px; - font-family: 'Droid Sans'; overflow: hidden; overflow-wrap: break-word; resize: none; diff --git a/frontend/src/shared/components/DueDateManager/Styles.ts b/frontend/src/shared/components/DueDateManager/Styles.ts index 656f6ef..a6976e2 100644 --- a/frontend/src/shared/components/DueDateManager/Styles.ts +++ b/frontend/src/shared/components/DueDateManager/Styles.ts @@ -8,7 +8,6 @@ display: flex flex-direction: column; & .react-datepicker { background: #262c49; - font-family: 'Droid Sans', sans-serif; border: none; } & .react-datepicker__triangle { diff --git a/frontend/src/shared/components/List/Styles.ts b/frontend/src/shared/components/List/Styles.ts index 6392e2b..3af39d2 100644 --- a/frontend/src/shared/components/List/Styles.ts +++ b/frontend/src/shared/components/List/Styles.ts @@ -63,7 +63,6 @@ export const HeaderEditTarget = styled.div<{ isHidden: boolean }>` `; export const HeaderName = styled(TextareaAutosize)` - font-family: 'Droid Sans'; font-size: 14px; border: none; resize: none; @@ -105,7 +104,6 @@ export const Header = styled.div<{ isEditing: boolean }>` export const AddCardButtonText = styled.span` padding-left: 5px; - font-family: 'Droid Sans'; `; export const ListCards = styled.div` diff --git a/frontend/src/shared/components/MemberManager/Styles.ts b/frontend/src/shared/components/MemberManager/Styles.ts index 7423081..dd7ce14 100644 --- a/frontend/src/shared/components/MemberManager/Styles.ts +++ b/frontend/src/shared/components/MemberManager/Styles.ts @@ -18,7 +18,6 @@ export const MemberManagerSearch = styled(TextareaAutosize)` line-height: 20px; padding: 8px 12px; font-size: 14px; - font-family: 'Droid Sans'; font-weight: 400; background: #262c49; diff --git a/frontend/src/shared/components/TaskDetails/Styles.ts b/frontend/src/shared/components/TaskDetails/Styles.ts index f2a114f..3f69e50 100644 --- a/frontend/src/shared/components/TaskDetails/Styles.ts +++ b/frontend/src/shared/components/TaskDetails/Styles.ts @@ -73,7 +73,6 @@ export const TaskDetailsTitle = styled(TextareaAutosize)` resize: none; box-shadow: transparent 0px 0px 0px 1px; font-size: 24px; - font-family: 'Droid Sans'; font-weight: 700; padding: 4px; background: #262c49; diff --git a/frontend/src/shared/utils/styles.ts b/frontend/src/shared/utils/styles.ts index 323381d..d583468 100644 --- a/frontend/src/shared/utils/styles.ts +++ b/frontend/src/shared/utils/styles.ts @@ -27,10 +27,10 @@ export const color = { }; export const font = { - regular: 'font-family: "Droid Sans"; font-weight: normal;', + regular: 'font-family: "Droid Sans", Roboto, sans-serif; font-weight: normal;', size: (size: number) => `font-size: ${size}px;`, - bold: 'font-family: "Droid Sans"; font-weight: normal;', - medium: 'font-family: "Droid Sans"; font-weight: normal;', + bold: 'font-family: "Droid Sans", Roboto, sans-serif; font-weight: normal;', + medium: 'font-family: "Droid Sans", Roboto, sans-serif; font-weight: normal;', }; export const mixin = {