From 3f7089d24178ab9d3550aeac4551ea93970bc722 Mon Sep 17 00:00:00 2001
From: Ildar Kamalov <ik@adguard.com>
Date: Mon, 28 Aug 2023 17:24:21 +0300
Subject: [PATCH] Pull request: remove extra scroll for short pages

Updates #6062

Squashed commit of the following:

commit 4aedb387db23def0297704f4aae31d234b5ad670
Merge: aafc93557 59a4a009a
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Aug 28 17:04:14 2023 +0300

    Merge branch 'master' into ADG-7254

commit aafc93557c35a01def2568b31d96365360aa0888
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Aug 28 15:23:10 2023 +0300

    ADG-7254 remove extra scroll for short pages
---
 client/src/components/App/index.css    | 16 ++++++++--------
 client/src/components/App/index.js     |  2 +-
 client/src/components/ui/PageTitle.css |  4 ++--
 client/src/components/ui/Tabler.css    |  2 +-
 client/src/install/Setup/Setup.css     |  3 ++-
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/client/src/components/App/index.css b/client/src/components/App/index.css
index e11400b9..78bd0096 100644
--- a/client/src/components/App/index.css
+++ b/client/src/components/App/index.css
@@ -89,18 +89,18 @@ body {
 }
 
 .container--wrap {
-    min-height: calc(100vh - 160px);
+    min-height: calc(100vh - 372px);
+}
+
+@media screen and (min-width: 768px) {
+    .container--wrap {
+        min-height: calc(100vh - 168px);
+    }
 }
 
 @media screen and (min-width: 992px) {
     .container--wrap {
-        min-height: calc(100vh - 117px);
-    }
-}
-
-@media screen and (max-width: 992px) {
-    .container--wrap {
-        min-height: calc(100vh);
+        min-height: calc(100vh - 187px);
     }
 }
 
diff --git a/client/src/components/App/index.js b/client/src/components/App/index.js
index d59f985f..797bf1bc 100644
--- a/client/src/components/App/index.js
+++ b/client/src/components/App/index.js
@@ -192,7 +192,7 @@ const App = () => {
         <LoadingBar className="loading-bar" updateTime={1000} />
         <Header />
         <ProtectionTimer />
-        <div className="container container--wrap pb-5">
+        <div className="container container--wrap pb-5 pt-5">
             {processing && <Loading />}
             {!isCoreRunning && <div className="row row-cards">
                 <div className="col-lg-12">
diff --git a/client/src/components/ui/PageTitle.css b/client/src/components/ui/PageTitle.css
index a7e2c284..57966d75 100644
--- a/client/src/components/ui/PageTitle.css
+++ b/client/src/components/ui/PageTitle.css
@@ -6,7 +6,7 @@
 .page-header--logs {
     flex-direction: row;
     align-items: flex-end;
-    margin: 2rem 0 2.8rem;
+    margin: 0.5rem 0 2.8rem;
 }
 
 .page-header--logs .page-title {
@@ -18,7 +18,7 @@
     .page-header--logs {
         flex-direction: column;
         align-items: center;
-        margin: 1.1rem 0;
+        margin-bottom: 0 0 1.1rem;
     }
 
     .page-header--logs .page-title {
diff --git a/client/src/components/ui/Tabler.css b/client/src/components/ui/Tabler.css
index 9ad1ff35..69b0e1c4 100644
--- a/client/src/components/ui/Tabler.css
+++ b/client/src/components/ui/Tabler.css
@@ -10204,7 +10204,7 @@ body.fixed-header .page {
     -ms-flex-align: center;
     align-items: center;
     flex-direction: column;
-    margin: 1.5rem 0 1.5rem;
+    margin: 0 0 1.5rem;
     -ms-flex-wrap: wrap;
     flex-wrap: wrap;
 }
diff --git a/client/src/install/Setup/Setup.css b/client/src/install/Setup/Setup.css
index 0943febc..dc6e19d6 100644
--- a/client/src/install/Setup/Setup.css
+++ b/client/src/install/Setup/Setup.css
@@ -6,13 +6,14 @@
 }
 
 .setup {
-    min-height: calc(100vh - 71px);
+    min-height: calc(100vh - 345px);
     line-height: 1.48;
 }
 
 @media screen and (min-width: 768px) {
     .setup {
         padding: 50px 0;
+        min-height: calc(100vh - 141px);
     }
 }