mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-12-15 03:02:07 +03:00
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
This commit is contained in:
parent
59a4a009a0
commit
3f7089d241
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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">
|
||||
|
@ -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 {
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user