Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
interface
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
LuckySwap
interface
Commits
2c7381ff
Unverified
Commit
2c7381ff
authored
Oct 06, 2023
by
Jack Short
Committed by
GitHub
Oct 06, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: removing scrollbar on swap with banner (#7434)
parent
6e4746a7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
6 deletions
+14
-6
UkBanner.tsx
src/components/NavBar/UkBanner.tsx
+3
-3
App.tsx
src/pages/App.tsx
+11
-3
No files found.
src/components/NavBar/UkBanner.tsx
View file @
2c7381ff
...
@@ -5,9 +5,9 @@ import styled from 'styled-components'
...
@@ -5,9 +5,9 @@ import styled from 'styled-components'
import
{
ButtonText
,
ThemedText
}
from
'
theme/components
'
import
{
ButtonText
,
ThemedText
}
from
'
theme/components
'
import
{
Z_INDEX
}
from
'
theme/zIndex
'
import
{
Z_INDEX
}
from
'
theme/zIndex
'
export
const
UK_BANNER_HEIGHT
=
6
4
export
const
UK_BANNER_HEIGHT
=
6
5
export
const
UK_BANNER_HEIGHT_MD
=
11
2
export
const
UK_BANNER_HEIGHT_MD
=
11
3
export
const
UK_BANNER_HEIGHT_SM
=
13
6
export
const
UK_BANNER_HEIGHT_SM
=
13
7
const
BannerWrapper
=
styled
.
div
`
const
BannerWrapper
=
styled
.
div
`
position: relative;
position: relative;
...
...
src/pages/App.tsx
View file @
2c7381ff
...
@@ -32,14 +32,22 @@ import { RouteDefinition, routes, useRouterConfig } from './RouteDefinitions'
...
@@ -32,14 +32,22 @@ import { RouteDefinition, routes, useRouterConfig } from './RouteDefinitions'
const
AppChrome
=
lazy
(()
=>
import
(
'
./AppChrome
'
))
const
AppChrome
=
lazy
(()
=>
import
(
'
./AppChrome
'
))
const
BodyWrapper
=
styled
.
div
`
const
BodyWrapper
=
styled
.
div
<
{
bannerIsVisible
?:
boolean
}
>
`
display: flex;
display: flex;
flex-direction: column;
flex-direction: column;
width: 100%;
width: 100%;
min-height:
100vh
;
min-height:
calc(100vh -
${({
bannerIsVisible
})
=>
(
bannerIsVisible
?
UK_BANNER_HEIGHT
:
0
)}
px)
;
padding:
${({
theme
})
=>
theme
.
navHeight
}
px 0px 5rem 0px;
padding:
${({
theme
})
=>
theme
.
navHeight
}
px 0px 5rem 0px;
align-items: center;
align-items: center;
flex: 1;
flex: 1;
@media only screen and (max-width:
${({
theme
})
=>
`
${
theme
.
breakpoint
.
md
}
px`
}
) {
min-height: calc(100vh -
${({
bannerIsVisible
})
=>
(
bannerIsVisible
?
UK_BANNER_HEIGHT_MD
:
0
)}
px);
}
@media only screen and (max-width:
${({
theme
})
=>
`
${
theme
.
breakpoint
.
sm
}
px`
}
) {
min-height: calc(100vh -
${({
bannerIsVisible
})
=>
(
bannerIsVisible
?
UK_BANNER_HEIGHT_SM
:
0
)}
px);
}
`
`
const
MobileBottomBar
=
styled
.
div
`
const
MobileBottomBar
=
styled
.
div
`
...
@@ -217,7 +225,7 @@ export default function App() {
...
@@ -217,7 +225,7 @@ export default function App() {
<
HeaderWrapper
transparent=
{
isHeaderTransparent
}
bannerIsVisible=
{
renderUkBannner
}
scrollY=
{
scrollY
}
>
<
HeaderWrapper
transparent=
{
isHeaderTransparent
}
bannerIsVisible=
{
renderUkBannner
}
scrollY=
{
scrollY
}
>
<
NavBar
blur=
{
isHeaderTransparent
}
/>
<
NavBar
blur=
{
isHeaderTransparent
}
/>
</
HeaderWrapper
>
</
HeaderWrapper
>
<
BodyWrapper
>
<
BodyWrapper
bannerIsVisible=
{
renderUkBannner
}
>
<
Suspense
>
<
Suspense
>
<
AppChrome
/>
<
AppChrome
/>
</
Suspense
>
</
Suspense
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment