Merge branch 'main' of https://git.itguild.info/apuc/guild_front

src/components/Modal/Tracker/TrackerModal/trackerModal.scss

@@ -111,6 +111,9 @@
 
   .ck-placeholder {
     display: block !important;
+    @media (max-width: 450px) {
+      margin-top: 0 !important;
+    }
   }
 
   .ck-content {
@@ -119,6 +122,16 @@
     box-shadow: none !important;
   }
 
+  .ck-dropdown__panel-visible {
+    @media (max-width: 715px) {
+      top: -47px !important;
+    }
+    @media (max-width: 450px) {
+      right: -70px !important;
+      top: -77px !important;
+    }
+  }
+
   .select__executor {
     width: 100%;
     background: white;

src/components/SideBar/SideBar.jsx

@@ -56,27 +56,23 @@ export const SideBar = () => {
             <Link to={"/tracker-intro"}>Трекер</Link>
           </li>
           <li>
-            <Link to={"/quiz"}>Тесты</Link>
+            <Link to={"/profile/quiz"}>Тесты</Link>
           </li>
-          <li>
+          {/* <li>
             <Link to={"/forms"}>Формы</Link>
           </li>
           <li>
-            <a href="#" target="_blank" rel="noopener noreferrer">
+            <Link to={"/"}>Школа</Link>
-              Школа
-            </a>
           </li>
           <li>
-            <a href="#" target="_blank" rel="noopener noreferrer">
+            <Link to={"/"}>Контакты</Link>
-              Контакты
-            </a>
           </li>
           <li>
             <Link to={"/blog"}>Блог</Link>
           </li>
           <li>
             <Link to={"/frequently-asked-questions"}>FAQ</Link>
-          </li>
+          </li> */}
         </ul>
         <p className="auth-body__politic">Политика конфиденциальности</p>
         {/*<div className="auth-body__contacts">*/}

src/components/SideBar/sidebar.scss

@@ -6,6 +6,7 @@
   width: 100px;
   height: 100%;
   background: #e1fccf;
+  font-family: "LabGrotesque";
 
   @media (max-width: 1375px) {
     position: fixed;
@@ -193,7 +194,7 @@
     @media (max-width: 1375px) {
       left: 0;
       width: 100%;
-      height: 705px;
+      height: 100vh;
     }
   }
 }

src/pages/Stack/Stack.jsx

@@ -7,6 +7,7 @@ import "swiper/scss/navigation";
 
 import { AuthHeader } from "@components/Common/AuthHeader/AuthHeader";
 import { Footer } from "@components/Common/Footer/Footer";
+import SideBar from "@components/SideBar/SideBar";
 
 // import arrowReviewsLeft from "assets/icons/arrows/arrowReviewsLeft.png";
 // import arrowReviewsRight from "assets/icons/arrows/arrowReviewsRight.png";
@@ -256,6 +257,7 @@ export const Stack = () => {
   return (
     <section className="stack">
       <AuthHeader />
+      <SideBar />
       <section className="stack__intro">
         <div className="stack__container intro__container">
           <div className="intro__info">