diff --git a/web/fonts/JetBrainsMono-Bold.woff2 b/web/fonts/JetBrainsMono-Bold.woff2 new file mode 100644 index 00000000..4917f434 Binary files /dev/null and b/web/fonts/JetBrainsMono-Bold.woff2 differ diff --git a/web/fonts/JetBrainsMono-BoldItalic.woff2 b/web/fonts/JetBrainsMono-BoldItalic.woff2 new file mode 100644 index 00000000..536d3f71 Binary files /dev/null and b/web/fonts/JetBrainsMono-BoldItalic.woff2 differ diff --git a/web/fonts/JetBrainsMono-Italic.woff2 b/web/fonts/JetBrainsMono-Italic.woff2 new file mode 100644 index 00000000..d60c270e Binary files /dev/null and b/web/fonts/JetBrainsMono-Italic.woff2 differ diff --git a/web/fonts/JetBrainsMono-Regular.woff2 b/web/fonts/JetBrainsMono-Regular.woff2 new file mode 100644 index 00000000..40da4276 Binary files /dev/null and b/web/fonts/JetBrainsMono-Regular.woff2 differ diff --git a/web/fonts/LICENSE.md b/web/fonts/LICENSE.md deleted file mode 100644 index b7e0b6da..00000000 --- a/web/fonts/LICENSE.md +++ /dev/null @@ -1,91 +0,0 @@ -# iA Writer Typeface - -Copyright © 2018 Information Architects Inc. with Reserved Font Name "iA Writer" - -# Based on IBM Plex Typeface - -Copyright © 2017 IBM Corp. with Reserved Font Name "Plex" - -# License - -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: -http://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/web/fonts/iAWriterMonoS-Bold.woff2 b/web/fonts/iAWriterMonoS-Bold.woff2 deleted file mode 100644 index 1271a12a..00000000 Binary files a/web/fonts/iAWriterMonoS-Bold.woff2 and /dev/null differ diff --git a/web/fonts/iAWriterMonoS-BoldItalic.woff2 b/web/fonts/iAWriterMonoS-BoldItalic.woff2 deleted file mode 100644 index 34ff8013..00000000 Binary files a/web/fonts/iAWriterMonoS-BoldItalic.woff2 and /dev/null differ diff --git a/web/fonts/iAWriterMonoS-Italic.woff2 b/web/fonts/iAWriterMonoS-Italic.woff2 deleted file mode 100644 index c76d4ce4..00000000 Binary files a/web/fonts/iAWriterMonoS-Italic.woff2 and /dev/null differ diff --git a/web/fonts/iAWriterMonoS-Regular.woff2 b/web/fonts/iAWriterMonoS-Regular.woff2 deleted file mode 100644 index 5c360515..00000000 Binary files a/web/fonts/iAWriterMonoS-Regular.woff2 and /dev/null differ diff --git a/web/styles/colors.scss b/web/styles/colors.scss index 0fab49d6..d8712743 100644 --- a/web/styles/colors.scss +++ b/web/styles/colors.scss @@ -144,12 +144,22 @@ } .cm-editor .cm-tooltip-autocomplete { - .cm-completionDetail { - color: var(--editor-completion-detail-color); + background-color: var(--root-background-color); + + li { + + .cm-completionLabel, + .cm-completionDetail { + color: var(--editor-completion-detail-color); + } } - li[aria-selected] .cm-completionDetail { - color: var(--editor-completion-detail-selected-color); + li[aria-selected] { + + .cm-completionLabel, + .cm-completionDetail { + color: var(--editor-completion-detail-selected-color); + } } } diff --git a/web/styles/main.scss b/web/styles/main.scss index ba19f5e6..791b347f 100644 --- a/web/styles/main.scss +++ b/web/styles/main.scss @@ -4,29 +4,29 @@ @use "colors"; @font-face { - font-family: "iA-Mono"; - src: url("/.client/iAWriterMonoS-Regular.woff2"); + font-family: "JetBrains Mono"; + src: url("/.client/JetBrainsMono-Regular.woff2"); font-weight: normal; font-style: normal; } @font-face { - font-family: "iA-Mono"; - src: url("/.client/iAWriterMonoS-Bold.woff2"); + font-family: "JetBrains Mono"; + src: url("/.client/JetBrainsMono-Bold.woff2"); font-weight: bold; font-style: normal; } @font-face { - font-family: "iA-Mono"; - src: url("/.client/iAWriterMonoS-Italic.woff2"); + font-family: "JetBrains Mono"; + src: url("/.client/JetBrainsMono-Italic.woff2"); font-weight: normal; font-style: italic; } @font-face { - font-family: "iA-Mono"; - src: url("/.client/iAWriterMonoS-BoldItalic.woff2"); + font-family: "JetBrains Mono"; + src: url("/.client/JetBrainsMono-BoldItalic.woff2"); font-weight: bold; font-style: italic; } diff --git a/web/styles/theme.scss b/web/styles/theme.scss index b69386c3..6b67b913 100644 --- a/web/styles/theme.scss +++ b/web/styles/theme.scss @@ -53,7 +53,7 @@ html { --editor-panels-bottom-color: inherit; --editor-panels-bottom-background-color: #e1e1e1; --editor-panels-bottom-border-color: #cacaca; - --editor-completion-detail-color: #555; + --editor-completion-detail-color: #d2d2d2; --editor-completion-detail-selected-color: #d2d2d2; --editor-list-bullet-color: rgb(150, 150, 150); --editor-heading-color: #333; @@ -111,7 +111,7 @@ html { --ui-font: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; - --editor-font: "iA-Mono", "Menlo"; + --editor-font: "JetBrains Mono", "Menlo"; --editor-width: 800px; }