diff --git a/apps/web/src/fonts/geist-mono-latin-ext-variable.woff2 b/apps/web/src/fonts/geist-mono-latin-ext-variable.woff2 new file mode 100644 index 0000000..ea22fd9 Binary files /dev/null and b/apps/web/src/fonts/geist-mono-latin-ext-variable.woff2 differ diff --git a/apps/web/src/fonts/geist-mono-latin-variable.woff2 b/apps/web/src/fonts/geist-mono-latin-variable.woff2 new file mode 100644 index 0000000..0750682 Binary files /dev/null and b/apps/web/src/fonts/geist-mono-latin-variable.woff2 differ diff --git a/apps/web/src/fonts/jetbrains-mono-regular.woff2 b/apps/web/src/fonts/jetbrains-mono-regular.woff2 deleted file mode 100644 index 66c5467..0000000 Binary files a/apps/web/src/fonts/jetbrains-mono-regular.woff2 and /dev/null differ diff --git a/apps/web/src/fonts/license-geist-mono.txt b/apps/web/src/fonts/license-geist-mono.txt new file mode 100644 index 0000000..61f6f4b --- /dev/null +++ b/apps/web/src/fonts/license-geist-mono.txt @@ -0,0 +1,93 @@ +Copyright 2024 The Geist Project Authors (https://github.com/vercel/geist-font.git) + +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. \ No newline at end of file diff --git a/apps/web/src/fonts/LICENSE-JETBRAINS-MONO.txt b/apps/web/src/fonts/license-roboto-serif.txt similarity index 97% rename from apps/web/src/fonts/LICENSE-JETBRAINS-MONO.txt rename to apps/web/src/fonts/license-roboto-serif.txt index 5ceee00..6d179f0 100644 --- a/apps/web/src/fonts/LICENSE-JETBRAINS-MONO.txt +++ b/apps/web/src/fonts/license-roboto-serif.txt @@ -1,8 +1,8 @@ -Copyright 2020 The JetBrains Mono Project Authors (https://github.com/JetBrains/JetBrainsMono) +Copyright 2020 The Roboto Serif Project Authors (https://github.com/googlefonts/RobotoSerif) 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 +http://scripts.sil.org/OFL ----------------------------------------------------------- diff --git a/apps/web/src/fonts/roboto-serif-latin-ext-variable.woff2 b/apps/web/src/fonts/roboto-serif-latin-ext-variable.woff2 new file mode 100644 index 0000000..446f10c Binary files /dev/null and b/apps/web/src/fonts/roboto-serif-latin-ext-variable.woff2 differ diff --git a/apps/web/src/fonts/roboto-serif-latin-variable.woff2 b/apps/web/src/fonts/roboto-serif-latin-variable.woff2 new file mode 100644 index 0000000..6151684 Binary files /dev/null and b/apps/web/src/fonts/roboto-serif-latin-variable.woff2 differ diff --git a/apps/web/src/global.css b/apps/web/src/global.css index 4d66669..cd10bf8 100644 --- a/apps/web/src/global.css +++ b/apps/web/src/global.css @@ -9,27 +9,65 @@ } @font-face { - font-family: "JetBrains Mono"; - font-display: swap; + font-family: "Geist Mono"; font-style: normal; - font-weight: 400; - src: url("./fonts/jetbrains-mono-regular.woff2") format("woff2"); + font-weight: 100 900; + font-display: swap; + src: url("./fonts/geist-mono-latin-ext-variable.woff2") format("woff2"); + unicode-range: + U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C4, U+2113, U+2C60-2C7F, U+A720-A7FF; +} + +@font-face { + font-family: "Geist Mono"; + font-style: normal; + font-weight: 100 900; + font-display: swap; + src: url("./fonts/geist-mono-latin-variable.woff2") format("woff2"); + unicode-range: + U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} + +@font-face { + font-family: "Roboto Serif"; + font-style: normal; + font-weight: 100 900; + font-display: swap; + src: url("./fonts/roboto-serif-latin-ext-variable.woff2") format("woff2"); + unicode-range: + U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C4, U+2113, U+2C60-2C7F, U+A720-A7FF; +} + +@font-face { + font-family: "Roboto Serif"; + font-style: normal; + font-weight: 100 900; + font-display: swap; + src: url("./fonts/roboto-serif-latin-variable.woff2") format("woff2"); + unicode-range: + U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } @source "../../../modules"; @source "../../../packages/rdx-ui/src"; @source "../../../packages/shadcn-ui/src/components"; +/* Los tokens del vendor se definen también en oscuro; se sobrescriben aquí + para que las utilidades y los elementos nativos usen las mismas familias. */ +:root, +.dark { + --font-sans: "Inter", ui-sans-serif, system-ui, sans-serif; + --font-serif: "Roboto Serif", Georgia, "Times New Roman", serif; + --font-mono: + "Geist Mono", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", + monospace; +} + /* El shell conserva su identidad visual sin alterar los tokens semánticos del vendor. */ @theme { --breakpoint-shell: 768px; --breakpoint-inventory: 1100px; --breakpoint-dashboard: 1200px; - --font-sans: "Inter", ui-sans-serif, system-ui, sans-serif; - --font-serif: Georgia, "Times New Roman", serif; - --font-mono: - "JetBrains Mono", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", - monospace; --color-shell-exterior: #000; --color-shell-content: var(--color-background); --color-shell-header: #fff; diff --git a/docs/componentes-de-interfaz.md b/docs/componentes-de-interfaz.md index 9cd0dd1..fda626e 100644 --- a/docs/componentes-de-interfaz.md +++ b/docs/componentes-de-interfaz.md @@ -49,12 +49,36 @@ Usar tokens semánticos como bg-background, text-foreground y border-border en v ## Tipografía -La aplicación carga localmente Inter y JetBrains Mono desde `apps/web/src/fonts`, con -`font-display: swap`. Georgia usa la fuente disponible en el sistema, seguida de -`Times New Roman`. Tailwind 4 expone las tres familias mediante `font-sans`, -`font-serif` y `font-mono`: Inter es la tipografía general; Georgia se reserva para -contenido editorial puntual; JetBrains Mono, para código, identificadores y valores técnicos. -Las licencias OFL 1.1 de las dos fuentes descargadas acompañan sus respectivos archivos. +La aplicación carga localmente tres familias variables WOFF2 desde `apps/web/src/fonts`, +con `font-display: swap` y pesos reales continuos de 100 a 900 en estilo normal: + +| Utilidad | Familia | Uso | +| --- | --- | --- | +| `font-sans` | Inter | Tipografía general. | +| `font-serif` | Roboto Serif | Contenido editorial puntual. | +| `font-mono` | Geist Mono | Código, identificadores y valores técnicos. | + +Las tres cubren los nueve pesos estándar de Tailwind 4: `thin` (100), `extralight` (200), +`light` (300), `normal` (400), `medium` (500), `semibold` (600), `bold` (700), +`extrabold` (800) y `black` (900). No fijar el eje `wght` mediante +`font-variation-settings`: el peso se controla con las utilidades `font-*`. +Las cursivas no se incluyen como archivos propios. + +Los tokens de familia se definen en `apps/web/src/global.css`, para `:root` y `.dark`, +fuera de `@theme`, porque el vendor declara esos mismos tokens en ambos temas y +sus utilidades los consumen. Las extensiones de la aplicación prevalecen sin modificar +`packages/shadcn-ui`. + +Geist Mono y Roboto Serif proceden de Google Fonts, con subconjuntos `latin` y +`latin-ext` separados mediante `unicode-range`; incluyen los caracteres del castellano +y del inglés. Los archivos se sirven desde la aplicación, sin peticiones a Google Fonts +en ejecución. Las licencias OFL 1.1 acompañan las tres familias. + +Fuentes de procedencia y rangos: [Inter](https://github.com/rsms/inter), +[Geist Mono](https://github.com/google/fonts/blob/main/ofl/geistmono/METADATA.pb) y +[Roboto Serif](https://github.com/google/fonts/blob/main/ofl/robotoserif/METADATA.pb). +Los nuevos WOFF2 se obtuvieron de la [API CSS de Google Fonts](https://fonts.googleapis.com/css2?family=Geist+Mono:wght@100..900&family=Roboto+Serif:wght@100..900&display=swap) +con un navegador compatible con fuentes variables. ## Añadir componentes