diff --git a/dist/OFL.txt b/dist/OFL.txt new file mode 100644 index 000000000..8bee4148c --- /dev/null +++ b/dist/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2020 The JetBrains Mono Project Authors (https://github.com/JetBrains/JetBrainsMono) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/src/Go/boardState/goStyles.ts b/src/Go/boardState/goStyles.ts index 9b30c2006..6c6eb7b1b 100644 --- a/src/Go/boardState/goStyles.ts +++ b/src/Go/boardState/goStyles.ts @@ -356,7 +356,7 @@ export const pointStyle = makeStyles((theme: Theme) => }, coordinates: { color: theme.colors.white, - fontFamily: `"Lucida Console", "Lucida Sans Unicode", "Fira Mono", Consolas, "Courier New", Courier, monospace, "Times New Roman"`, + fontFamily: `JetBrainsMono, "Courier New", monospace`, fontSize: "calc(min(1.3vw, 12px))", display: "none", position: "relative", diff --git a/src/Settings/Settings.ts b/src/Settings/Settings.ts index b3dc29f25..95e294bbf 100644 --- a/src/Settings/Settings.ts +++ b/src/Settings/Settings.ts @@ -95,7 +95,7 @@ export const Settings = { /** Whether to auto detect indentation settings per-file based on contents */ MonacoDetectIndentation: false, /** Font Family for script editor. */ - MonacoFontFamily: "Lucida Console", + MonacoFontFamily: "JetBrainsMono", /** Text size for script editor. */ MonacoFontSize: 20, /** Whether to use font ligatures */ diff --git a/src/Themes/Styles.ts b/src/Themes/Styles.ts index a6c24e26d..e610639ad 100644 --- a/src/Themes/Styles.ts +++ b/src/Themes/Styles.ts @@ -2,6 +2,5 @@ import { IStyleSettings } from "@nsdefs"; export const defaultStyles: IStyleSettings = { lineHeight: 1.5, - fontFamily: - "Lucida Console, Lucida Sans Unicode, Fira Mono, Consolas, Courier New, Courier, monospace, Times New Roman", + fontFamily: `JetBrainsMono, "Courier New", monospace`, }; diff --git a/src/css/font.css b/src/css/font.css new file mode 100644 index 000000000..488a1be60 --- /dev/null +++ b/src/css/font.css @@ -0,0 +1,5 @@ +@font-face { + font-family: "JetBrainsMono"; + font-display: swap; + src: url("../fonts/JetBrainsMono.woff2") format("woff2"); +} diff --git a/src/fonts/JetBrainsMono.woff2 b/src/fonts/JetBrainsMono.woff2 new file mode 100644 index 000000000..40da42765 Binary files /dev/null and b/src/fonts/JetBrainsMono.woff2 differ diff --git a/src/index.tsx b/src/index.tsx index 52c586f95..a5d2490ba 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -7,6 +7,8 @@ import { initElectron } from "./Electron"; import { newRemoteFileApiConnection } from "./RemoteFileAPI/RemoteFileAPI"; +import "./css/font.css"; + initElectron(); globalThis.React = React; globalThis.ReactDOM = ReactDOM; diff --git a/webpack.config.js b/webpack.config.js index 4c8e2ab08..683e6a7d4 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -148,7 +148,7 @@ module.exports = (env, argv) => { }, }, }, - { test: /\.(ttf|png|jpe?g|gif|jp2|webp)$/, type: "asset/resource" }, + { test: /\.(ttf|woff2|png|jpe?g|gif|jp2|webp)$/, type: "asset/resource" }, { test: /\.s?css$/, use: ["style-loader", "css-loader"],