Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
6444a5d
feat(ui-theme): light theme colors
comfrt1k Mar 17, 2026
6e87965
feat(ui-theme): dark theme colors
comfrt1k Mar 17, 2026
2fa8744
feat(ui-theme): ttf files
comfrt1k Mar 18, 2026
7d61f5f
feat(ui-theme): next and theme generator deps
comfrt1k Mar 18, 2026
83785b1
feat(ui-theme): font vars
comfrt1k Mar 18, 2026
7507468
feat(ui-theme): sf pro display font
comfrt1k Mar 18, 2026
8a9c0c3
feat(ui-theme): semantic typography
comfrt1k Mar 18, 2026
6df0fcf
feat(ui-theme): effects tokens
comfrt1k Mar 18, 2026
0cd400c
feat(ui-theme): layout tokens
comfrt1k Mar 18, 2026
242610e
feat(ui-theme): typography tokens
comfrt1k Mar 18, 2026
9d2e6f9
feat(frontend): entrypoint vanilla config
comfrt1k Mar 18, 2026
9d37760
feat(ui-theme): theme constants
comfrt1k Mar 18, 2026
ddf4b4a
feat(ui-theme): reference types for font
comfrt1k Mar 18, 2026
ea4e29e
feat(ui-theme): theme store
comfrt1k Mar 18, 2026
f1430e4
feat(ui-theme): tokens
comfrt1k Mar 18, 2026
32f1210
feat(ui-theme): global styles
comfrt1k Mar 18, 2026
c9c5705
feat(ui-theme): css themes
comfrt1k Mar 18, 2026
5465ebf
Merge branch 'master' into feat/theme
comfrt1k Mar 18, 2026
0da4364
feat(ui-theme): effector deps
comfrt1k Mar 18, 2026
078cd09
feat(common): remove changelog files and format yarnrc
comfrt1k Mar 18, 2026
f427f1e
refactor(ui-theme): font usage
comfrt1k Mar 18, 2026
3e37dfe
refactor(ui-theme): simplify model
comfrt1k Mar 18, 2026
81caa55
fix(ui-theme): simplify global style
comfrt1k Mar 18, 2026
4e3e460
fix(ui-theme): use released vanilla extract plugin
comfrt1k Jun 23, 2026
94edb6c
fix(ui-theme): rename oversized typography tokens
comfrt1k Jun 23, 2026
195ff14
fix(ui-theme): reuse font variable constant
comfrt1k Jun 23, 2026
69c6695
fix(app-entrypoint): suppress theme hydration warning
comfrt1k Jun 23, 2026
dc69c60
fix(app-entrypoint): update vanilla extract turbopack option
comfrt1k Jun 23, 2026
c09eaec
fix(ui-theme): derive next font types
comfrt1k Jun 23, 2026
6b26a4c
fix(app-entrypoint): declare frontend package dependencies
comfrt1k Jun 23, 2026
49ab732
fix(frontend): align vanilla extract css version
comfrt1k Jun 23, 2026
1644059
fix(app-entrypoint): route root dev script
comfrt1k Jun 23, 2026
84dbae8
fix(ui-theme): replace sf pro display with inter font
comfrt1k Jun 24, 2026
eed7229
fix(ui-theme): replace sf pro display with inter font
comfrt1k Jun 24, 2026
c86623e
chore(ui-theme): pass shadows to effects theme tokens
comfrt1k Jun 24, 2026
3d680c7
Merge remote-tracking branch 'origin/feat/theme' into feat/theme
comfrt1k Jun 24, 2026
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
6 changes: 3 additions & 3 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
compressionLevel: mixed

defaultSemverRangePrefix: ""
defaultSemverRangePrefix: ''

enableGlobalCache: true

Expand All @@ -13,11 +13,11 @@ initFields:

nodeLinker: node-modules

npmRegistryServer: "https://registry.npmjs.org"
npmRegistryServer: 'https://registry.npmjs.org'

npmScopes:
atls:
npmRegistryServer: "https://registry.npmjs.org"
npmRegistryServer: 'https://registry.npmjs.org'

preferReuse: true

Expand Down
6 changes: 0 additions & 6 deletions frontend/app/entrypoint/CHANGELOG.md

This file was deleted.

19 changes: 14 additions & 5 deletions frontend/app/entrypoint/next.config.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
import type { NextConfig } from 'next'
import type { NextConfig } from 'next'

import { dirname } from 'node:path'
import { resolve } from 'node:path'
import { fileURLToPath } from 'node:url'
import { dirname } from 'node:path'
import { resolve } from 'node:path'
import { fileURLToPath } from 'node:url'

import { createVanillaExtractPlugin } from '@vanilla-extract/next-plugin'

const rootDir = dirname(fileURLToPath(import.meta.url))
const workspaceRoot = resolve(rootDir, '../../..')

const withVanillaExtract = createVanillaExtractPlugin({
identifiers: 'short',
unstable_turbopack: {
mode: 'on',
},
})

const nextConfig: NextConfig = {
turbopack: {
root: workspaceRoot,
Expand All @@ -17,4 +26,4 @@ const nextConfig: NextConfig = {
},
}

export default nextConfig
export default withVanillaExtract(nextConfig)
5 changes: 5 additions & 0 deletions frontend/app/entrypoint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
"start:local": "node dist/server.js"
},
"dependencies": {
"@frontend/home-page": "workspace:*",
"@frontend/ui-theme": "workspace:*",
"@vanilla-extract/css": "1.21.0",
"@vanilla-extract/dynamic": "2.1.5",
"next": "16.1.6",
"react": "19.2.4",
"react-dom": "19.2.4"
Expand All @@ -23,6 +27,7 @@
"@types/node": "22.10.10",
"@types/react": "19.0.8",
"@types/react-dom": "19.0.3",
"@vanilla-extract/next-plugin": "2.5.0",
"typescript": "5.7.3"
},
"nx": {
Expand Down
10 changes: 8 additions & 2 deletions frontend/app/entrypoint/src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
import type { ReactNode } from 'react'

import { interFont } from '@frontend/ui-theme/fonts'

import { Providers } from './providers.js'

const RootLayout = ({ children }: { children: ReactNode }) => (
<html lang='ru'>
<body>{children}</body>
<html suppressHydrationWarning className={interFont.variable} lang='ru'>
<body>
<Providers>{children}</Providers>
</body>
</html>
)

Expand Down
9 changes: 9 additions & 0 deletions frontend/app/entrypoint/src/app/providers.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
'use client'

import type { ReactNode } from 'react'

import { ThemeProvider } from '@frontend/ui-theme'

export const Providers = ({ children }: { children: ReactNode }) => (
<ThemeProvider>{children}</ThemeProvider>
)
6 changes: 0 additions & 6 deletions frontend/pages/home/CHANGELOG.md

This file was deleted.

2 changes: 1 addition & 1 deletion frontend/ui/icons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"devDependencies": {
"@atls-ui-generators/icons": "1.2.2",
"@types/react": "19.2.2",
"@vanilla-extract/css": "1.17.4",
"@vanilla-extract/css": "1.21.0",
"@vanilla-extract/dynamic": "2.1.5",
"next": "16.1.6",
"react": "19.2.4",
Expand Down
Binary file added frontend/ui/theme/assets/fonts/inter/Inter.ttf
Binary file not shown.
93 changes: 93 additions & 0 deletions frontend/ui/theme/assets/fonts/inter/OFL.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
Copyright 2020 The Inter Project Authors (https://github.com/rsms/inter)

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://scripts.sil.org/OFL


-----------------------------------------------------------
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.
13 changes: 12 additions & 1 deletion frontend/ui/theme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,23 @@
"type": "module",
"exports": {
".": "./src/index.ts",
"./fonts": "./src/fonts/index.ts",
"./theme-css": "./src/theme.css.ts"
},
"scripts": {
"generate-theme": "generate-theme nHx3fiO1BYaBFUHbBwNa2I -o src/tokens --method secondary"
},
"dependencies": {
"effector": "23.4.2",
"effector-react": "23.3.0",
"next-themes": "0.4.6"
},
"devDependencies": {
"@atls/figma-theme-cli": "2.0.13",
"@types/react": "19.2.2",
"@vanilla-extract/css": "1.17.4",
"@vanilla-extract/css": "1.21.0",
"@vanilla-extract/dynamic": "2.1.5",
"next": "16.1.6",
"react": "19.2.4",
"react-dom": "19.2.4"
},
Expand Down
3 changes: 3 additions & 0 deletions frontend/ui/theme/src/constants/font-vars.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export const fontsVars = {
inter: '--font-inter',
} as const
2 changes: 2 additions & 0 deletions frontend/ui/theme/src/constants/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from './font-vars.js'
export * from './theme.js'
10 changes: 10 additions & 0 deletions frontend/ui/theme/src/constants/theme.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
export const ThemeEnum = {
LIGHT: 'light',
DARK: 'dark',
} as const

export type ThemeValue = (typeof ThemeEnum)[keyof typeof ThemeEnum]

export const DEFAULT_THEME = ThemeEnum.LIGHT

export const THEME_KEY = 'widget-theme'
3 changes: 3 additions & 0 deletions frontend/ui/theme/src/fonts/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/// <reference path="./next-font.d.ts" />

export * from './inter.js'
10 changes: 10 additions & 0 deletions frontend/ui/theme/src/fonts/inter.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import type { fontsVars } from '../constants/index.js'

import localFont from 'next/font/local'

export const interFont = localFont({
src: '../../assets/fonts/inter/Inter.ttf',
display: 'swap',
variable: '--font-inter' satisfies typeof fontsVars.inter,
weight: '100 900',
})
9 changes: 9 additions & 0 deletions frontend/ui/theme/src/fonts/next-font.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/// <reference types="next" />

declare module 'next/font/local' {
import type * as nextLocalFont from 'next/dist/compiled/@next/font/dist/local'

const localFont: typeof nextLocalFont.default.default

export default localFont
}
1 change: 1 addition & 0 deletions frontend/ui/theme/src/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export * from './store/index.js'
export * from './theme.css.js'
1 change: 1 addition & 0 deletions frontend/ui/theme/src/semantic/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './typography.js'
96 changes: 96 additions & 0 deletions frontend/ui/theme/src/semantic/typography.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
import { fontSizes } from '../tokens/base/typography/font-sizes.js'
import { fontWeights } from '../tokens/base/typography/font-weights.js'
import { fonts } from '../tokens/base/typography/fonts.js'
import { lineHeights } from '../tokens/base/typography/line-heights.js'

export const typography = {
displayLarge: {
fontFamily: fonts.primary,
fontSize: fontSizes.giant,
lineHeight: lineHeights.giant,
fontWeight: fontWeights.semibold,
},
displayMedium: {
fontFamily: fonts.primary,
fontSize: fontSizes.massive,
lineHeight: lineHeights.massive,
fontWeight: fontWeights.semibold,
},
displaySmall: {
fontFamily: fonts.primary,
fontSize: fontSizes.huge,
lineHeight: lineHeights.huge,
fontWeight: fontWeights.semibold,
},

headingLarge: {
fontFamily: fonts.primary,
fontSize: fontSizes['4xl'],
lineHeight: lineHeights['4xl'],
fontWeight: fontWeights.semibold,
},
headingMedium: {
fontFamily: fonts.primary,
fontSize: fontSizes['3xl'],
lineHeight: lineHeights['3xl'],
fontWeight: fontWeights.semibold,
},
headingSmall: {
fontFamily: fonts.primary,
fontSize: fontSizes['2xl'],
lineHeight: lineHeights['2xl'],
fontWeight: fontWeights.semibold,
},

subheadingLarge: {
fontFamily: fonts.primary,
fontSize: fontSizes.xl,
lineHeight: lineHeights.xl,
fontWeight: fontWeights.semibold,
},
subheadingMedium: {
fontFamily: fonts.primary,
fontSize: fontSizes.lg,
lineHeight: lineHeights.lg,
fontWeight: fontWeights.semibold,
},
subheadingSmall: {
fontFamily: fonts.primary,
fontSize: fontSizes.md,
lineHeight: lineHeights.md,
fontWeight: fontWeights.semibold,
},

bodyLarge: {
fontFamily: fonts.primary,
fontSize: fontSizes.xl,
lineHeight: lineHeights.xl,
fontWeight: fontWeights.regular,
},
bodyMedium: {
fontFamily: fonts.primary,
fontSize: fontSizes.lg,
lineHeight: lineHeights.lg,
fontWeight: fontWeights.regular,
},
bodySmall: {
fontFamily: fonts.primary,
fontSize: fontSizes.md,
lineHeight: lineHeights.md,
fontWeight: fontWeights.regular,
},

captionSmall: {
fontFamily: fonts.primary,
fontSize: fontSizes.sm,
lineHeight: lineHeights.sm,
fontWeight: fontWeights.regular,
},

labelSmall: {
fontFamily: fonts.primary,
fontSize: fontSizes.xs,
lineHeight: lineHeights.xs,
fontWeight: fontWeights.regular,
},
} as const
3 changes: 3 additions & 0 deletions frontend/ui/theme/src/store/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export * from './provider.js'
export * from './model.js'
export type * from './interfaces.js'
Loading
Loading