diff --git a/prometeu-compiler/frontends/prometeu-frontend-pbs/src/main/resources/themes/pbs/semantic-highlighting.css b/prometeu-compiler/frontends/prometeu-frontend-pbs/src/main/resources/themes/pbs/semantic-highlighting.css index fa2b662c..9b06ab54 100644 --- a/prometeu-compiler/frontends/prometeu-frontend-pbs/src/main/resources/themes/pbs/semantic-highlighting.css +++ b/prometeu-compiler/frontends/prometeu-frontend-pbs/src/main/resources/themes/pbs/semantic-highlighting.css @@ -1,61 +1,61 @@ .editor-workspace-code-area-type-pbs { - -fx-highlight-fill: #1b3244; + -fx-highlight-fill: #2d4f6b; } .editor-workspace-code-area-type-pbs .text { - -fx-fill: #edf4fb; + -fx-fill: #d9e2ec; } .editor-workspace-code-area-type-pbs .lineno { - -fx-text-fill: #71859a; + -fx-text-fill: #6f8193; } .editor-workspace-code-area-type-pbs .text.editor-semantic-pbs-keyword { - -fx-fill: #8dc7ff; + -fx-fill: #569cd6; } .editor-workspace-code-area-type-pbs .text.editor-semantic-pbs-function { - -fx-fill: #f0cb79; + -fx-fill: #dcdcaa; } .editor-workspace-code-area-type-pbs .text.editor-semantic-pbs-type { - -fx-fill: #9ddba8; + -fx-fill: #4ec9b0; } .editor-workspace-code-area-type-pbs .text.editor-semantic-pbs-binding { - -fx-fill: #ffb1c8; + -fx-fill: #c586c0; } .editor-workspace-code-area-type-pbs .text.editor-semantic-pbs-string { - -fx-fill: #e2c48c; + -fx-fill: #d7ba7d; } .editor-workspace-code-area-type-pbs .text.editor-semantic-pbs-number { - -fx-fill: #c4e58a; + -fx-fill: #b5cea8; } .editor-workspace-code-area-type-pbs .text.editor-semantic-pbs-comment { - -fx-fill: #6f8192; + -fx-fill: #6a9955; } .editor-workspace-code-area-type-pbs .text.editor-semantic-pbs-literal { - -fx-fill: #c8a2ff; + -fx-fill: #4fc1ff; } .editor-workspace-code-area-type-pbs .text.editor-semantic-pbs-operator { - -fx-fill: #dbe6f1; + -fx-fill: #d4d4d4; } .editor-workspace-code-area-type-pbs .text.editor-semantic-pbs-punctuation { - -fx-fill: #adc1d4; + -fx-fill: #d4d4d4; } .editor-workspace-code-area-type-pbs .text.editor-semantic-pbs-identifier { - -fx-fill: #edf4fb; + -fx-fill: #d4d4d4; } .editor-workspace-status-chip-type-pbs { - -fx-background-color: #152432; - -fx-border-color: #4d8db9; - -fx-text-fill: #e8f5ff; + -fx-background-color: #1e2d3b; + -fx-border-color: #4aa3ff; + -fx-text-fill: #dce9f8; } diff --git a/prometeu-studio/src/main/java/p/studio/utilities/ThemeService.java b/prometeu-studio/src/main/java/p/studio/utilities/ThemeService.java index 4313e733..2d77fd9a 100644 --- a/prometeu-studio/src/main/java/p/studio/utilities/ThemeService.java +++ b/prometeu-studio/src/main/java/p/studio/utilities/ThemeService.java @@ -1,12 +1,39 @@ package p.studio.utilities; +import javafx.scene.text.Font; + import java.util.Objects; public class ThemeService { private static final String THEME_PATH = "/themes/"; private static final String DEFAULT_THEME = THEME_PATH + "default-prometeu.css"; + private static final String FONT_PATH = "/fonts/jetbrain-mono-3.2/fonts/ttf/"; + private static final String[] BUNDLED_FONTS = { + "JetBrainsMono-Regular.ttf", + "JetBrainsMono-Medium.ttf", + "JetBrainsMono-Bold.ttf", + "JetBrainsMono-Italic.ttf", + "JetBrainsMono-MediumItalic.ttf", + "JetBrainsMono-BoldItalic.ttf" + }; + private static boolean fontsLoaded; public String getDefaultTheme() { + ensureBundledFontsLoaded(); return Objects.requireNonNull(getClass().getResource(DEFAULT_THEME)).toExternalForm(); } + + private static synchronized void ensureBundledFontsLoaded() { + if (fontsLoaded) { + return; + } + for (final String fontFile : BUNDLED_FONTS) { + try (final var stream = ThemeService.class.getResourceAsStream(FONT_PATH + fontFile)) { + Font.loadFont(Objects.requireNonNull(stream, "missing bundled font: " + fontFile), 14); + } catch (final Exception exception) { + throw new IllegalStateException("unable to load bundled font: " + fontFile, exception); + } + } + fontsLoaded = true; + } } diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/editor/EditorWorkspace.java b/prometeu-studio/src/main/java/p/studio/workspaces/editor/EditorWorkspace.java index 228ad75c..a4d54c2d 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/editor/EditorWorkspace.java +++ b/prometeu-studio/src/main/java/p/studio/workspaces/editor/EditorWorkspace.java @@ -214,7 +214,7 @@ public final class EditorWorkspace extends Workspace { content.setDividerPositions(0.30); content.getStyleClass().add("editor-workspace-split"); - final var layout = new VBox(12, content, statusBar); + final var layout = new VBox(12, buildCommandBar(), content, statusBar); layout.getStyleClass().add("editor-workspace-layout"); VBox.setVgrow(content, Priority.ALWAYS); return layout; @@ -231,7 +231,7 @@ public final class EditorWorkspace extends Workspace { editorSurface.getStyleClass().add("editor-workspace-editor-surface"); codeScroller.getStyleClass().add("editor-workspace-code-scroller"); VBox.setVgrow(codeScroller, Priority.ALWAYS); - final var centerColumn = new VBox(12, buildCommandBar(), tabStrip, editorSurface); + final var centerColumn = new VBox(12, tabStrip, editorSurface); centerColumn.getStyleClass().add("editor-workspace-center-column"); VBox.setVgrow(editorSurface, Priority.ALWAYS); return centerColumn; diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/AUTHORS.txt b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/AUTHORS.txt new file mode 100755 index 00000000..88149416 --- /dev/null +++ b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/AUTHORS.txt @@ -0,0 +1,10 @@ +# This is the official list of project authors for copyright purposes. +# This file is distinct from the CONTRIBUTORS.txt file. +# See the latter for an explanation. +# +# Names should be added to this file as: +# Name or Organization + +JetBrains <> +Philipp Nurullin +Konstantin Bulenkov diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/OFL.txt b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/OFL.txt new file mode 100644 index 00000000..8bee4148 --- /dev/null +++ b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/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/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Bold.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Bold.ttf new file mode 100644 index 00000000..8c93043d Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Bold.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-BoldItalic.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-BoldItalic.ttf new file mode 100644 index 00000000..1ddf216d Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-BoldItalic.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraBold.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraBold.ttf new file mode 100644 index 00000000..435d7a72 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraBold.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraBoldItalic.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraBoldItalic.ttf new file mode 100644 index 00000000..79e616eb Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraBoldItalic.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraLight.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraLight.ttf new file mode 100644 index 00000000..c131cbf2 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraLight.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraLightItalic.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraLightItalic.ttf new file mode 100644 index 00000000..a768985b Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraLightItalic.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Italic.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Italic.ttf new file mode 100644 index 00000000..ccc9d6a5 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Italic.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Light.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Light.ttf new file mode 100644 index 00000000..15f15a2a Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Light.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-LightItalic.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-LightItalic.ttf new file mode 100644 index 00000000..506208f6 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-LightItalic.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Medium.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Medium.ttf new file mode 100644 index 00000000..97671156 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Medium.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-MediumItalic.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-MediumItalic.ttf new file mode 100644 index 00000000..415a9e34 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-MediumItalic.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Regular.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Regular.ttf new file mode 100644 index 00000000..dff66cc5 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Regular.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-SemiBold.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-SemiBold.ttf new file mode 100644 index 00000000..a70e69bd Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-SemiBold.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-SemiBoldItalic.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-SemiBoldItalic.ttf new file mode 100644 index 00000000..968602e8 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-SemiBoldItalic.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Thin.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Thin.ttf new file mode 100644 index 00000000..7dbe2ac6 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Thin.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ThinItalic.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ThinItalic.ttf new file mode 100644 index 00000000..c6ad6c21 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ThinItalic.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Bold.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Bold.ttf new file mode 100644 index 00000000..f78f84fb Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Bold.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-BoldItalic.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-BoldItalic.ttf new file mode 100644 index 00000000..9fb8c832 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-BoldItalic.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraBold.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraBold.ttf new file mode 100644 index 00000000..fe5be6a1 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraBold.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraBoldItalic.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraBoldItalic.ttf new file mode 100644 index 00000000..59fc980b Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraBoldItalic.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraLight.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraLight.ttf new file mode 100644 index 00000000..6da7b759 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraLight.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraLightItalic.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraLightItalic.ttf new file mode 100644 index 00000000..5733efc5 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraLightItalic.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Italic.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Italic.ttf new file mode 100644 index 00000000..4e9c3802 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Italic.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Light.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Light.ttf new file mode 100644 index 00000000..0b79b0c8 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Light.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-LightItalic.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-LightItalic.ttf new file mode 100644 index 00000000..b5e08426 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-LightItalic.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Medium.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Medium.ttf new file mode 100644 index 00000000..14543721 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Medium.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-MediumItalic.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-MediumItalic.ttf new file mode 100644 index 00000000..8d63c6cc Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-MediumItalic.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Regular.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Regular.ttf new file mode 100644 index 00000000..70d2ec9e Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Regular.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-SemiBold.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-SemiBold.ttf new file mode 100644 index 00000000..ce60a88c Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-SemiBold.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-SemiBoldItalic.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-SemiBoldItalic.ttf new file mode 100644 index 00000000..3b3f8f69 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-SemiBoldItalic.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Thin.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Thin.ttf new file mode 100644 index 00000000..bea837e7 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Thin.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ThinItalic.ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ThinItalic.ttf new file mode 100644 index 00000000..f0bfed7b Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ThinItalic.ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/variable/JetBrainsMono-Italic[wght].ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/variable/JetBrainsMono-Italic[wght].ttf new file mode 100644 index 00000000..54148355 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/variable/JetBrainsMono-Italic[wght].ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/variable/JetBrainsMono[wght].ttf b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/variable/JetBrainsMono[wght].ttf new file mode 100644 index 00000000..b60e77f5 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/variable/JetBrainsMono[wght].ttf differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Bold.woff2 b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Bold.woff2 new file mode 100644 index 00000000..4917f434 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Bold.woff2 differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-BoldItalic.woff2 b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-BoldItalic.woff2 new file mode 100644 index 00000000..536d3f71 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-BoldItalic.woff2 differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraBold.woff2 b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraBold.woff2 new file mode 100644 index 00000000..8f88c546 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraBold.woff2 differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraBoldItalic.woff2 b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraBoldItalic.woff2 new file mode 100644 index 00000000..d1478bac Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraBoldItalic.woff2 differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraLight.woff2 b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraLight.woff2 new file mode 100644 index 00000000..b97239f3 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraLight.woff2 differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraLightItalic.woff2 b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraLightItalic.woff2 new file mode 100644 index 00000000..be01aaca Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraLightItalic.woff2 differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Italic.woff2 b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Italic.woff2 new file mode 100644 index 00000000..d60c270e Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Italic.woff2 differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Light.woff2 b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Light.woff2 new file mode 100644 index 00000000..65384987 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Light.woff2 differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-LightItalic.woff2 b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-LightItalic.woff2 new file mode 100644 index 00000000..66ca3d2b Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-LightItalic.woff2 differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Medium.woff2 b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Medium.woff2 new file mode 100644 index 00000000..669d04cd Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Medium.woff2 differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-MediumItalic.woff2 b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-MediumItalic.woff2 new file mode 100644 index 00000000..80cfd15e Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-MediumItalic.woff2 differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Regular.woff2 b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Regular.woff2 new file mode 100644 index 00000000..40da4276 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Regular.woff2 differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-SemiBold.woff2 b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-SemiBold.woff2 new file mode 100644 index 00000000..5ead7b0d Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-SemiBold.woff2 differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-SemiBoldItalic.woff2 b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-SemiBoldItalic.woff2 new file mode 100644 index 00000000..c5dd294b Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-SemiBoldItalic.woff2 differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Thin.woff2 b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Thin.woff2 new file mode 100644 index 00000000..17270e45 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Thin.woff2 differ diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ThinItalic.woff2 b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ThinItalic.woff2 new file mode 100644 index 00000000..a6432151 Binary files /dev/null and b/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ThinItalic.woff2 differ diff --git a/prometeu-studio/src/main/resources/themes/default-prometeu.css b/prometeu-studio/src/main/resources/themes/default-prometeu.css index adb389eb..4ef311b8 100644 --- a/prometeu-studio/src/main/resources/themes/default-prometeu.css +++ b/prometeu-studio/src/main/resources/themes/default-prometeu.css @@ -581,8 +581,7 @@ .editor-workspace-code-area { -fx-background-color: #171c22; - -fx-font-family: "JetBrains Mono", "Iosevka", "Cascadia Mono", "IBM Plex Mono", monospace; - -fx-font-size: 14px; + -fx-font-size: 15px; -fx-highlight-fill: #26405c; -fx-highlight-text-fill: #eef4fb; } @@ -688,10 +687,14 @@ -fx-background-color: #12161c; -fx-text-fill: #6f7a86; -fx-padding: 0 12 0 12; + -fx-font-family: "JetBrains Mono Medium", "JetBrains Mono", "Iosevka", "Cascadia Mono", "IBM Plex Mono", monospace; + -fx-font-size: 14px; } .editor-workspace-code-area .text { -fx-fill: #f2f6fb; + -fx-font-family: "JetBrains Mono Medium", "JetBrains Mono", "Iosevka", "Cascadia Mono", "IBM Plex Mono", monospace; + -fx-font-size: 14px; } .editor-workspace-code-area .caret {