modified: app/layout.tsx

modified:   package.json
	modified:   tailwind.config.js
main
joker 2 years ago
parent 50507d5e5f
commit abada08613
  1. 6
      app/layout.tsx
  2. 3
      package.json
  3. 3
      tailwind.config.js

@ -22,7 +22,7 @@ const fontSans = Red_Hat_Display({
const fontSerif = Newsreader({ const fontSerif = Newsreader({
subsets: ['latin'], subsets: ['latin'],
variable: '--font-newsreader', variable: '--font-arial',
}); });
type RootLayoutProps = { type RootLayoutProps = {
@ -77,8 +77,8 @@ export default function RootLayout({ children }: RootLayoutProps) {
lang="ru" lang="ru"
className={cn( className={cn(
'scroll-pt-16 overflow-auto overscroll-none', 'scroll-pt-16 overflow-auto overscroll-none',
fontSans.variable, //fontSans.variable,
fontSerif.variable, //fontSerif.variable,
)} )}
> >
<Script id="metrika-counter" strategy="afterInteractive"> <Script id="metrika-counter" strategy="afterInteractive">

@ -1,6 +1,6 @@
{ {
"name": "blog", "name": "blog",
"version": "1.3.4", "version": "1.3.6",
"scripts": { "scripts": {
"dev": "next dev", "dev": "next dev",
"test": "npx vitest", "test": "npx vitest",
@ -9,7 +9,6 @@
"start": "next start -p 3003", "start": "next start -p 3003",
"style:lint": "next lint", "style:lint": "next lint",
"style:prettier": "prettier --check '**/*.{js,jsx,ts,tsx}'", "style:prettier": "prettier --check '**/*.{js,jsx,ts,tsx}'",
"style:all": "pnpm run style:lint && pnpm run style:prettier",
"format": "prettier --write '**/*.{js,jsx,ts,tsx}'", "format": "prettier --write '**/*.{js,jsx,ts,tsx}'",
"storybook": "storybook dev -p 6006", "storybook": "storybook dev -p 6006",
"build-storybook": "npx contentlayer build && storybook build" "build-storybook": "npx contentlayer build && storybook build"

@ -30,7 +30,8 @@ module.exports = {
fontFamily: { fontFamily: {
// uses next/font; see app/layout.tsx // uses next/font; see app/layout.tsx
sans: ['var(--font-red-hat)'], sans: ['var(--font-red-hat)'],
serif: ['var(--font-newsreader)'], //serif: ['var(--font-newsreader)'],
serif: ['var(--font-arial)'],
}, },
gridTemplateRows: { gridTemplateRows: {
// main layout grid rows (header, main, footer) // main layout grid rows (header, main, footer)

Loading…
Cancel
Save