From 35ad3086ba88f28869c0077877c2262dda2739f6 Mon Sep 17 00:00:00 2001
From: Victor Batischev <office@edoldnr.ru>
Date: Thu, 15 Feb 2024 17:01:50 +0300
Subject: [PATCH] layout style fix

---
 .../FreeDevelopers/freeDevelopers.scss           | 11 ++++++++---
 .../TicketFullScreen/TicketFullScreen.jsx        |  4 ++--
 .../TicketFullScreen/ticketFullScreen.scss       |  2 --
 src/components/ProfileHeader/profileHeader.scss  |  2 +-
 .../CatalogSpecialists/CatalogSpecialists.jsx    |  8 ++++----
 .../CatalogSpecialists/catalogSpecialists.scss   | 16 ++++++++++++++--
 src/pages/CompanyInfo/companyInfo.scss           | 12 ++++++++++--
 .../FrequentlyAskedQuestions.jsx                 |  3 +--
 .../FrequentlyAskedQuestions.scss                |  9 ++++++---
 .../RegistrationSetting/registrationSetting.scss | 10 ++++++++--
 src/pages/TrackerAuth/trackerAuth.scss           |  1 -
 .../TrackerRegistration/trackerRegistration.scss | 10 ++++++++--
 12 files changed, 62 insertions(+), 26 deletions(-)

diff --git a/src/components/FreeDevelopers/freeDevelopers.scss b/src/components/FreeDevelopers/freeDevelopers.scss
index 10cbd998..1f7248d5 100644
--- a/src/components/FreeDevelopers/freeDevelopers.scss
+++ b/src/components/FreeDevelopers/freeDevelopers.scss
@@ -1,6 +1,7 @@
 .free-dev {
-  overflow: hidden;
-  position: relative;
+  display: flex;
+  flex-direction: column;
+  min-height: 100vh;
   background-color: #f1f1f1;
 
   .link {
@@ -28,7 +29,11 @@
   }
 
   &_page {
-    margin: 24px 0 30px 0;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    color: #000000;
+    padding: 50px 0 0;
   }
 
   &__title {
diff --git a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
index 9699a3b2..f562c68c 100644
--- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
+++ b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
@@ -35,7 +35,7 @@ import arrow from "assets/icons/arrows/arrowCalendar.png";
 import arrowStart from "assets/icons/arrows/arrowStart.png";
 import arrowDown from "assets/icons/arrows/selectArrow.png";
 import calendarIcon from "assets/icons/calendar.svg";
-import close from "assets/icons/close.png";
+import close from "assets/icons/crossWhite.svg";
 import fileDelete from "assets/icons/closeProjectPersons.svg";
 import del from "assets/icons/delete.svg";
 import edit from "assets/icons/edit.svg";
@@ -971,7 +971,7 @@ export const TicketFullScreen = () => {
                     />
                   </div>
                   <div className="time">
-                    <img src={watch}></img>
+                    <p>⏱</p>
                     <p>
                       {correctTimerTime(currentTimerCount.hours)}:
                       {correctTimerTime(currentTimerCount.minute)}:
diff --git a/src/components/Modal/Tracker/TicketFullScreen/ticketFullScreen.scss b/src/components/Modal/Tracker/TicketFullScreen/ticketFullScreen.scss
index 907779dc..983f6145 100644
--- a/src/components/Modal/Tracker/TicketFullScreen/ticketFullScreen.scss
+++ b/src/components/Modal/Tracker/TicketFullScreen/ticketFullScreen.scss
@@ -49,8 +49,6 @@
 
 .fullscreen-workers {
   @media (max-width: 880px) {
-    background: #dff1ff;
-
     .workers_box {
       @media (max-width: 880px) {
         flex-direction: inherit !important;
diff --git a/src/components/ProfileHeader/profileHeader.scss b/src/components/ProfileHeader/profileHeader.scss
index 617052c5..904544a9 100644
--- a/src/components/ProfileHeader/profileHeader.scss
+++ b/src/components/ProfileHeader/profileHeader.scss
@@ -17,7 +17,7 @@
     justify-content: space-between;
     align-items: center;
     height: 100%;
-    z-index: 9999;
+    z-index: 9;
 
     .text {
       width: 100%;
diff --git a/src/pages/CatalogSpecialists/CatalogSpecialists.jsx b/src/pages/CatalogSpecialists/CatalogSpecialists.jsx
index fd331828..8498b9db 100644
--- a/src/pages/CatalogSpecialists/CatalogSpecialists.jsx
+++ b/src/pages/CatalogSpecialists/CatalogSpecialists.jsx
@@ -145,9 +145,10 @@ const CatalogSpecialists = () => {
     }
   ];
   return (
-    <section className="catalog-specialists">
+    <div className="catalog-specialists">
       <AuthHeader />
-      <div className="container catalog-specialists__wrapper">
+      <SideBar />
+      <div className="catalog-specialists__content container">
         <ProfileBreadcrumbs
           links={[
             { name: "Главная", link: "/auth" },
@@ -201,9 +202,8 @@ const CatalogSpecialists = () => {
           })}
         </div>
       </div>
-      <SideBar />
       <Footer />
-    </section>
+    </div>
   );
 };
 
diff --git a/src/pages/CatalogSpecialists/catalogSpecialists.scss b/src/pages/CatalogSpecialists/catalogSpecialists.scss
index 402b7d70..275493f5 100644
--- a/src/pages/CatalogSpecialists/catalogSpecialists.scss
+++ b/src/pages/CatalogSpecialists/catalogSpecialists.scss
@@ -4,8 +4,20 @@
   flex-direction: column;
   min-height: 100vh;
 
-  &__wrapper {
-    padding-top: 24px;
+  &__content {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    color: #000000;
+    padding: 50px 0 0;
+
+    @media (max-width: 1375px) {
+      padding-top: 100px;
+    }
+
+    @media (max-width: 1000px) {
+      background-color: white;
+    }
   }
 
   &__head {
diff --git a/src/pages/CompanyInfo/companyInfo.scss b/src/pages/CompanyInfo/companyInfo.scss
index 0967f974..a9d375dd 100644
--- a/src/pages/CompanyInfo/companyInfo.scss
+++ b/src/pages/CompanyInfo/companyInfo.scss
@@ -1,7 +1,15 @@
 .company-info {
+  display: flex;
+  flex-direction: column;
+  min-height: 100vh;
+  background-color: #f1f1f1;
+
   &__content {
-    background-color: #f1f1f1;
-    padding-top: 60px;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    color: #000000;
+    padding: 50px 0 0;
 
     @media (max-width: 1375px) {
       padding-top: 120px;
diff --git a/src/pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions.jsx b/src/pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions.jsx
index 1ddbc543..f6f3a74e 100644
--- a/src/pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions.jsx
+++ b/src/pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions.jsx
@@ -83,8 +83,7 @@ export const FrequentlyAskedQuestions = () => {
     <div className="frequently-asked-questions">
       <AuthHeader />
       <SideBar />
-
-      <div className="frequently-asked-questions__container container">
+      <div className="container">
         <ProfileBreadcrumbs
           links={[
             { name: "Главная", link: "/auth" },
diff --git a/src/pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions.scss b/src/pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions.scss
index 31a14e80..69859862 100644
--- a/src/pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions.scss
+++ b/src/pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions.scss
@@ -8,9 +8,12 @@
     margin-top: 80px;
   }
 
-  &__container {
-    flex: 1 1 auto;
-    margin: 30px 0;
+  .container {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    max-width: 1160px;
+    margin-top: 23px;
   }
 
   &__about {
diff --git a/src/pages/RegistrationSetting/registrationSetting.scss b/src/pages/RegistrationSetting/registrationSetting.scss
index a2e6d89c..b52b4b87 100644
--- a/src/pages/RegistrationSetting/registrationSetting.scss
+++ b/src/pages/RegistrationSetting/registrationSetting.scss
@@ -1,9 +1,15 @@
 .registration-setting {
+  display: flex;
+  flex-direction: column;
+  min-height: 100vh;
+  background-color: #f1f1f1;
+
   &__content {
-    background-color: #f1f1f1;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
     color: #000000;
     padding: 50px 0 0;
-    min-height: 100vh;
 
     @media (max-width: 1375px) {
       padding-top: 100px;
diff --git a/src/pages/TrackerAuth/trackerAuth.scss b/src/pages/TrackerAuth/trackerAuth.scss
index 3816f766..d02c9638 100644
--- a/src/pages/TrackerAuth/trackerAuth.scss
+++ b/src/pages/TrackerAuth/trackerAuth.scss
@@ -8,7 +8,6 @@
     display: flex;
     flex-direction: column;
     flex: 1;
-
     color: #000000;
     padding: 50px 0 0;
 
diff --git a/src/pages/TrackerRegistration/trackerRegistration.scss b/src/pages/TrackerRegistration/trackerRegistration.scss
index 19b89e47..22d5b678 100644
--- a/src/pages/TrackerRegistration/trackerRegistration.scss
+++ b/src/pages/TrackerRegistration/trackerRegistration.scss
@@ -1,9 +1,15 @@
 .tracker-registration {
+  display: flex;
+  flex-direction: column;
+  min-height: 100vh;
+  background-color: #f1f1f1;
+
   &__content {
-    background-color: #f1f1f1;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
     color: #000000;
     padding: 50px 0 0;
-    min-height: 100vh;
 
     @media (max-width: 1375px) {
       padding-top: 100px;