From c94a8dafa96d867315be1df5f143cb3c854c5c8f Mon Sep 17 00:00:00 2001 From: dmitriylaukhin Date: Mon, 18 May 2026 17:06:00 +0500 Subject: [PATCH] =?UTF-8?q?style(lms):=20=D1=81=D0=B8=D0=BD=D1=85=D1=80?= =?UTF-8?q?=D0=BE=D0=BD=D0=B8=D0=B7=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D1=82?= =?UTF-8?q?=D1=8C=20=D1=82=D0=B8=D0=BF=D0=BE=D0=B3=D1=80=D0=B0=D1=84=D0=B8?= =?UTF-8?q?=D0=BA=D1=83=20=D1=81=D0=BE=20=D1=88=D0=BA=D0=B0=D0=BB=D0=BE?= =?UTF-8?q?=D0=B9=20=D0=94=D0=A1-2=20(+2px)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Переопределены токены шкалы Tailwind (--text-xs…--text-5xl) на +2px, базовый размер body 18px, размеры компонентных классов (.btn-aubade, .tag-aubade, .admin-sidebar-nav-link) и инлайновые fontSize приведены к канону дизайн-системы ДС-2. Rem-база (html 16px) не тронута — спейсинг и сетка не затронуты, растёт только текст. Co-Authored-By: Claude Opus 4.7 (1M context) --- src/app/(auth)/forgot-password/page.tsx | 2 +- src/app/(auth)/login/page.tsx | 2 +- src/app/(auth)/register/page.tsx | 2 +- src/app/(auth)/register/register-form.tsx | 2 +- src/app/(auth)/reset-password/page.tsx | 2 +- .../homework/[submissionId]/feedback-form.tsx | 2 +- src/app/globals.css | 18 +++++++++++++++--- src/components/admin/create-user-form.tsx | 2 +- src/components/admin/csv-exporter.tsx | 2 +- src/components/admin/csv-importer.tsx | 2 +- src/components/admin/homework-editor.tsx | 2 +- src/components/admin/lesson-editor.tsx | 2 +- src/components/admin/quiz-editor.tsx | 2 +- src/components/admin/settings-form.tsx | 2 +- src/components/admin/user-balance-block.tsx | 2 +- src/components/admin/user-contact-editor.tsx | 2 +- .../admin/user-enrollment-manager.tsx | 2 +- src/components/student/homework-section.tsx | 2 +- src/components/student/quiz-section.tsx | 2 +- 19 files changed, 33 insertions(+), 21 deletions(-) diff --git a/src/app/(auth)/forgot-password/page.tsx b/src/app/(auth)/forgot-password/page.tsx index 48a1a04..6a272c0 100644 --- a/src/app/(auth)/forgot-password/page.tsx +++ b/src/app/(auth)/forgot-password/page.tsx @@ -10,7 +10,7 @@ export default async function ForgotPasswordPage() {

{schoolName}

-

+

Образовательная платформа

diff --git a/src/app/(auth)/login/page.tsx b/src/app/(auth)/login/page.tsx index 15c0ee5..646c051 100644 --- a/src/app/(auth)/login/page.tsx +++ b/src/app/(auth)/login/page.tsx @@ -18,7 +18,7 @@ export default async function LoginPage({

{schoolName}

-

+

Образовательная платформа

diff --git a/src/app/(auth)/register/page.tsx b/src/app/(auth)/register/page.tsx index c4e9088..f5e24a2 100644 --- a/src/app/(auth)/register/page.tsx +++ b/src/app/(auth)/register/page.tsx @@ -16,7 +16,7 @@ export default async function RegisterPage() {

{settings.schoolName}

-

+

Образовательная платформа

diff --git a/src/app/(auth)/register/register-form.tsx b/src/app/(auth)/register/register-form.tsx index a96cb09..b7e3247 100644 --- a/src/app/(auth)/register/register-form.tsx +++ b/src/app/(auth)/register/register-form.tsx @@ -26,7 +26,7 @@ export function RegisterForm({ showTermsCheckbox, privacyPolicyUrl, termsUrl, of outline: "none", width: "100%", padding: "0.5rem 0.75rem", - fontSize: "0.875rem", + fontSize: "16px", fontFamily: "inherit", } as React.CSSProperties; diff --git a/src/app/(auth)/reset-password/page.tsx b/src/app/(auth)/reset-password/page.tsx index 07e201e..e781f28 100644 --- a/src/app/(auth)/reset-password/page.tsx +++ b/src/app/(auth)/reset-password/page.tsx @@ -11,7 +11,7 @@ export default async function ResetPasswordPage() {

{schoolName}

-

+

Образовательная платформа

diff --git a/src/app/curator/homework/[submissionId]/feedback-form.tsx b/src/app/curator/homework/[submissionId]/feedback-form.tsx index 19598cc..5db9c8e 100644 --- a/src/app/curator/homework/[submissionId]/feedback-form.tsx +++ b/src/app/curator/homework/[submissionId]/feedback-form.tsx @@ -92,7 +92,7 @@ export function FeedbackForm({ outline: "none", width: "100%", padding: "0.5rem 0.75rem", - fontSize: "0.875rem", + fontSize: "16px", fontFamily: "inherit", resize: "vertical", minHeight: "120px", diff --git a/src/app/globals.css b/src/app/globals.css index 5ce872b..39c1066 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -31,6 +31,17 @@ --radius-lg: var(--radius); --radius-xl: calc(var(--radius) * 1.4); --radius-2xl: calc(var(--radius) * 1.8); + + /* Типографическая шкала — канон ДС-2, +2px к дефолту Tailwind */ + --text-xs: 14px; + --text-sm: 16px; + --text-base: 18px; + --text-lg: 20px; + --text-xl: 22px; + --text-2xl: 26px; + --text-3xl: 32px; + --text-4xl: 38px; + --text-5xl: 50px; } /* ── Light mode: Second Brain palette ──────────────────────────────── */ @@ -84,6 +95,7 @@ body { background-color: var(--background); color: var(--foreground); + font-size: 18px; } } @@ -105,7 +117,7 @@ justify-content: center; padding: 6px 16px; font-family: var(--font-sans); - font-size: 0.875rem; + font-size: 16px; font-weight: 500; border: var(--aubade-thickness) solid var(--foreground); box-shadow: var(--aubade-shadow-offset) var(--aubade-shadow-offset) 0 0 var(--foreground); @@ -134,7 +146,7 @@ background-color: var(--color-surface); border: var(--aubade-thickness) solid transparent; padding: 2px 8px; - font-size: 0.65rem; + font-size: 13px; text-transform: uppercase; letter-spacing: 0.1em; font-weight: 700; @@ -167,7 +179,7 @@ .admin-sidebar-nav-link { display: block; padding: 8px 12px; - font-size: 0.875rem; + font-size: 16px; color: var(--sidebar-text); text-decoration: none; border-left: 2px solid transparent; diff --git a/src/components/admin/create-user-form.tsx b/src/components/admin/create-user-form.tsx index e5156f4..f6d9751 100644 --- a/src/components/admin/create-user-form.tsx +++ b/src/components/admin/create-user-form.tsx @@ -22,7 +22,7 @@ const inputStyle: React.CSSProperties = { outline: "none", width: "100%", padding: "0.5rem 0.75rem", - fontSize: "0.875rem", + fontSize: "16px", fontFamily: "inherit", }; diff --git a/src/components/admin/csv-exporter.tsx b/src/components/admin/csv-exporter.tsx index 3123db6..dce702b 100644 --- a/src/components/admin/csv-exporter.tsx +++ b/src/components/admin/csv-exporter.tsx @@ -11,7 +11,7 @@ const inputStyle: React.CSSProperties = { outline: "none", width: "100%", padding: "0.5rem 0.75rem", - fontSize: "0.875rem", + fontSize: "16px", fontFamily: "inherit", }; const focusHandlers = { diff --git a/src/components/admin/csv-importer.tsx b/src/components/admin/csv-importer.tsx index 953c99e..041effc 100644 --- a/src/components/admin/csv-importer.tsx +++ b/src/components/admin/csv-importer.tsx @@ -18,7 +18,7 @@ const inputStyle: React.CSSProperties = { outline: "none", width: "100%", padding: "0.5rem 0.75rem", - fontSize: "0.875rem", + fontSize: "16px", fontFamily: "inherit", }; const focusHandlers = { diff --git a/src/components/admin/homework-editor.tsx b/src/components/admin/homework-editor.tsx index 19f8a5d..ddfc44d 100644 --- a/src/components/admin/homework-editor.tsx +++ b/src/components/admin/homework-editor.tsx @@ -20,7 +20,7 @@ export function HomeworkEditor({ lessonId, initial }: Props) { outline: "none", width: "100%", padding: "0.5rem 0.75rem", - fontSize: "0.875rem", + fontSize: "16px", fontFamily: "inherit", resize: "vertical" as const, minHeight: "120px", diff --git a/src/components/admin/lesson-editor.tsx b/src/components/admin/lesson-editor.tsx index e328a20..314101e 100644 --- a/src/components/admin/lesson-editor.tsx +++ b/src/components/admin/lesson-editor.tsx @@ -55,7 +55,7 @@ export function LessonEditor({ outline: "none", width: "100%", padding: "0.5rem 0.75rem", - fontSize: "0.875rem", + fontSize: "16px", fontFamily: "inherit", } as React.CSSProperties; diff --git a/src/components/admin/quiz-editor.tsx b/src/components/admin/quiz-editor.tsx index a344501..527dc18 100644 --- a/src/components/admin/quiz-editor.tsx +++ b/src/components/admin/quiz-editor.tsx @@ -36,7 +36,7 @@ export function QuizEditor({ lessonId, initial }: Props) { outline: "none", width: "100%", padding: "0.5rem 0.75rem", - fontSize: "0.875rem", + fontSize: "16px", fontFamily: "inherit", }; diff --git a/src/components/admin/settings-form.tsx b/src/components/admin/settings-form.tsx index b69b1db..ab73b33 100644 --- a/src/components/admin/settings-form.tsx +++ b/src/components/admin/settings-form.tsx @@ -13,7 +13,7 @@ const inputStyle = { outline: "none", width: "100%", padding: "0.5rem 0.75rem", - fontSize: "0.875rem", + fontSize: "16px", fontFamily: "inherit", } as React.CSSProperties; diff --git a/src/components/admin/user-balance-block.tsx b/src/components/admin/user-balance-block.tsx index b70b615..a8bce6a 100644 --- a/src/components/admin/user-balance-block.tsx +++ b/src/components/admin/user-balance-block.tsx @@ -20,7 +20,7 @@ const inputStyle = { background: "var(--background)", outline: "none", padding: "0.4rem 0.6rem", - fontSize: "0.875rem", + fontSize: "16px", fontFamily: "inherit", } as React.CSSProperties; diff --git a/src/components/admin/user-contact-editor.tsx b/src/components/admin/user-contact-editor.tsx index f86c5f8..a2f157c 100644 --- a/src/components/admin/user-contact-editor.tsx +++ b/src/components/admin/user-contact-editor.tsx @@ -9,7 +9,7 @@ const inputStyle = { outline: "none", width: "100%", padding: "0.4rem 0.6rem", - fontSize: "0.875rem", + fontSize: "16px", fontFamily: "inherit", } as React.CSSProperties; diff --git a/src/components/admin/user-enrollment-manager.tsx b/src/components/admin/user-enrollment-manager.tsx index eb87398..8a4142d 100644 --- a/src/components/admin/user-enrollment-manager.tsx +++ b/src/components/admin/user-enrollment-manager.tsx @@ -134,7 +134,7 @@ export function UserEnrollmentManager({ userId, allCourses, enrollments }: Props background: "var(--background)", outline: "none", padding: "0.4rem 0.6rem", - fontSize: "0.875rem", + fontSize: "16px", fontFamily: "inherit", width: "6rem", }} diff --git a/src/components/student/homework-section.tsx b/src/components/student/homework-section.tsx index 7eecf7c..e72eb59 100644 --- a/src/components/student/homework-section.tsx +++ b/src/components/student/homework-section.tsx @@ -54,7 +54,7 @@ export function HomeworkSection({ homework, submission, slug, lessonId, allowAud outline: "none", width: "100%", padding: "0.5rem 0.75rem", - fontSize: "0.875rem", + fontSize: "16px", fontFamily: "inherit", resize: "vertical" as const, minHeight: "140px", diff --git a/src/components/student/quiz-section.tsx b/src/components/student/quiz-section.tsx index 698f4b5..b386d9a 100644 --- a/src/components/student/quiz-section.tsx +++ b/src/components/student/quiz-section.tsx @@ -23,7 +23,7 @@ const inputStyle = { outline: "none", width: "100%", padding: "0.5rem 0.75rem", - fontSize: "0.875rem", + fontSize: "16px", fontFamily: "inherit", resize: "vertical" as const, minHeight: "80px",