diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/BoundRoute/index.js b/packages/strapi-plugin-users-permissions/admin/src/components/BoundRoute/index.js index 8c447cd7cb..7db61ba14b 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/BoundRoute/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/BoundRoute/index.js @@ -1,34 +1,36 @@ /** -* -* BoundRoute -* -*/ + * + * BoundRoute + * + */ import React from 'react'; import { get, includes, map, tail, toLower } from 'lodash'; import { FormattedMessage } from 'react-intl'; import PropTypes from 'prop-types'; -import cn from 'classnames'; -import styles from './styles.scss'; + +import { Header, Path, Verb, Wrapper } from './Components'; function BoundRoute({ route }) { const title = get(route, 'handler'); - const formattedRoute = get(route, 'path') ? tail(get(route, 'path').split('/')) : []; - const [ controller = '', action = '' ] = title ? title.split('.') : []; + const formattedRoute = get(route, 'path') + ? tail(get(route, 'path').split('/')) + : []; + const [controller = '', action = ''] = title ? title.split('.') : []; return (
-
+
  {controller} .{action} -
-
-
+ + + {get(route, 'method')} -
-
+ + {map(formattedRoute, value => ( ))} -
-
+ +
); } diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/BoundRoute/styles.scss b/packages/strapi-plugin-users-permissions/admin/src/components/BoundRoute/styles.scss deleted file mode 100644 index a2f4c992d9..0000000000 --- a/packages/strapi-plugin-users-permissions/admin/src/components/BoundRoute/styles.scss +++ /dev/null @@ -1,59 +0,0 @@ -.boundRoute { - display: flex; - height: 2.4rem; - border-radius: 3px; - background-color: #E9EAEB; - line-height: 2.4rem; -} - -.verb { - padding: 0 1rem; - border-radius: 3px; - color: #FFFFFF; - font-size: 12px; - font-weight: 700; - text-transform: uppercase; - letter-spacing: 0.5px; -} - -.path { - padding: 0 1rem; - font-size: 13px; - font-weight: 600; - color: #333740; -} - -.title { - margin-bottom: 3rem; - padding-top: 1.1rem; - color: #333740; - font-size: 18px; - font-weight: 600; - - > span:not(:first-child) { - color: #787E8F; - font-size: 16px; - font-weight: 500; - } - - > span:last-child { - color: #1642E1; - font-weight: 600; - } -} - -.get { - background-color: #008DFE; -} - -.post { - background-color: #69BA05; -} - -.put { - background-color: #F68E0E; -} - -.delete { - background-color: #F64D0A; -} diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/Controller/Components.js b/packages/strapi-plugin-users-permissions/admin/src/components/Controller/Components.js index 92a012981e..5657350b49 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/Controller/Components.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/Controller/Components.js @@ -5,6 +5,12 @@ const Wrapper = styled.div` background: #ffffff; opacity: none; -webkit-font-smoothing: antialiased; + .checkbox-wrapper { + font-size: 13px; + > div { + margin-bottom: 0 !important; + } + } `; const Header = styled.div` @@ -18,7 +24,6 @@ const Header = styled.div` `; const Label = styled.label` - position: relative; margin-right: 0px; margin-left: 10px; font-weight: 400 !important; diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/Controller/index.js b/packages/strapi-plugin-users-permissions/admin/src/components/Controller/index.js index 0bcdc18123..9d5ae86690 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/Controller/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/Controller/index.js @@ -7,12 +7,10 @@ import React from 'react'; import PropTypes from 'prop-types'; import { get, map } from 'lodash'; -import cn from 'classnames'; import { FormattedMessage } from 'react-intl'; import pluginId from '../../pluginId'; import InputCheckbox from '../InputCheckboxPlugin'; -import styles from './styles.scss'; import { Header, Label, Separator, Wrapper } from './Components'; @@ -55,10 +53,10 @@ class Controller extends React.Component {
{this.props.name}
-
+