Merge pull request #93 from NeuralTeam/bugfix/fix-animation-and-font

fix: исправлена анимация бокового меню и работа шрифта
NeuralTeam · Sep 17, 2024 · 40c7ee2 · 40c7ee2
2 parents d90ef6e + 6022bb1
commit 40c7ee2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -6,6 +6,7 @@ import { ReactNode } from "react";
 import NavigationSidebar from "@/widgets/navbar/navigation-sidebar";
 import RootFooter from "@/widgets/root/root-footer";
 import Script from "next/script";
+import { cn } from "@/shared/libs/shadcn-utils";
 
 // https://fonts.google.com/specimen/Rubik
 // TODO: скачать локально шрифт Rubik
@@ -46,7 +47,7 @@ export default function RootLayout({
 }>) {
     return (
         <html lang="ru" className="scroll-smooth" suppressHydrationWarning>
-            <body className={"flex h-screen w-screen" + rubikFont.className}>
+            <body className={cn("flex h-screen w-screen", rubikFont.className)}>
                 <NavigationSidebar />
                 <div className="h-full max-h-screen w-full overflow-y-auto overflow-x-hidden bg-[#F8F8F8]">
                     <div className="pl-[70px]">{children}</div>

diff --git a/src/widgets/navbar/navigation-sidebar.tsx b/src/widgets/navbar/navigation-sidebar.tsx
@@ -86,7 +86,7 @@ const NavigationSidebar = () => {
                         </div>
                     ) : (
                         <>
-                            <div className="ml-[72px] mr-16 mt-10 flex flex-col space-y-10 text-white transition-all">
+                            <div className="ml-[72px] mr-16 mt-10 flex flex-col space-y-10 text-white">
                                 <Accordion
                                     type="single"
                                     collapsible