diff --git a/packages/strapi-generate-admin/files/admin/public/app/components/LeftMenuLink/index.js b/packages/strapi-generate-admin/files/admin/public/app/components/LeftMenuLink/index.js index c282b89c5d..2622e4edd9 100644 --- a/packages/strapi-generate-admin/files/admin/public/app/components/LeftMenuLink/index.js +++ b/packages/strapi-generate-admin/files/admin/public/app/components/LeftMenuLink/index.js @@ -23,7 +23,7 @@ class LeftMenuLink extends React.Component { // eslint-disable-line react/prefer return (
  • - + {this.props.label} diff --git a/packages/strapi-generate-admin/files/admin/public/app/components/LeftMenuLinkContainer/index.js b/packages/strapi-generate-admin/files/admin/public/app/components/LeftMenuLinkContainer/index.js index 3f14bfbe39..6738d013f1 100644 --- a/packages/strapi-generate-admin/files/admin/public/app/components/LeftMenuLinkContainer/index.js +++ b/packages/strapi-generate-admin/files/admin/public/app/components/LeftMenuLinkContainer/index.js @@ -17,7 +17,6 @@ class LeftMenuLinkContainer extends React.Component { // eslint-disable-line rea icon={plugin.get('icon') || 'ion-merge'} label={plugin.get('name')} destination={`/plugins/${plugin.get('id')}`} - isActive={this.props.params.plugin === plugin.get('id')} leftMenuLinks={plugin.get('leftMenuLinks')} /> )); diff --git a/packages/strapi-generate-admin/files/admin/public/app/components/LeftMenuSubLink/index.js b/packages/strapi-generate-admin/files/admin/public/app/components/LeftMenuSubLink/index.js index a9bdcd08a3..363b907d1a 100644 --- a/packages/strapi-generate-admin/files/admin/public/app/components/LeftMenuSubLink/index.js +++ b/packages/strapi-generate-admin/files/admin/public/app/components/LeftMenuSubLink/index.js @@ -11,8 +11,8 @@ import { Link } from 'react-router'; class LeftMenuSubLink extends React.Component { // eslint-disable-line react/prefer-stateless-function render() { return ( -
  • - +
  • + {this.props.label}
  • @@ -23,7 +23,6 @@ class LeftMenuSubLink extends React.Component { // eslint-disable-line react/pre LeftMenuSubLink.propTypes = { label: React.PropTypes.string, destination: React.PropTypes.string, - isActive: React.PropTypes.bool, }; export default LeftMenuSubLink; diff --git a/packages/strapi-generate-admin/files/admin/public/app/components/LeftMenuSubLink/styles.scss b/packages/strapi-generate-admin/files/admin/public/app/components/LeftMenuSubLink/styles.scss index d467e44b82..132bd7cc51 100644 --- a/packages/strapi-generate-admin/files/admin/public/app/components/LeftMenuSubLink/styles.scss +++ b/packages/strapi-generate-admin/files/admin/public/app/components/LeftMenuSubLink/styles.scss @@ -9,10 +9,6 @@ font-size: 1.2rem; } -.leftMenuLinkActive { - border-left: 0.4rem solid $strapi-blue; -} - .link { color: $left-menu-link-color; padding-left: 5.8rem; @@ -25,6 +21,10 @@ } } +.linkActive { + color: $white; +} + .linkLabel { display: inline-block; padding-right: 1rem; diff --git a/packages/strapi-generate-admin/files/admin/public/app/components/LeftMenuSubLinkContainer/index.js b/packages/strapi-generate-admin/files/admin/public/app/components/LeftMenuSubLinkContainer/index.js index aef3cf281e..a5aba88f8f 100644 --- a/packages/strapi-generate-admin/files/admin/public/app/components/LeftMenuSubLinkContainer/index.js +++ b/packages/strapi-generate-admin/files/admin/public/app/components/LeftMenuSubLinkContainer/index.js @@ -16,7 +16,6 @@ class LeftMenuSubLinkContainer extends React.Component { // eslint-disable-line key={i} label={subLink.get('label')} destination={`${this.props.destinationPrefix}/${subLink.get('to')}`} - isActive={false} /> ));