diff --git a/Dockerfile b/Dockerfile index 840a1d2..cb807bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,6 +28,8 @@ COPY assets/favicon-16x16.png /app/code/librechat/client/dist/assets/favicon-16x COPY assets/apple-touch-icon-180x180.png /app/code/librechat/client/dist/assets/apple-touch-icon-180x180.png COPY assets/icon-192x192.png /app/code/librechat/client/dist/assets/icon-192x192.png COPY assets/maskable-icon.png /app/code/librechat/client/dist/assets/maskable-icon.png +# Figtree font (design kit, SIL OFL) — self-hosted, matches homepage/dashboard +COPY assets/fonts/ /app/code/librechat/client/dist/assets/fonts/ # Custom stylesheet and optional helper JS COPY assets/custom.css /app/code/librechat/client/dist/assets/custom.css diff --git a/assets/custom.css b/assets/custom.css index 6547adf..2e2990d 100644 --- a/assets/custom.css +++ b/assets/custom.css @@ -41,6 +41,36 @@ html.dark { --border-light: 74 82 64; } +/* ---- Figtree font (design kit, SIL OFL) — matches homepage & dashboard ---- */ +@font-face { + font-family: 'Figtree'; + src: url('/assets/fonts/figtree-400.woff2') format('woff2'); + font-weight: 400; + font-style: normal; + font-display: swap; +} +@font-face { + font-family: 'Figtree'; + src: url('/assets/fonts/figtree-500.woff2') format('woff2'); + font-weight: 500; + font-style: normal; + font-display: swap; +} +@font-face { + font-family: 'Figtree'; + src: url('/assets/fonts/figtree-600.woff2') format('woff2'); + font-weight: 600; + font-style: normal; + font-display: swap; +} +@font-face { + font-family: 'Figtree'; + src: url('/assets/fonts/figtree-700.woff2') format('woff2'); + font-weight: 700; + font-style: normal; + font-display: swap; +} + /* ---- Loading screen: brand the pre-React flash instead of white/black ---- */ #loading-container { background-color: rgb(234, 243, 234); /* dashboard green */ @@ -51,6 +81,12 @@ html.dark { } } + +/* Homepage font stack — Figtree first, self-hosted above */ +html, body, button, input, select, textarea, [class*='font-'] { + font-family: 'Figtree', -apple-system, BlinkMacSystemFont, 'Segoe UI', system-ui, sans-serif !important; +} + /* ---- Remove the "Don't have an account? Sign up" line ---- The

wraps the register link on auth pages. :has() hides the whole paragraph (custom2.js is the MutationObserver fallback). */ @@ -69,3 +105,11 @@ footer { text-align: center; padding: 1rem; } +footer a { + color: rgb(var(--accent-primary)); + font-weight: 600; + text-decoration: none; +} +footer a:hover { + text-decoration: underline; +} diff --git a/assets/custom2.js b/assets/custom2.js index cd05397..e51d49b 100644 --- a/assets/custom2.js +++ b/assets/custom2.js @@ -1,6 +1,6 @@ -// Co-op login-page polish. -// The auth form is client-rendered (React), so a plain `load` listener runs -// too early — a MutationObserver re-checks on every DOM change instead. +// Co-op UI polish. +// The auth form and footer are client-rendered (React), so a plain `load` +// listener runs too early — a MutationObserver re-checks on every DOM change. (function () { function hideSignupPrompt() { document.querySelectorAll('p').forEach(function (p) { @@ -12,9 +12,25 @@ }); } - function start() { + // Footer: turn the plain co-op text (injected at build time) into the + // linked version — "Inference Cooperative" links to the homepage. + function fixFooter() { + var f = document.querySelector('footer'); + if (!f || f.dataset.coopFooter) return; + f.dataset.coopFooter = '1'; + f.innerHTML = + 'Inference Cooperative' + + ' · Our AI, governed together'; + } + + function run() { hideSignupPrompt(); - new MutationObserver(hideSignupPrompt).observe(document.body, { + fixFooter(); + } + + function start() { + run(); + new MutationObserver(run).observe(document.body, { childList: true, subtree: true, }); diff --git a/assets/fonts/OFL.txt b/assets/fonts/OFL.txt new file mode 100644 index 0000000..80b12bb --- /dev/null +++ b/assets/fonts/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2022 The Figtree Project Authors (https://github.com/erikdkennedy/figtree) + +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/assets/fonts/figtree-400.woff2 b/assets/fonts/figtree-400.woff2 new file mode 100644 index 0000000..ca6795e Binary files /dev/null and b/assets/fonts/figtree-400.woff2 differ diff --git a/assets/fonts/figtree-500.woff2 b/assets/fonts/figtree-500.woff2 new file mode 100644 index 0000000..8601545 Binary files /dev/null and b/assets/fonts/figtree-500.woff2 differ diff --git a/assets/fonts/figtree-600.woff2 b/assets/fonts/figtree-600.woff2 new file mode 100644 index 0000000..9b4ec79 Binary files /dev/null and b/assets/fonts/figtree-600.woff2 differ diff --git a/assets/fonts/figtree-700.woff2 b/assets/fonts/figtree-700.woff2 new file mode 100644 index 0000000..3f75953 Binary files /dev/null and b/assets/fonts/figtree-700.woff2 differ diff --git a/patch_ui_strings.py b/patch_ui_strings.py index c9a31c7..3a99b49 100644 --- a/patch_ui_strings.py +++ b/patch_ui_strings.py @@ -12,8 +12,9 @@ import os REPLACEMENTS = [ # "MCP Servers" button -> "Tools" (more generic / accessible) ("MCP Servers", "Tools"), - # LibreChat footer tagline -> co-op footer - ("Every AI for Everyone.", "Inference Cooperative · Our AI, governed together · inference.coop"), + # LibreChat footer tagline -> co-op footer. custom2.js upgrades this to a + # linked version at runtime; this plain text is the no-JS fallback. + ("Every AI for Everyone.", "Inference Cooperative · Our AI, governed together"), ] assets_dir = "/app/code/librechat/client/dist/assets"