Skip to content

Moved nav toggle to left of title #166

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

Moved nav toggle to left of title #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6ad17b2
Made sidebar background dark in dark theme
nicm42 Apr 22, 2021
e683c0d
Made sidebar link colours whiter in dark mode
nicm42 Apr 22, 2021
e351e54
Made sidebar titles whiter in dark theme
nicm42 Apr 22, 2021
1e35364
Made sidebar active item less white in dark theme
nicm42 Apr 22, 2021
98820f8
Update sidebar border colour
nicm42 Apr 23, 2021
f1d67f5
Swapped position of navbar toggler and brand
nicm42 Apr 24, 2021
8b62ada
Updated snapshot
nicm42 Apr 24, 2021
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
6 changes: 3 additions & 3 deletions src/display/shared/header/components/HeaderLogoBlock.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ const HeaderLogoBlock = (props) => {
>
☰
</NavbarToggler>
<Link href="/" className="d-none d-sm-inline-block navbar-brand" to="/">
RPTHREADTRACKER
</Link>
<NavbarToggler
className="d-md-down-none"
data-spec="header-logo-block-sidebar-toggler"
onClick={sidebarToggle}
>
&#9776;
</NavbarToggler>
<Link href="/" className="d-none d-sm-inline-block navbar-brand" to="/">
RPTHREADTRACKER
</Link>
</div>
);
};
Expand Down
16 changes: 8 additions & 8 deletions src/display/shared/header/components/__tests__/__snapshots__/HeaderLogoBlock.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,6 @@ exports[`rendering snapshots should render valid snapshot 1`] = `
>
☰
</NavbarToggler>
<Link
className="d-none d-sm-inline-block navbar-brand"
href="/"
replace={false}
to="/"
>
RPTHREADTRACKER
</Link>
<NavbarToggler
className="d-md-down-none"
data-spec="header-logo-block-sidebar-toggler"
Expand All @@ -34,5 +26,13 @@ exports[`rendering snapshots should render valid snapshot 1`] = `
>
☰
</NavbarToggler>
<Link
className="d-none d-sm-inline-block navbar-brand"
href="/"
replace={false}
to="/"
>
RPTHREADTRACKER
</Link>
</div>
`;
34 changes: 26 additions & 8 deletions src/display/shared/sidebar/_styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,40 @@ import styled from 'styled-components';
import colors from '../../../infrastructure/constants/colors';

export default styled.div`
color: ${colors.GRAY_400};
background: ${colors.WHITE};
border-right: 1px solid ${colors.GRAY_200};
color: ${colors.GRAY_100};
background: ${colors.GRAY_900};
border-right: 1px solid ${colors.GRAY_400};
.light-theme & {
color: ${colors.GRAY_400};
background: ${colors.WHITE};
border-right: 1px solid ${colors.GRAY_200};
}
.nav {
.nav-title {
color: ${colors.GRAY_600}
color: ${colors.GRAY_100};
.light-theme & {
color: ${colors.GRAY_600}
}
}
.nav-item {
.nav-link {
color: ${colors.GRAY_600}
color: ${colors.GRAY_100};
.light-theme & {
color: ${colors.GRAY_600}
}
i {
color: ${colors.GRAY_600}
color: ${colors.GRAY_100};
.light-theme & {
color: ${colors.GRAY_600}
}
}
&.active {
background: ${colors.GRAY_050};
color: ${colors.GRAY_600};
background: ${colors.GRAY_600};
color: ${colors.GRAY_050};
.light-theme & {
background: ${colors.GRAY_050};
color: ${colors.GRAY_600};
}
i {
color: ${colors.LIGHT_BLUE};
}
Expand Down