Skip to content

Commit

Permalink
chore: update
Browse files Browse the repository at this point in the history
Signed-off-by: Innei <[email protected]>
  • Loading branch information
Innei committed Sep 22, 2024
1 parent 459e95e commit cef89d1
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 2 deletions.
2 changes: 1 addition & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// @ts-check
import { defineConfig } from 'eslint-config-hyoban'

import recursiveSort from './plugins/eslint-recursive-sort'
import recursiveSort from './plugins/eslint-recursive-sort.js'

export default defineConfig(
{
Expand Down
Binary file added src/assets/fonts/GeistVF.woff2
Binary file not shown.
38 changes: 38 additions & 0 deletions src/lib/cn.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,44 @@
// Tremor Raw cx [v0.0.0]

import type { ClassValue } from 'clsx'
import clsx from 'clsx'
import { twMerge } from 'tailwind-merge'

export const clsxm = (...args: any[]) => {
return twMerge(clsx(args))
}

export function cx(...args: ClassValue[]) {
return twMerge(clsx(...args))
}

// Tremor Raw focusInput [v0.0.1]

export const focusInput = [
// base
'focus:ring-2',
// ring color
'focus:ring-blue-200 focus:dark:ring-blue-700/30',
// border color
'focus:border-blue-500 focus:dark:border-blue-700',
]

// Tremor Raw focusRing [v0.0.1]

export const focusRing = [
// base
'outline outline-offset-2 outline-0 focus-visible:outline-2',
// outline color
'outline-blue-500 dark:outline-blue-500',
]

// Tremor Raw hasErrorInput [v0.0.1]

export const hasErrorInput = [
// base
'ring-2',
// border color
'border-red-500 dark:border-red-700',
// ring color
'ring-red-200 dark:ring-red-700/30',
]
7 changes: 7 additions & 0 deletions src/styles/tailwind.css
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@ a {
}
}

@font-face {
font-family: 'Geist Sans';
src: url('../assets/fonts/GeistVF.woff2') format('woff2');
font-style: normal;
font-weight: 100 900;
}

@layer base {
* {
@apply border-border;
Expand Down
4 changes: 3 additions & 1 deletion tailwind.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import typography from '@tailwindcss/typography'
import daisyui from 'daisyui'
import { withTV } from 'tailwind-variants/transformer'
import type { Config } from 'tailwindcss'
import defaultTheme from 'tailwindcss/defaultTheme'

require('./plugins/css-plugin')

Expand Down Expand Up @@ -40,7 +41,8 @@ const twConfig: Config = {

extend: {
fontFamily: {
sans: 'system-ui,-apple-system,PingFang SC,"Microsoft YaHei",Segoe UI,Roboto,Helvetica,noto sans sc,hiragino sans gb,"sans-serif",Apple Color Emoji,Segoe UI Emoji,Not Color Emoji',
sans: ['Geist Sans', ...defaultTheme.fontFamily.sans],

serif:
'"Noto Serif CJK SC","Noto Serif SC",var(--font-serif),"Source Han Serif SC","Source Han Serif",source-han-serif-sc,SongTi SC,SimSum,"Hiragino Sans GB",system-ui,-apple-system,Segoe UI,Roboto,Helvetica,"Microsoft YaHei","WenQuanYi Micro Hei",sans-serif',
mono: `"OperatorMonoSSmLig Nerd Font","Cascadia Code PL","FantasqueSansMono Nerd Font","operator mono",JetBrainsMono,"Fira code Retina","Fira code","Consolas", Monaco, "Hannotate SC", monospace, -apple-system`,
Expand Down

0 comments on commit cef89d1

Please sign in to comment.