Merge pull request #661 from TriliumNext/feature/trilium_next_theme

Introduce a theme for TriliumNext

src/public/app/layouts/desktop_layout.js

@@ -99,7 +99,8 @@ export default class DesktopLayout {
         return new RootContainer(launcherPaneIsHorizontal)
             .setParent(appContext)
             .class((launcherPaneIsHorizontal ? "horizontal" : "vertical") + "-layout")
-            .optChild(launcherPaneIsHorizontal, new FlexContainer('row')               
+            .optChild(launcherPaneIsHorizontal, new FlexContainer('row')
+                .class("tab-row-container")
                 .child(new TabRowWidget().class("full-width"))
                 .child(new TitleBarButtonsWidget())
                 .css('height', '40px')

src/public/app/widgets/type_widgets/options/appearance/theme.js

@@ -66,8 +66,9 @@ export default class ThemeOptions extends OptionsWidget {
 
     async optionsLoaded(options) {
         const themes = [
+            { val: 'next', title: t("theme.triliumnext") },
             { val: 'light', title: t('theme.light_theme') },
-            { val: 'dark', title: t('theme.dark_theme') }
+            { val: 'dark', title: t('theme.dark_theme') }            
         ].concat(await server.get('options/user-themes'));
 
         this.$themeSelect.empty();

src/public/fonts/Inter/OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2020 The Inter Project Authors (https://github.com/rsms/inter)
+
+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://openfontlicense.org
+
+
+-----------------------------------------------------------
+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.

src/public/fonts/Inter/README.txt

@@ -0,0 +1,118 @@
+Inter Variable Font
+===================
+
+This download contains Inter as both variable fonts and static fonts.
+
+Inter is a variable font with these axes:
+  opsz
+  wght
+
+This means all the styles are contained in these files:
+  Inter/Inter-VariableFont_opsz,wght.ttf
+  Inter/Inter-Italic-VariableFont_opsz,wght.ttf
+
+If your app fully supports variable fonts, you can now pick intermediate styles
+that aren’t available as static fonts. Not all apps support variable fonts, and
+in those cases you can use the static font files for Inter:
+  Inter/static/Inter_18pt-Thin.ttf
+  Inter/static/Inter_18pt-ExtraLight.ttf
+  Inter/static/Inter_18pt-Light.ttf
+  Inter/static/Inter_18pt-Regular.ttf
+  Inter/static/Inter_18pt-Medium.ttf
+  Inter/static/Inter_18pt-SemiBold.ttf
+  Inter/static/Inter_18pt-Bold.ttf
+  Inter/static/Inter_18pt-ExtraBold.ttf
+  Inter/static/Inter_18pt-Black.ttf
+  Inter/static/Inter_24pt-Thin.ttf
+  Inter/static/Inter_24pt-ExtraLight.ttf
+  Inter/static/Inter_24pt-Light.ttf
+  Inter/static/Inter_24pt-Regular.ttf
+  Inter/static/Inter_24pt-Medium.ttf
+  Inter/static/Inter_24pt-SemiBold.ttf
+  Inter/static/Inter_24pt-Bold.ttf
+  Inter/static/Inter_24pt-ExtraBold.ttf
+  Inter/static/Inter_24pt-Black.ttf
+  Inter/static/Inter_28pt-Thin.ttf
+  Inter/static/Inter_28pt-ExtraLight.ttf
+  Inter/static/Inter_28pt-Light.ttf
+  Inter/static/Inter_28pt-Regular.ttf
+  Inter/static/Inter_28pt-Medium.ttf
+  Inter/static/Inter_28pt-SemiBold.ttf
+  Inter/static/Inter_28pt-Bold.ttf
+  Inter/static/Inter_28pt-ExtraBold.ttf
+  Inter/static/Inter_28pt-Black.ttf
+  Inter/static/Inter_18pt-ThinItalic.ttf
+  Inter/static/Inter_18pt-ExtraLightItalic.ttf
+  Inter/static/Inter_18pt-LightItalic.ttf
+  Inter/static/Inter_18pt-Italic.ttf
+  Inter/static/Inter_18pt-MediumItalic.ttf
+  Inter/static/Inter_18pt-SemiBoldItalic.ttf
+  Inter/static/Inter_18pt-BoldItalic.ttf
+  Inter/static/Inter_18pt-ExtraBoldItalic.ttf
+  Inter/static/Inter_18pt-BlackItalic.ttf
+  Inter/static/Inter_24pt-ThinItalic.ttf
+  Inter/static/Inter_24pt-ExtraLightItalic.ttf
+  Inter/static/Inter_24pt-LightItalic.ttf
+  Inter/static/Inter_24pt-Italic.ttf
+  Inter/static/Inter_24pt-MediumItalic.ttf
+  Inter/static/Inter_24pt-SemiBoldItalic.ttf
+  Inter/static/Inter_24pt-BoldItalic.ttf
+  Inter/static/Inter_24pt-ExtraBoldItalic.ttf
+  Inter/static/Inter_24pt-BlackItalic.ttf
+  Inter/static/Inter_28pt-ThinItalic.ttf
+  Inter/static/Inter_28pt-ExtraLightItalic.ttf
+  Inter/static/Inter_28pt-LightItalic.ttf
+  Inter/static/Inter_28pt-Italic.ttf
+  Inter/static/Inter_28pt-MediumItalic.ttf
+  Inter/static/Inter_28pt-SemiBoldItalic.ttf
+  Inter/static/Inter_28pt-BoldItalic.ttf
+  Inter/static/Inter_28pt-ExtraBoldItalic.ttf
+  Inter/static/Inter_28pt-BlackItalic.ttf
+
+Get started
+-----------
+
+1. Install the font files you want to use
+
+2. Use your app's font picker to view the font family and all the
+available styles
+
+Learn more about variable fonts
+-------------------------------
+
+  https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
+  https://variablefonts.typenetwork.com
+  https://medium.com/variable-fonts
+
+In desktop apps
+
+  https://theblog.adobe.com/can-variable-fonts-illustrator-cc
+  https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts
+
+Online
+
+  https://developers.google.com/fonts/docs/getting_started
+  https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
+  https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts
+
+Installing fonts
+
+  MacOS: https://support.apple.com/en-us/HT201749
+  Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
+  Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows
+
+Android Apps
+
+  https://developers.google.com/fonts/docs/android
+  https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts
+
+License
+-------
+Please read the full license text (OFL.txt) to understand the permissions,
+restrictions and requirements for usage, redistribution, and modification.
+
+You can use them in your products & projects – print or digital,
+commercial or otherwise.
+
+This isn't legal advice, please consider consulting a lawyer and see the full
+license for all details.

src/public/fonts/Noto_Sans/OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2022 The Noto Project Authors (https://github.com/notofonts/latin-greek-cyrillic)
+
+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://openfontlicense.org
+
+
+-----------------------------------------------------------
+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.

src/public/fonts/Noto_Sans/README.txt

@@ -0,0 +1,136 @@
+Noto Sans Variable Font
+=======================
+
+This download contains Noto Sans as both variable fonts and static fonts.
+
+Noto Sans is a variable font with these axes:
+  wdth
+  wght
+
+This means all the styles are contained in these files:
+  Noto_Sans/NotoSans-VariableFont_wdth,wght.ttf
+  Noto_Sans/NotoSans-Italic-VariableFont_wdth,wght.ttf
+
+If your app fully supports variable fonts, you can now pick intermediate styles
+that aren’t available as static fonts. Not all apps support variable fonts, and
+in those cases you can use the static font files for Noto Sans:
+  Noto_Sans/static/NotoSans_ExtraCondensed-Thin.ttf
+  Noto_Sans/static/NotoSans_ExtraCondensed-ExtraLight.ttf
+  Noto_Sans/static/NotoSans_ExtraCondensed-Light.ttf
+  Noto_Sans/static/NotoSans_ExtraCondensed-Regular.ttf
+  Noto_Sans/static/NotoSans_ExtraCondensed-Medium.ttf
+  Noto_Sans/static/NotoSans_ExtraCondensed-SemiBold.ttf
+  Noto_Sans/static/NotoSans_ExtraCondensed-Bold.ttf
+  Noto_Sans/static/NotoSans_ExtraCondensed-ExtraBold.ttf
+  Noto_Sans/static/NotoSans_ExtraCondensed-Black.ttf
+  Noto_Sans/static/NotoSans_Condensed-Thin.ttf
+  Noto_Sans/static/NotoSans_Condensed-ExtraLight.ttf
+  Noto_Sans/static/NotoSans_Condensed-Light.ttf
+  Noto_Sans/static/NotoSans_Condensed-Regular.ttf
+  Noto_Sans/static/NotoSans_Condensed-Medium.ttf
+  Noto_Sans/static/NotoSans_Condensed-SemiBold.ttf
+  Noto_Sans/static/NotoSans_Condensed-Bold.ttf
+  Noto_Sans/static/NotoSans_Condensed-ExtraBold.ttf
+  Noto_Sans/static/NotoSans_Condensed-Black.ttf
+  Noto_Sans/static/NotoSans_SemiCondensed-Thin.ttf
+  Noto_Sans/static/NotoSans_SemiCondensed-ExtraLight.ttf
+  Noto_Sans/static/NotoSans_SemiCondensed-Light.ttf
+  Noto_Sans/static/NotoSans_SemiCondensed-Regular.ttf
+  Noto_Sans/static/NotoSans_SemiCondensed-Medium.ttf
+  Noto_Sans/static/NotoSans_SemiCondensed-SemiBold.ttf
+  Noto_Sans/static/NotoSans_SemiCondensed-Bold.ttf
+  Noto_Sans/static/NotoSans_SemiCondensed-ExtraBold.ttf
+  Noto_Sans/static/NotoSans_SemiCondensed-Black.ttf
+  Noto_Sans/static/NotoSans-Thin.ttf
+  Noto_Sans/static/NotoSans-ExtraLight.ttf
+  Noto_Sans/static/NotoSans-Light.ttf
+  Noto_Sans/static/NotoSans-Regular.ttf
+  Noto_Sans/static/NotoSans-Medium.ttf
+  Noto_Sans/static/NotoSans-SemiBold.ttf
+  Noto_Sans/static/NotoSans-Bold.ttf
+  Noto_Sans/static/NotoSans-ExtraBold.ttf
+  Noto_Sans/static/NotoSans-Black.ttf
+  Noto_Sans/static/NotoSans_ExtraCondensed-ThinItalic.ttf
+  Noto_Sans/static/NotoSans_ExtraCondensed-ExtraLightItalic.ttf
+  Noto_Sans/static/NotoSans_ExtraCondensed-LightItalic.ttf
+  Noto_Sans/static/NotoSans_ExtraCondensed-Italic.ttf
+  Noto_Sans/static/NotoSans_ExtraCondensed-MediumItalic.ttf
+  Noto_Sans/static/NotoSans_ExtraCondensed-SemiBoldItalic.ttf
+  Noto_Sans/static/NotoSans_ExtraCondensed-BoldItalic.ttf
+  Noto_Sans/static/NotoSans_ExtraCondensed-ExtraBoldItalic.ttf
+  Noto_Sans/static/NotoSans_ExtraCondensed-BlackItalic.ttf
+  Noto_Sans/static/NotoSans_Condensed-ThinItalic.ttf
+  Noto_Sans/static/NotoSans_Condensed-ExtraLightItalic.ttf
+  Noto_Sans/static/NotoSans_Condensed-LightItalic.ttf
+  Noto_Sans/static/NotoSans_Condensed-Italic.ttf
+  Noto_Sans/static/NotoSans_Condensed-MediumItalic.ttf
+  Noto_Sans/static/NotoSans_Condensed-SemiBoldItalic.ttf
+  Noto_Sans/static/NotoSans_Condensed-BoldItalic.ttf
+  Noto_Sans/static/NotoSans_Condensed-ExtraBoldItalic.ttf
+  Noto_Sans/static/NotoSans_Condensed-BlackItalic.ttf
+  Noto_Sans/static/NotoSans_SemiCondensed-ThinItalic.ttf
+  Noto_Sans/static/NotoSans_SemiCondensed-ExtraLightItalic.ttf
+  Noto_Sans/static/NotoSans_SemiCondensed-LightItalic.ttf
+  Noto_Sans/static/NotoSans_SemiCondensed-Italic.ttf
+  Noto_Sans/static/NotoSans_SemiCondensed-MediumItalic.ttf
+  Noto_Sans/static/NotoSans_SemiCondensed-SemiBoldItalic.ttf
+  Noto_Sans/static/NotoSans_SemiCondensed-BoldItalic.ttf
+  Noto_Sans/static/NotoSans_SemiCondensed-ExtraBoldItalic.ttf
+  Noto_Sans/static/NotoSans_SemiCondensed-BlackItalic.ttf
+  Noto_Sans/static/NotoSans-ThinItalic.ttf
+  Noto_Sans/static/NotoSans-ExtraLightItalic.ttf
+  Noto_Sans/static/NotoSans-LightItalic.ttf
+  Noto_Sans/static/NotoSans-Italic.ttf
+  Noto_Sans/static/NotoSans-MediumItalic.ttf
+  Noto_Sans/static/NotoSans-SemiBoldItalic.ttf
+  Noto_Sans/static/NotoSans-BoldItalic.ttf
+  Noto_Sans/static/NotoSans-ExtraBoldItalic.ttf
+  Noto_Sans/static/NotoSans-BlackItalic.ttf
+
+Get started
+-----------
+
+1. Install the font files you want to use
+
+2. Use your app's font picker to view the font family and all the
+available styles
+
+Learn more about variable fonts
+-------------------------------
+
+  https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
+  https://variablefonts.typenetwork.com
+  https://medium.com/variable-fonts
+
+In desktop apps
+
+  https://theblog.adobe.com/can-variable-fonts-illustrator-cc
+  https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts
+
+Online
+
+  https://developers.google.com/fonts/docs/getting_started
+  https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
+  https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts
+
+Installing fonts
+
+  MacOS: https://support.apple.com/en-us/HT201749
+  Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
+  Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows
+
+Android Apps
+
+  https://developers.google.com/fonts/docs/android
+  https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts
+
+License
+-------
+Please read the full license text (OFL.txt) to understand the permissions,
+restrictions and requirements for usage, redistribution, and modification.
+
+You can use them in your products & projects – print or digital,
+commercial or otherwise.
+
+This isn't legal advice, please consider consulting a lawyer and see the full
+license for all details.