Skip to content

Commit

Permalink
chore: revert font to roboto condensed (#394)
Browse files Browse the repository at this point in the history
Co-authored-by: Siena Cizdziel <[email protected]>
  • Loading branch information
sienacizdziel and Siena Cizdziel authored Aug 12, 2022
1 parent fecbc71 commit 025beb1
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 10 deletions.
2 changes: 1 addition & 1 deletion client/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
label,
text,
div {
font-family: "Inter", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
font-family: "Roboto Condensed", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
font-size: 14px;
letter-spacing: -0.006em;
}
Expand Down
2 changes: 1 addition & 1 deletion client/index_template.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
label,
text,
div {
font-family: "Inter", "Helvetica Neue", "Helvetica", "Arial",
font-family: "Roboto Condensed", "Helvetica Neue", "Helvetica", "Arial",
sans-serif;
font-size: 14px;
letter-spacing: -0.006em;
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/theme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const corners = {
};

const typography = {
fontFamily: "Inter",
fontFamily: "Roboto Condensed",
styles: {
body: {
button: {
Expand Down
6 changes: 3 additions & 3 deletions client/src/fonts/ATTRIBUTION.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Third-party fonts used in cellxgene

| Font Family | License at time of download | URL |
| ----------- | --------------------------- | --------------------------------------- |
| Inter | SIL OPEN FONT LICENSE v1.1 | https://fonts.google.com/specimen/Inter |
| Font Family | License at time of download | URL |
| ---------------- | --------------------------- | -------------------------------------------------- |
| Roboto Condensed | APACHE LICENSE v2.0 | https://fonts.google.com/specimen/Roboto+Condensed |
Binary file removed client/src/fonts/Inter-VariableFont_slnt,wght.ttf
Binary file not shown.
Binary file added client/src/fonts/RobotoCondensed-Bold.ttf
Binary file not shown.
Binary file added client/src/fonts/RobotoCondensed-Italic.ttf
Binary file not shown.
Binary file added client/src/fonts/RobotoCondensed-Regular.ttf
Binary file not shown.
22 changes: 18 additions & 4 deletions client/src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,22 @@ namespace mangling on these definitions. See webpack config for specifics.
@import "~@blueprintjs/popover2/lib/css/blueprint-popover2.css";

@font-face {
font-family: "Inter";
src: url("./fonts/Inter-VariableFont_slnt,wght.ttf")
format("truetype-variations");
font-weight: 1 999;
font-family: "Roboto Condensed";
font-style: italic;
src: url("./fonts/RobotoCondensed-Italic.ttf") format("truetype");
font-weight: 400;
}

@font-face {
font-family: "Roboto Condensed";
font-style: normal;
src: url("./fonts/RobotoCondensed-Regular.ttf") format("truetype");
font-weight: 400;
}

@font-face {
font-family: "Roboto Condensed";
font-style: normal;
src: url("./fonts/RobotoCondensed-Bold.ttf") format("truetype");
font-weight: 700;
}

0 comments on commit 025beb1

Please sign in to comment.