Skip to content

Cleanup CSS #19

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
jkettmann wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Cleanup CSS #19

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
2b1bc94
Use border-box in page container
jkettmann May 7, 2022
ccd622d
Use border box in sidebar navigation
jkettmann May 7, 2022
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
7 changes: 3 additions & 4 deletions features/ui/PageContainer/PageContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,14 @@ const Main = styled.main`
`;

const ContentContainer = styled.div`
min-height: calc(
100vh - 2 * ${space(8)} - ${({ theme }) => theme.size.headerHeight}
);
min-height: calc(100vh - ${({ theme }) => theme.size.headerHeight});
margin-top: ${({ theme }) => theme.size.headerHeight};
padding: ${space(8, 3)};
box-sizing: border-box;
background: white;

@media (min-width: ${breakpoint("desktop")}) {
min-height: calc(100vh - ${space(3)} - 2 * ${space(8)});
min-height: calc(100vh - ${space(3)});
margin-top: ${space(3)};
padding: ${space(8)};
border-top-left-radius: ${space(10)};
Expand Down
6 changes: 4 additions & 2 deletions features/ui/SidebarNavigation/SidebarNavigation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,13 @@ const FixedContainer = styled.div`
`;

const Header = styled.header`
width: calc(100% - 2 * ${space(4)});
width: 100%;
height: ${({ theme }) => theme.size.headerHeight};
display: flex;
align-items: center;
justify-content: space-between;
padding: ${space(0, 4)};
box-sizing: border-box;
background: ${color("gray", 900)};
position: relative;
z-index: ${zIndex("header")};
Expand Down Expand Up @@ -128,8 +129,9 @@ const Nav = styled.nav<{ isMobileMenuOpen: boolean }>`
@media (min-width: ${breakpoint("desktop")}) {
position: relative;
top: 0;
width: calc(100% - ${space(8)});
width: 100%;
padding: ${space(0, 4, 8)};
box-sizing: border-box;
transform: none;
}
`;
Expand Down