Use "Inter" as default typeface (#5741)

* Inter

* tweaks

* tweaks
This commit is contained in:
Tom Moor
2023-08-31 18:07:45 -04:00
committed by GitHub
parent 7abb4f9ad6
commit 4e53029377
15 changed files with 60 additions and 44 deletions

View File

@@ -254,9 +254,9 @@ flex-grow: ${props.grow ? 1 : 0};
justify-content: start;
color: ${props.theme.text};
font-family: ${props.theme.fontFamily};
font-weight: ${props.theme.fontWeight};
font-weight: ${props.theme.fontWeightRegular};
font-size: 1em;
line-height: 1.6em;
line-height: -0.011;
width: 100%;
.mention {
@@ -285,9 +285,6 @@ width: 100%;
word-wrap: break-word;
white-space: pre-wrap;
white-space: break-spaces;
-webkit-font-variant-ligatures: none;
font-variant-ligatures: none;
font-feature-settings: "liga" 0; /* the above doesn't seem to work in Edge */
padding: ${props.editorStyle?.padding ?? "initial"};
margin: ${props.editorStyle?.margin ?? "initial"};
@@ -329,12 +326,12 @@ width: 100%;
// all of heading sizes are stepped down one from global styles, except h1
// which is between h1 and h2
h1 { font-size: 1.75em; }
h2 { font-size: 1.25em; }
h3 { font-size: 1em; }
h4 { font-size: 0.875em; }
h5 { font-size: 0.75em; }
h6 { font-size: 0.75em; }
h1 { font-size: 28px; }
h2 { font-size: 22px; }
h3 { font-size: 18px; }
h4 { font-size: 16px; }
h5 { font-size: 15px; }
h6 { font-size: 15px; }
.ProseMirror-yjs-cursor {
position: relative;

View File

@@ -30,8 +30,7 @@ export default createGlobalStyle<Props>`
optgroup,
select,
textarea {
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen,
Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
font-family: ${s("fontFamily")};
}
body {
@@ -82,12 +81,11 @@ export default createGlobalStyle<Props>`
margin-top: 1em;
margin-bottom: 0.5em;
}
h1 { font-size: 2.25em; }
h2 { font-size: 1.5em; }
h3 { font-size: 1.25em; }
h4 { font-size: 1em; }
h5 { font-size: 0.875em; }
h6 { font-size: 0.75em; }
h1 { font-size: 36px; }
h2 { font-size: 26px; }
h3 { font-size: 22px; }
h4 { font-size: 18px; }
h5 { font-size: 16px; }
p,
dl,

View File

@@ -59,10 +59,12 @@ const buildBaseTheme = (input: Partial<Colors>) => {
return {
fontFamily:
"-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen, Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif",
"Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, sans-serif",
fontFamilyMono:
"'SFMono-Regular',Consolas,'Liberation Mono', Menlo, Courier,monospace",
fontWeight: 400,
"'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace",
fontWeightRegular: 400,
fontWeightMedium: 500,
fontWeightBold: 600,
backgroundTransition: "background 100ms ease-in-out",
accentText: colors.white,
selected: colors.accent,