diff --git a/apps/www/.vitepress/theme/style.css b/apps/www/.vitepress/theme/style.css index fddd8cfb..ac502bb2 100644 --- a/apps/www/.vitepress/theme/style.css +++ b/apps/www/.vitepress/theme/style.css @@ -1,10 +1,12 @@ -@import url("https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap"); @tailwind base; @tailwind components; @tailwind utilities; @layer base { :root { + --font-geist-sans: "geist-sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + --background: 0 0% 100%; --foreground: 240 10% 3.9%; --card: 0 0% 100%; @@ -68,6 +70,16 @@ -webkit-tap-highlight-color: rgba(128, 128, 128, 0.5); } + /* Font face Geist font */ + + @font-face { + font-family: "geist-sans"; + font-style: normal; + font-weight: 100 900; + font-display: swap; + src: url("/fonts/Geist/GeistVariableVF.woff2") format("woff2"); + } + /* === Scrollbars === */ ::-webkit-scrollbar { diff --git a/apps/www/src/content/docs/installation/vite.md b/apps/www/src/content/docs/installation/vite.md index 314f0790..65fc6d67 100644 --- a/apps/www/src/content/docs/installation/vite.md +++ b/apps/www/src/content/docs/installation/vite.md @@ -24,7 +24,7 @@ Install `tailwindcss` and its peer dependencies, then generate your `tailwind.co - + Vite already has [`postcss`](https://github.com/vitejs/vite/blob/main/packages/vite/package.json#L78) dependency so you don't have to install it again in your package.json @@ -34,7 +34,7 @@ Install `tailwindcss` and its peer dependencies, then generate your `tailwind.co #### `vite.config` - ```typescript {5,6,10-14} + ```typescript {5,6,9-13} import path from "path" import { defineConfig } from "vite" import vue from "@vitejs/plugin-vue" @@ -43,13 +43,17 @@ Install `tailwindcss` and its peer dependencies, then generate your `tailwind.co import autoprefixer from "autoprefixer" export default defineConfig({ - plugins: [vue()], css: { postcss: { plugins: [tailwind(), autoprefixer()], }, }, - resolve: {...} + plugins: [vue()], + resolve: { + alias: { + "@": path.resolve(__dirname, "./src"), + }, + }, }) ``` @@ -81,10 +85,16 @@ Install `tailwindcss` and its peer dependencies, then generate your `tailwind.co Add the code below to the compilerOptions of your tsconfig.json so your app can resolve paths without error -```typescript -"baseUrl": ".", -"paths": { - "@/*": ["./src/*"] +```json {4-7} +{ + "compilerOptions": { + // ... + "baseUrl": ".", + "paths": { + "@/*": ["./src/*"] + } + // ... + } } ``` @@ -97,12 +107,17 @@ Add the code below to the vite.config.ts so your app can resolve paths without e npm i -D @types/node ``` -```typescript +```typescript {12-16} import path from "path" import vue from "@vitejs/plugin-vue" import { defineConfig } from "vite" export default defineConfig({ + css: { + postcss: { + plugins: [tailwind(), autoprefixer()], + }, + }, plugins: [vue()], resolve: { alias: { diff --git a/apps/www/src/lib/registry/default/ui/select/SelectItem.vue b/apps/www/src/lib/registry/default/ui/select/SelectItem.vue index 282c7cd3..b102a812 100644 --- a/apps/www/src/lib/registry/default/ui/select/SelectItem.vue +++ b/apps/www/src/lib/registry/default/ui/select/SelectItem.vue @@ -31,7 +31,7 @@ const forwardedProps = useForwardProps(delegatedProps) ) " > - + diff --git a/apps/www/src/public/fonts/Geist/GeistVariableVF.woff2 b/apps/www/src/public/fonts/Geist/GeistVariableVF.woff2 new file mode 100644 index 00000000..328a020b Binary files /dev/null and b/apps/www/src/public/fonts/Geist/GeistVariableVF.woff2 differ diff --git a/apps/www/src/public/fonts/Geist/LICENSE.TXT b/apps/www/src/public/fonts/Geist/LICENSE.TXT new file mode 100644 index 00000000..df71062c --- /dev/null +++ b/apps/www/src/public/fonts/Geist/LICENSE.TXT @@ -0,0 +1,92 @@ +Geist Sans and Geist Mono Font +(C) 2023 Vercel, made in collaboration with basement.studio + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is available with a FAQ at: http://scripts.sil.org/OFL and copied below + +----------------------------------------------------------- +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 AND 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/apps/www/tailwind.config.js b/apps/www/tailwind.config.js index d9fd9918..0d33cc00 100644 --- a/apps/www/tailwind.config.js +++ b/apps/www/tailwind.config.js @@ -1,3 +1,4 @@ +import defaultTheme from 'tailwindcss/defaultTheme' import tailwindcssAnimate from 'tailwindcss-animate' /** @type {import('tailwindcss').Config} */ @@ -13,6 +14,9 @@ export default { }, }, extend: { + fontFamily: { + sans: ['var(--font-geist-sans)', ...defaultTheme.fontFamily.sans], + }, colors: { border: 'hsl(var(--border))', input: 'hsl(var(--input))',