Skip to content

feat(xi.land): test font #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
unknownproperty wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(xi.land): test font #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions apps/xi.land/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Metadata } from 'next';
import { Inter } from 'next/font/google';
import localFont from 'next/font/local';
import { Inter, Caveat } from 'next/font/google';
import { ReactNode } from 'react';

import { Header } from 'components/Header';
Expand Down Expand Up @@ -93,10 +92,12 @@ export const metadata: Metadata = {
},
};

const markerHand = localFont({
src: '../public/fonts/MarkerHand-Regular.woff2',
const caveat = Caveat({
weight: ['400', '500', '600', '700'],
style: ['normal'],
subsets: ['latin', 'cyrillic'],
display: 'swap',
variable: '--font-marker-hand',
variable: '--font-caveat',
fallback: ['cursive'],
});

Expand All @@ -110,7 +111,7 @@ const inter = Inter({

export default function RootLayout({ children }: { children: ReactNode }) {
return (
<html lang="ru" suppressHydrationWarning className={`${inter.variable} ${markerHand.variable}`}>
<html lang="ru" suppressHydrationWarning className={`${inter.variable} ${caveat.variable}`}>
<body>
{process.env.NODE_ENV === 'development' ? (
<></>
Expand Down
7 changes: 5 additions & 2 deletions apps/xi.land/components/main/Benefits/contentStickers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { cn } from '@xipkg/utils';

const fontSticker =
'font-family-marker-hand font-normal text-m-base xs:text-l-base sm:text-xl-base lg:text-h5';
'font-family-marker-hand font-bold text-l-base xs:text-l-base sm:text-xl-base lg:text-h6 xl:text-h5';

const getVioletStickerContent = () => {
return (
Expand Down Expand Up @@ -44,7 +44,10 @@ const getYellowStickerContent = () => {
'h-full flex flex-col items-start justify-center sm:justify-start gap-4 sm:gap-6',
)}
>
<div>Соберите материалы и учеников в одной платформе — и обретите дзен</div>
<div>
Соберите материалы и учеников
<br />в одной платформе — и обретите дзен
</div>
<div>Ваши знания бесценны. Делитесь ими с комфортом</div>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion apps/xi.land/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
--animate-accordion-down: accordion-down 0.3s ease-in-out forwards;
--animate-accordion-up: accordion-up 0.3s ease-in-out forwards;

--font-family-marker-hand: var(--font-marker-hand), cursive;
--font-family-marker-hand: var(--font-caveat), cursive;

@keyframes accordion-down {
from {
Expand Down
Loading