Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New font and css fixes #831

Merged
merged 1 commit into from
Apr 3, 2024
Merged

New font and css fixes #831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file added web/fonts/JetBrainsMono-Bold.woff2
View file
Open in desktop
Binary file not shown.
Binary file added web/fonts/JetBrainsMono-BoldItalic.woff2
View file
Open in desktop
Binary file not shown.
Binary file added web/fonts/JetBrainsMono-Italic.woff2
View file
Open in desktop
Binary file not shown.
Binary file added web/fonts/JetBrainsMono-Regular.woff2
View file
Open in desktop
Binary file not shown.
91 changes: 0 additions & 91 deletions web/fonts/LICENSE.md
View file
Open in desktop

This file was deleted.

Binary file removed web/fonts/iAWriterMonoS-Bold.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed web/fonts/iAWriterMonoS-BoldItalic.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed web/fonts/iAWriterMonoS-Italic.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed web/fonts/iAWriterMonoS-Regular.woff2
View file
Open in desktop
Binary file not shown.
18 changes: 14 additions & 4 deletions web/styles/colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}

Expand Down
16 changes: 8 additions & 8 deletions web/styles/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions web/styles/theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down