fix: additional fix
This commit is contained in:
kilyabin
@@ -10,8 +10,9 @@ export default function Document() {
|
|||||||
<link rel="icon" type="image/svg+xml" href="/icon0.svg" />
|
<link rel="icon" type="image/svg+xml" href="/icon0.svg" />
|
||||||
<link rel="icon" href="/favicon.ico" />
|
<link rel="icon" href="/favicon.ico" />
|
||||||
<link rel="manifest" href="/site.webmanifest" />
|
<link rel="manifest" href="/site.webmanifest" />
|
||||||
<meta name="msapplication-TileColor" content="#bc7b7b" />
|
<link href="https://fonts.googleapis.com/css2?family=Unbounded:wght@300;400;600;700&family=Onest:wght@300;400;500;600&display=swap" rel="stylesheet" />
|
||||||
<meta name="theme-color" content="#bc7b7b" />
|
<meta name="msapplication-TileColor" content="#0d0f14" />
|
||||||
|
<meta name="theme-color" content="#0d0f14" />
|
||||||
<meta name="apple-mobile-web-app-title" content="Расписание КС" />
|
<meta name="apple-mobile-web-app-title" content="Расписание КС" />
|
||||||
</Head>
|
</Head>
|
||||||
<body>
|
<body>
|
||||||
|
|||||||
@@ -14,69 +14,69 @@
|
|||||||
|
|
||||||
@layer base {
|
@layer base {
|
||||||
:root {
|
:root {
|
||||||
--background: 0 0% 100%;
|
--background: 225 10% 98%;
|
||||||
--foreground: 222.2 84% 4.9%;
|
--foreground: 225 25% 10%;
|
||||||
|
|
||||||
--card: 0 0% 100%;
|
--card: 0 0% 100%;
|
||||||
--card-foreground: 222.2 84% 4.9%;
|
--card-foreground: 225 25% 10%;
|
||||||
|
|
||||||
--popover: 0 0% 100%;
|
--popover: 0 0% 100%;
|
||||||
--popover-foreground: 222.2 84% 4.9%;
|
--popover-foreground: 225 25% 10%;
|
||||||
|
|
||||||
--primary: 222.2 47.4% 11.2%;
|
--primary: 217 91% 64%;
|
||||||
--primary-foreground: 210 40% 98%;
|
--primary-foreground: 210 40% 98%;
|
||||||
|
|
||||||
--secondary: 210 40% 96.1%;
|
--secondary: 225 15% 94%;
|
||||||
--secondary-foreground: 222.2 47.4% 11.2%;
|
--secondary-foreground: 225 25% 10%;
|
||||||
|
|
||||||
--muted: 210 40% 96.1%;
|
--muted: 225 15% 94%;
|
||||||
--muted-foreground: 215.4 16.3% 46.9%;
|
--muted-foreground: 225 10% 45%;
|
||||||
|
|
||||||
--accent: 210 40% 96.1%;
|
--accent: 217 91% 64%;
|
||||||
--accent-foreground: 222.2 47.4% 11.2%;
|
--accent-foreground: 210 40% 98%;
|
||||||
|
|
||||||
--destructive: 0 84.2% 60.2%;
|
--destructive: 0 84.2% 60.2%;
|
||||||
--destructive-foreground: 210 40% 98%;
|
--destructive-foreground: 210 40% 98%;
|
||||||
|
|
||||||
--border: 214.3 31.8% 91.4%;
|
--border: 225 15% 90%;
|
||||||
--input: 214.3 31.8% 91.4%;
|
--input: 225 15% 90%;
|
||||||
--ring: 222.2 84% 4.9%;
|
--ring: 217 91% 64%;
|
||||||
|
|
||||||
--radius: 0.5rem;
|
--radius: 0.85rem;
|
||||||
|
|
||||||
--grayed-out: 214.3 31.8% 93%;
|
--grayed-out: 225 15% 93%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dark {
|
.dark {
|
||||||
--background: 222.2 84% 4.9%;
|
--background: 225 21% 7%;
|
||||||
--foreground: 210 40% 98%;
|
--foreground: 225 20% 93%;
|
||||||
|
|
||||||
--card: 222.2 84% 4.9%;
|
--card: 225 23% 10%;
|
||||||
--card-foreground: 210 40% 98%;
|
--card-foreground: 225 20% 93%;
|
||||||
|
|
||||||
--popover: 222.2 84% 4.9%;
|
--popover: 225 23% 10%;
|
||||||
--popover-foreground: 210 40% 98%;
|
--popover-foreground: 225 20% 93%;
|
||||||
|
|
||||||
--primary: 210 40% 98%;
|
--primary: 217 91% 64%;
|
||||||
--primary-foreground: 222.2 47.4% 11.2%;
|
--primary-foreground: 210 40% 98%;
|
||||||
|
|
||||||
--secondary: 217.2 32.6% 17.5%;
|
--secondary: 225 16% 13%;
|
||||||
--secondary-foreground: 210 40% 98%;
|
--secondary-foreground: 225 20% 93%;
|
||||||
|
|
||||||
--muted: 217.2 32.6% 17.5%;
|
--muted: 225 16% 13%;
|
||||||
--muted-foreground: 215 20.2% 65.1%;
|
--muted-foreground: 225 10% 65%;
|
||||||
|
|
||||||
--accent: 217.2 32.6% 17.5%;
|
--accent: 217 91% 64%;
|
||||||
--accent-foreground: 210 40% 98%;
|
--accent-foreground: 210 40% 98%;
|
||||||
|
|
||||||
--destructive: 0 62.8% 30.6%;
|
--destructive: 0 62.8% 30.6%;
|
||||||
--destructive-foreground: 210 40% 98%;
|
--destructive-foreground: 210 40% 98%;
|
||||||
|
|
||||||
--border: 217.2 32.6% 17.5%;
|
--border: 225 16% 18%;
|
||||||
--input: 217.2 32.6% 17.5%;
|
--input: 225 16% 18%;
|
||||||
--ring: 212.7 26.8% 83.9%;
|
--ring: 217 91% 64%;
|
||||||
|
|
||||||
--grayed-out: 217.2 32.6% 10%;
|
--grayed-out: 225 16% 10%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -89,6 +89,8 @@
|
|||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
-webkit-text-size-adjust: 100%;
|
-webkit-text-size-adjust: 100%;
|
||||||
-webkit-tap-highlight-color: transparent;
|
-webkit-tap-highlight-color: transparent;
|
||||||
|
font-family: 'Unbounded', sans-serif;
|
||||||
|
letter-spacing: 0.02em;
|
||||||
}
|
}
|
||||||
body {
|
body {
|
||||||
@apply bg-background text-foreground;
|
@apply bg-background text-foreground;
|
||||||
@@ -97,6 +99,12 @@
|
|||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
position: relative;
|
position: relative;
|
||||||
-webkit-overflow-scrolling: touch;
|
-webkit-overflow-scrolling: touch;
|
||||||
|
font-family: 'Unbounded', sans-serif;
|
||||||
|
letter-spacing: 0.02em;
|
||||||
|
}
|
||||||
|
h1, h2, h3, h4, h5, h6, .font-unbounded {
|
||||||
|
font-family: 'Unbounded', sans-serif;
|
||||||
|
letter-spacing: 0.02em;
|
||||||
}
|
}
|
||||||
#__next {
|
#__next {
|
||||||
min-height: 100%;
|
min-height: 100%;
|
||||||
|
|||||||
@@ -30,31 +30,19 @@ export function NavBar({ cacheAvailableFor, groups, isTeacherPage = false }: {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<NavContextProvider cacheAvailableFor={cacheAvailableFor}>
|
<NavContextProvider cacheAvailableFor={cacheAvailableFor}>
|
||||||
<header className="sticky top-0 w-full p-2 bg-background z-[1] pb-0 mb-2 shadow-header">
|
<header className="sticky top-0 w-full p-3 bg-background/80 backdrop-blur-md z-[10] border-b border-border/50">
|
||||||
<nav className={cx('rounded-lg p-2 w-full flex gap-2 md:justify-between', { 'bg-slate-200': theme === 'light', 'bg-slate-900': theme === 'dark' })} suppressHydrationWarning>
|
<nav className="w-full flex gap-3 justify-between items-center" suppressHydrationWarning>
|
||||||
<div className="flex-1 min-w-0 overflow-x-auto scrollbar-hide">
|
<div className="flex gap-2 items-center">
|
||||||
<ul className="flex gap-2 flex-nowrap">
|
<Link href={isTeacherPage ? "/teachers" : "/"}>
|
||||||
<li className="flex-shrink-0">
|
<Button
|
||||||
<Link href={isTeacherPage ? "/teachers" : "/"}>
|
variant="secondary"
|
||||||
<Button
|
className="min-h-[44px] whitespace-nowrap gap-2"
|
||||||
variant="secondary"
|
tabIndex={-1}
|
||||||
className="min-h-[44px] whitespace-nowrap gap-2"
|
>
|
||||||
tabIndex={-1}
|
<ArrowLeft className="h-4 w-4" />
|
||||||
>
|
<span>{isTeacherPage ? "К преподавателям" : "К группам"}</span>
|
||||||
<ArrowLeft className="h-4 w-4" />
|
</Button>
|
||||||
<span>{isTeacherPage ? "К преподавателям" : "К группам"}</span>
|
</Link>
|
||||||
</Button>
|
|
||||||
</Link>
|
|
||||||
</li>
|
|
||||||
{Object.entries(groups).map(([id, group]) => (
|
|
||||||
<li key={id} className="hidden md:list-item flex-shrink-0">
|
|
||||||
<NavBarItem url={`/${id}`}>{group.name}</NavBarItem>
|
|
||||||
</li>
|
|
||||||
))}
|
|
||||||
<li className="flex-shrink-0 hidden md:list-item">
|
|
||||||
<AddGroupButton />
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
</div>
|
||||||
<div className='flex gap-1 min-[500px]:gap-2 flex-shrink-0 items-center flex-nowrap'>
|
<div className='flex gap-1 min-[500px]:gap-2 flex-shrink-0 items-center flex-nowrap'>
|
||||||
<Link href={GITHUB_REPO_URL} target='_blank' rel='nofollower noreferrer' className="flex-shrink-0">
|
<Link href={GITHUB_REPO_URL} target='_blank' rel='nofollower noreferrer' className="flex-shrink-0">
|
||||||
|
|||||||
Reference in New Issue
Block a user