Skip to content

Commit

Permalink
Merge branch 'develop' into menu-radix-pubInfo
Browse files Browse the repository at this point in the history
  • Loading branch information
panaC committed Dec 4, 2023
2 parents c41ede1 + cb4eee7 commit f11ead9
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 0 deletions.
Binary file added src/renderer/assets/fonts/nunitoBold.ttf
Binary file not shown.
8 changes: 8 additions & 0 deletions src/renderer/library/components/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import { ToastType } from "readium-desktop/common/models/toast";

import { acceptedExtensionArray } from "readium-desktop/common/extension";
import Nunito from "readium-desktop/renderer/assets/fonts/nunito.ttf";
import NunitoBold from "readium-desktop/renderer/assets/fonts/nunitoBold.ttf";

import * as globalScssStyle from "readium-desktop/renderer/assets/styles/global.scss";
globalScssStyle.__LOAD_FILE_SELECTOR_NOT_USED_JUST_TO_TRIGGER_WEBPACK_SCSS_FILE__;
Expand Down Expand Up @@ -107,6 +108,13 @@ export default class App extends React.Component<{}, undefined> {
src: local("Nunito"),
url("${Nunito}") format("truetype");
}
@font-face {
font-family: "Nunito";
font-style: bold;
font-weight: 700;
src: local("NunitoBold"),
url("${NunitoBold}") format("truetype");
}
`;
const el = document.createElement("style");
Expand Down
8 changes: 8 additions & 0 deletions src/renderer/reader/components/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import ToastManager from "readium-desktop/renderer/common/components/toast/Toast
import { TranslatorContext } from "readium-desktop/renderer/common/translator.context";
import { diReaderGet } from "readium-desktop/renderer/reader/di";
import Nunito from "readium-desktop/renderer/assets/fonts/nunito.ttf";
import NunitoBold from "readium-desktop/renderer/assets/fonts/nunitoBold.ttf";

import * as globalScssStyle from "readium-desktop/renderer/assets/styles/global.scss";
globalScssStyle.__LOAD_FILE_SELECTOR_NOT_USED_JUST_TO_TRIGGER_WEBPACK_SCSS_FILE__;
Expand Down Expand Up @@ -109,6 +110,13 @@ url("${rcssPath}/fonts/iAWriterDuospace-Regular.ttf") format("truetype");
src: local("Nunito"),
url("${Nunito}") format("truetype");
}
@font-face {
font-family: "Nunito";
font-style: bold;
font-weight: 700;
src: local("NunitoBold"),
url("${NunitoBold}") format("truetype");
}
`;
const el = document.createElement("style");
Expand Down

0 comments on commit f11ead9

Please sign in to comment.