Skip to content

Adjust Header heights to fit Box content #343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Adjust Header heights to fit Box content #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0b1641
Adjust Header height to Box component content
travisk-codes Sep 16, 2020
a07e0af
Stretch Box component when text content short
travisk-codes Sep 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 14 additions & 17 deletions src/components/HeaderBarebone/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,25 @@ interface IHeaderBareboneProps {
export const HeaderBarebone: React.FC<IHeaderBareboneProps> = (props) => {
return (
<SC.HeaderWrapper className={props.className}>
<SC.Box>
{props.above}

<SC.Title
className={cx({
"has-content-above": props.above,
"has-content-below": props.content,
})}
>
{props.title}
</SC.Title>

{props.content}
</SC.Box>
<SC.BackgroundWrapper>
<SC.StyledWavesBottom />
<SC.StyledWavesTop />
<SC.StyledCircles />
</SC.BackgroundWrapper>

<Container>
<SC.Box>
{props.above}

<SC.Title
className={cx({
"has-content-above": props.above,
"has-content-below": props.content,
})}
>
{props.title}
</SC.Title>

{props.content}
</SC.Box>
</Container>
</SC.HeaderWrapper>
)
}
35 changes: 8 additions & 27 deletions src/components/HeaderBarebone/styles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,26 @@ import { fontFamily } from "../../design/typography"
import { WavesTop, WavesBottom } from "../Waves"
import Circles from "../../images/circles"

const height = 250

export const HeaderWrapper = styled.div`
width: 100%;
height: ${height}px;
padding-top: 67px;
position: relative;

&.shifted {
width: calc(100% - 305px);
padding-right: 305px;
}
display: flex;
justify-content: center;
padding: 0 32px;

@media screen and (max-width: 1200px) {
width: 100% !important;
padding-right: 0 !important;
}

@media screen and (max-width: 767px) {
display: flex;
align-items: flex-end;
height: auto;
min-height: ${height}px;
padding-top: 67px;
}
`

export const BackgroundWrapper = styled.div`
height: ${height}px;
padding-top: 67px;
overflow: hidden;
position: absolute;
top: 0;
Expand All @@ -41,7 +32,6 @@ export const BackgroundWrapper = styled.div`
bottom: 0;

@media screen and (max-width: 767px) {
height: calc(100% - 67px);
background: ${(props) => darken(0.2, props.theme.main.background)};
}
`
Expand Down Expand Up @@ -81,28 +71,19 @@ export const StyledWavesBottom = styled(WavesBottom)`
export const Box = styled.div`
display: inline-flex;
flex-direction: column;
position: absolute;
bottom: 40px;
margin-left: -16px;
position: relative;
background: ${(props) => transparentize(0.3, props.theme.main.background)};
padding: 16px;
margin: 16px;
backdrop-filter: blur(14px);
width: 100%;
max-width: 650px;

@media screen and (max-width: 1200px) {
max-width: 100%;
left: 32px;
right: 32px;
margin-left: 0;
}
z-index: 1;

@media screen and (max-width: 767px) {
position: static;
bottom: auto;
top: auto;
margin: 32px 0;
left: 0px;
right: 0px;

@-moz-document url-prefix() {
& {
Expand Down
4 changes: 0 additions & 4 deletions src/layouts/ColumnLayout/styles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ export const MainContent = styled.main`
width: 100%;
}

& > :first-child {
margin-top: 0;
}

& > :last-child {
margin-bottom: 0;
}
Expand Down