From 2268e6e2819ee23d6df769634db1c8f3d6e24613 Mon Sep 17 00:00:00 2001
From: Victor Batischev <office@edoldnr.ru>
Date: Wed, 14 Feb 2024 16:34:12 +0300
Subject: [PATCH] layout rework in progress

---
 src/components/OutstaffingBlock/outstaffingBlock.scss     | 1 -
 src/components/ReportForm/reportForm.scss                 | 2 --
 src/pages/CatalogSpecialists/CatalogSpecialists.jsx       | 2 +-
 src/pages/CatalogSpecialists/catalogSpecialists.scss      | 4 ++--
 src/pages/CompanyInfo/CompanyInfo.jsx                     | 2 +-
 src/pages/FormPage/FormPage.jsx                           | 2 +-
 src/pages/Home/Home.jsx                                   | 2 +-
 .../PartnerEmployeeReport/partnerEmployeeReport.scss      | 7 +++++--
 src/pages/PartnerTreaties/partnerTreaties.scss            | 5 +++--
 src/pages/PartnerСategories/partnerСategories.scss      | 8 +++++---
 10 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/components/OutstaffingBlock/outstaffingBlock.scss b/src/components/OutstaffingBlock/outstaffingBlock.scss
index 074b85a4..f4d0a03e 100644
--- a/src/components/OutstaffingBlock/outstaffingBlock.scss
+++ b/src/components/OutstaffingBlock/outstaffingBlock.scss
@@ -9,7 +9,6 @@ body {
   background: #f1f1f1;
   height: 100%;
   min-height: 100vh;
-  font-family: "LabGrotesque", sans-serif;
   padding-top: 23px;
 
   &__title {
diff --git a/src/components/ReportForm/reportForm.scss b/src/components/ReportForm/reportForm.scss
index a056498a..6210b2ca 100644
--- a/src/components/ReportForm/reportForm.scss
+++ b/src/components/ReportForm/reportForm.scss
@@ -1,8 +1,6 @@
 .report-form {
   background: #f1f1f1;
-  height: 100%;
   min-height: 100vh;
-  font-family: "LabGrotesque", sans-serif;
 
   .container {
     max-width: 1160px;
diff --git a/src/pages/CatalogSpecialists/CatalogSpecialists.jsx b/src/pages/CatalogSpecialists/CatalogSpecialists.jsx
index ed52cef5..fd331828 100644
--- a/src/pages/CatalogSpecialists/CatalogSpecialists.jsx
+++ b/src/pages/CatalogSpecialists/CatalogSpecialists.jsx
@@ -200,9 +200,9 @@ const CatalogSpecialists = () => {
             );
           })}
         </div>
-        <Footer />
       </div>
       <SideBar />
+      <Footer />
     </section>
   );
 };
diff --git a/src/pages/CatalogSpecialists/catalogSpecialists.scss b/src/pages/CatalogSpecialists/catalogSpecialists.scss
index f2010737..402b7d70 100644
--- a/src/pages/CatalogSpecialists/catalogSpecialists.scss
+++ b/src/pages/CatalogSpecialists/catalogSpecialists.scss
@@ -1,8 +1,8 @@
 .catalog-specialists {
   background: #f1f1f1;
-  height: 100%;
+  display: flex;
+  flex-direction: column;
   min-height: 100vh;
-  font-family: "LabGrotesque", sans-serif;
 
   &__wrapper {
     padding-top: 24px;
diff --git a/src/pages/CompanyInfo/CompanyInfo.jsx b/src/pages/CompanyInfo/CompanyInfo.jsx
index d23daa8c..82b84133 100644
--- a/src/pages/CompanyInfo/CompanyInfo.jsx
+++ b/src/pages/CompanyInfo/CompanyInfo.jsx
@@ -103,8 +103,8 @@ export const CompanyInfo = () => {
             </div>
           </div>
         </div>
-        <Footer />
       </div>
+      <Footer />
     </div>
   );
 };
diff --git a/src/pages/FormPage/FormPage.jsx b/src/pages/FormPage/FormPage.jsx
index 353c8a7b..c77707d4 100644
--- a/src/pages/FormPage/FormPage.jsx
+++ b/src/pages/FormPage/FormPage.jsx
@@ -96,8 +96,8 @@ const FormPage = () => {
             </div>
           </div>
         </div>
-        <Footer />
       </div>
+      <Footer />
     </div>
   );
 };
diff --git a/src/pages/Home/Home.jsx b/src/pages/Home/Home.jsx
index b2a6b5ea..9670dfb2 100644
--- a/src/pages/Home/Home.jsx
+++ b/src/pages/Home/Home.jsx
@@ -69,9 +69,9 @@ const Home = () => {
           <h2 className="catalog__title">Каталог специалистов</h2>
           <Outstaffing />
           <Description onLoadMore={loadMore} isLoadingMore={isLoadingMore} />
-          <Footer />
         </div>
       </div>
+      <Footer />
     </>
   );
 };
diff --git a/src/pages/PartnerEmployeeReport/partnerEmployeeReport.scss b/src/pages/PartnerEmployeeReport/partnerEmployeeReport.scss
index 316c3fa1..a15eac1e 100644
--- a/src/pages/PartnerEmployeeReport/partnerEmployeeReport.scss
+++ b/src/pages/PartnerEmployeeReport/partnerEmployeeReport.scss
@@ -1,10 +1,13 @@
 .employee-report {
   background: #f1f1f1;
-  height: 100%;
+  display: flex;
+  flex-direction: column;
   min-height: 100vh;
-  font-family: "LabGrotesque", sans-serif;
 
   .container {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
     margin-top: 23px;
   }
 
diff --git a/src/pages/PartnerTreaties/partnerTreaties.scss b/src/pages/PartnerTreaties/partnerTreaties.scss
index df4051e1..ccfdba22 100644
--- a/src/pages/PartnerTreaties/partnerTreaties.scss
+++ b/src/pages/PartnerTreaties/partnerTreaties.scss
@@ -3,7 +3,6 @@
   display: flex;
   flex-direction: column;
   min-height: 100vh;
-  font-family: "LabGrotesque", sans-serif;
 
   &__title {
     font-weight: 700;
@@ -379,7 +378,9 @@
   }
 
   .container {
-    max-width: 1160px;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
     margin-top: 23px;
 
     @media (max-width: 570px) {
diff --git a/src/pages/PartnerСategories/partnerСategories.scss b/src/pages/PartnerСategories/partnerСategories.scss
index 33eb1299..b0107266 100644
--- a/src/pages/PartnerСategories/partnerСategories.scss
+++ b/src/pages/PartnerСategories/partnerСategories.scss
@@ -1,8 +1,8 @@
 .partner-categories {
   background: #f1f1f1;
-  height: 100%;
+  display: flex;
+  flex-direction: column;
   min-height: 100vh;
-  font-family: "LabGrotesque", sans-serif;
 
   &__title {
     color: #000000;
@@ -144,7 +144,9 @@
   }
 
   .container {
-    max-width: 1160px;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
     margin-top: 23px;
 
     @media (max-width: 570px) {