yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into issue-392

Browse Source
This commit is contained in:
Tom Moor
2017-11-10 11:50:24 -08:00
committed by GitHub
parent 6e70903c63 eeaec04527
commit 22dbb4cf06
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/components/Layout/components/SidebarCollections.js
View File

@@ -116,6 +116,7 @@ type CollectionLinkProps = {
key={collection.id} key={collection.id}
to={collection.url} to={collection.url}
icon={<CollectionIcon expanded={expanded} color={collection.color} />} icon={<CollectionIcon expanded={expanded} color={collection.color} />}
iconColor={collection.color}
> >
<Flex justify="space-between"> <Flex justify="space-between">
{collection.name} {collection.name}

7
app/components/Layout/components/SidebarLink.js
View File

@@ -43,8 +43,10 @@ const StyledNavLink = styled(NavLink)`
} }
&.active { &.active {
svg { ${IconWrapper} & {
fill: ${activeStyle.color} svg {
fill: ${({ iconColor }) => (iconColor ? iconColor : activeStyle.color)}
}
} }
} }
`; `;
@@ -58,6 +60,7 @@ type Props = {
icon?: React$Element<*>, icon?: React$Element<*>,
expand?: boolean, expand?: boolean,
expandedContent?: React$Element<*>, expandedContent?: React$Element<*>,
iconColor?: string,
}; };
@observer class SidebarLink extends Component { @observer class SidebarLink extends Component {