feat: change primary font to Open Sans

This commit is contained in:
Jordan Knott 2021-04-30 16:33:38 -05:00
parent f45e359402
commit bd34f4b3ad
15 changed files with 13 additions and 5 deletions

View File

@ -0,0 +1,6 @@
@font-face {
font-family: 'Open Sans';
src: url(../shared/fonts/OpenSans-Regular.ttf) format('truetype');
/* other formats include: 'woff2', 'truetype, 'opentype',
'embedded-opentype', and 'svg' */
}

View File

@ -11,6 +11,7 @@ import ToastedContainer from './Toast';
import { UserContext } from './context'; import { UserContext } from './context';
import 'react-toastify/dist/ReactToastify.css'; import 'react-toastify/dist/ReactToastify.css';
import './fonts.css';
const history = createBrowserHistory(); const history = createBrowserHistory();

View File

@ -1,7 +1,8 @@
// LOC830 // LOC830
import React, { useState, useRef, useEffect, useContext } from 'react'; import React, { useState, useRef, useEffect, useContext } from 'react';
import updateApolloCache from 'shared/utils/cache'; import updateApolloCache from 'shared/utils/cache';
import GlobalTopNavbar, { ProjectPopup } from 'App/TopNavbar'; import GlobalTopNavbar from 'App/TopNavbar';
import ProjectPopup from 'App/TopNavbar/ProjectPopup';
import styled from 'styled-components/macro'; import styled from 'styled-components/macro';
import AsyncSelect from 'react-select/async'; import AsyncSelect from 'react-select/async';
import { usePopup, Popup } from 'shared/components/PopupMenu'; import { usePopup, Popup } from 'shared/components/PopupMenu';

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -17,7 +17,7 @@ const colors = {
export const base = { export const base = {
...colors, ...colors,
fontFamily: "'Droid Sans', sans-serif", fontFamily: "'Open Sans', sans-serif",
fontFamilyMono: "'SFMono-Regular',Consolas,'Liberation Mono', Menlo, Courier,monospace", fontFamilyMono: "'SFMono-Regular',Consolas,'Liberation Mono', Menlo, Courier,monospace",
fontWeight: 400, fontWeight: 400,
zIndex: 10000, zIndex: 10000,

View File

@ -27,10 +27,10 @@ export const color = {
}; };
export const font = { export const font = {
regular: 'font-family: "Droid Sans", Roboto, sans-serif; font-weight: normal;', regular: 'font-family: "Open Sans", Roboto, sans-serif; font-weight: normal;',
size: (size: number) => `font-size: ${size}px;`, size: (size: number) => `font-size: ${size}px;`,
bold: 'font-family: "Droid Sans", Roboto, sans-serif; font-weight: normal;', bold: 'font-family: "Open Sans", Roboto, sans-serif; font-weight: normal;',
medium: 'font-family: "Droid Sans", Roboto, sans-serif; font-weight: normal;', medium: 'font-family: "Open Sans", Roboto, sans-serif; font-weight: normal;',
}; };
export const mixin = { export const mixin = {