daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull request: remove extra scroll for short pages

Browse Source 
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
This commit is contained in:
Ildar Kamalov
2023-08-28 17:24:21 +03:00
parent 59a4a009a0
commit 3f7089d241
5 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/src/components/App/index.css
View File

@@ -89,18 +89,18 @@ body {
} }
.container--wrap { .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) { @media screen and (min-width: 992px) {
.container--wrap { .container--wrap {
min-height: calc(100vh - 117px); min-height: calc(100vh - 187px);
}
}
@media screen and (max-width: 992px) {
.container--wrap {
min-height: calc(100vh);
} }
} }

2
client/src/components/App/index.js
View File

@@ -192,7 +192,7 @@ const App = () => {
<LoadingBar className="loading-bar" updateTime={1000} /> <LoadingBar className="loading-bar" updateTime={1000} />
<Header /> <Header />
<ProtectionTimer /> <ProtectionTimer />
<div className="container container--wrap pb-5"> <div className="container container--wrap pb-5 pt-5">
{processing && <Loading />} {processing && <Loading />}
{!isCoreRunning && <div className="row row-cards"> {!isCoreRunning && <div className="row row-cards">
<div className="col-lg-12"> <div className="col-lg-12">

4
client/src/components/ui/PageTitle.css
View File

@@ -6,7 +6,7 @@
.page-header--logs { .page-header--logs {
flex-direction: row; flex-direction: row;
align-items: flex-end; align-items: flex-end;
margin: 2rem 0 2.8rem; margin: 0.5rem 0 2.8rem;
} }
.page-header--logs .page-title { .page-header--logs .page-title {
@@ -18,7 +18,7 @@
.page-header--logs { .page-header--logs {
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
margin: 1.1rem 0; margin-bottom: 0 0 1.1rem;
} }
.page-header--logs .page-title { .page-header--logs .page-title {

2
client/src/components/ui/Tabler.css
View File

@@ -10204,7 +10204,7 @@ body.fixed-header .page {
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
flex-direction: column; flex-direction: column;
margin: 1.5rem 0 1.5rem; margin: 0 0 1.5rem;
-ms-flex-wrap: wrap; -ms-flex-wrap: wrap;
flex-wrap: wrap; flex-wrap: wrap;
} }

3
client/src/install/Setup/Setup.css
View File

@@ -6,13 +6,14 @@
} }
.setup { .setup {
min-height: calc(100vh - 71px); min-height: calc(100vh - 345px);
line-height: 1.48; line-height: 1.48;
} }
@media screen and (min-width: 768px) { @media screen and (min-width: 768px) {
.setup { .setup {
padding: 50px 0; padding: 50px 0;
min-height: calc(100vh - 141px);
} }
} }