Skip to content

Commit

Permalink
Pull request: remove extra scroll for short pages
Browse files Browse the repository at this point in the history
Updates #6062

Squashed commit of the following:

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

    Merge branch 'master' into ADG-7254

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

    ADG-7254 remove extra scroll for short pages
  • Loading branch information
IldarKamalov committed Aug 28, 2023
1 parent 59a4a00 commit 3f7089d
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
10 changes: 5 additions & 5 deletions client/src/components/App/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -89,18 +89,18 @@ body {
}

.container--wrap {
min-height: calc(100vh - 160px);
min-height: calc(100vh - 372px);
}

@media screen and (min-width: 992px) {
@media screen and (min-width: 768px) {
.container--wrap {
min-height: calc(100vh - 117px);
min-height: calc(100vh - 168px);
}
}

@media screen and (max-width: 992px) {
@media screen and (min-width: 992px) {
.container--wrap {
min-height: calc(100vh);
min-height: calc(100vh - 187px);
}
}

Expand Down
2 changes: 1 addition & 1 deletion client/src/components/App/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
4 changes: 2 additions & 2 deletions client/src/components/ui/PageTitle.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/ui/Tabler.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
3 changes: 2 additions & 1 deletion client/src/install/Setup/Setup.css
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down

0 comments on commit 3f7089d

Please sign in to comment.