Skip to content

added dark mode to sidebar #35

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

Merged
merged 3 commits into from
Jul 24, 2020
Merged

added dark mode to sidebar #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8886ef2
added dark mode to sidebar
hugos Jul 23, 2020
f4708e3
fix: sidebar black color to body's color and sun's outline
hugos Jul 24, 2020
4dc50c9
fix: sun's color is now white on dark mode
hugos Jul 24, 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
2 changes: 1 addition & 1 deletion src/assets/icons/sun.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 14 additions & 8 deletions src/components/theme/Header/Hamburger/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
import React from 'react';
import React, {useContext} from 'react';
import { ThemeContext } from 'providers/ThemeProvider';
import { Wrapper, Bar } from './styles';

const Hamburger = ({ sidebar, toggle }) => (
<Wrapper sidebar={sidebar} onClick={() => toggle(!sidebar)}>
<Bar top sidebar={sidebar} />
<Bar mid sidebar={sidebar} />
<Bar bottom sidebar={sidebar} />
</Wrapper>
);
const Hamburger = ({ sidebar, toggle }) => {

const { theme } = useContext(ThemeContext);

return (
<Wrapper sidebar={sidebar} onClick={() => toggle(!sidebar)}>
<Bar top sidebar={sidebar} theme={theme}/>
<Bar mid sidebar={sidebar} theme={theme} />
<Bar bottom sidebar={sidebar} theme={theme} />
</Wrapper>
)
};

export default Hamburger;
17 changes: 10 additions & 7 deletions src/components/theme/Header/Hamburger/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,24 +44,27 @@ export const Bar = styled.div`
width: 1.6rem;
}

${({ top, sidebar }) =>
${({ top, sidebar, theme }) =>
top &&
sidebar &&
`
`
background-color: ${(theme === 'light' ? '#212121' : '#fff')};
transform: translateY(8px) rotate(-135deg);

`}

${({ mid, sidebar }) =>
mid &&
sidebar &&
`
transform: scale(0);
`}
`
transform: scale(0);
`}

${({ bottom, sidebar }) =>
${({ bottom, sidebar, theme }) =>
bottom &&
sidebar &&
`
`
background-color: ${(theme === 'light' ? '#212121' : '#fff')};
transform: translateY(-6px) rotate(-45deg);
`}
`;
24 changes: 15 additions & 9 deletions src/components/theme/Header/NavbarLinks/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
import React from 'react';
import React, {useContext} from 'react';
import AnchorLink from 'react-anchor-link-smooth-scroll';
import { ThemeContext } from 'providers/ThemeProvider';
import ToggleTheme from 'components/theme/Header/ToggleTheme';
import { Wrapper } from './styles';

const NavbarLinks = ({ desktop }) => (
<Wrapper desktop={desktop}>
<AnchorLink href="#about">About</AnchorLink>
<AnchorLink href="#projects">Projects</AnchorLink>
<AnchorLink href="#contact">Contact</AnchorLink>
<ToggleTheme />
</Wrapper>
);
const NavbarLinks = ({ desktop }) => {
const { theme } = useContext(ThemeContext);

return (
<Wrapper desktop={desktop} theme={theme}>
<AnchorLink href="#about">About</AnchorLink>
<AnchorLink href="#projects">Projects</AnchorLink>
<AnchorLink href="#contact">Contact</AnchorLink>
<ToggleTheme />
</Wrapper>
)

};

export default NavbarLinks;
4 changes: 4 additions & 0 deletions src/components/theme/Header/NavbarLinks/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ export const Wrapper = styled.div`
a {
color: #000;
text-decoration: none;

@media (max-width: 960px) {
color: ${({ theme }) => (theme === 'light' ? '#000' : '#fff')};
}
}

${({ desktop }) =>
Expand Down
13 changes: 9 additions & 4 deletions src/components/theme/Header/Sidebar/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
import React from 'react';
import React, { useContext } from 'react';
import { ThemeContext } from 'providers/ThemeProvider';
import NavbarLinks from '../NavbarLinks';
import { Wrapper } from './styles';

const Sidebar = ({ sidebar, toggle }) => (
<Wrapper active={sidebar} onClick={toggle}>
const Sidebar = ({ sidebar, toggle }) => {
const { theme } = useContext(ThemeContext);

return (
<Wrapper active={sidebar} onClick={toggle} theme={theme}>
<NavbarLinks />
</Wrapper>
);
)
};

export default Sidebar;
2 changes: 1 addition & 1 deletion src/components/theme/Header/Sidebar/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export const Wrapper = styled.div`
width: 0;
opacity: 0;
height: 100%;
background-color: #fff;
background-color: ${({ theme }) => (theme === 'light' ? '#fff' : '#212121')};
transition: all 350ms cubic-bezier(0.6, 0.05, 0.28, 0.91);

${({ active }) =>
Expand Down