yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-27 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix css

Browse Source
This commit is contained in:
cyril lopez 2017-12-05 14:44:32 +01:00
parent 80e4c1087c
commit 563923bb36
12 changed files with 151 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/index.js
View File

@ -47,14 +47,17 @@ function LeftMenuLinkContainer({ plugins }) {
// Check if the plugins list is empty or not and display plugins by name
const pluginsLinks = !isEmpty(pluginsObject) ?
map(sortBy(pluginsObject, 'name'), plugin => (
<LeftMenuLink
key={get(plugin, 'id')}
icon={get(plugin, 'icon') || 'plug'}
label={get(plugin, 'name')}
destination={`/plugins/${get(plugin, 'id')}`}
/>
))
map(sortBy(pluginsObject, 'name'), plugin => {
if (plugin.id !== 'email') {
return (
<LeftMenuLink
key={get(plugin, 'id')}
icon={get(plugin, 'icon') || 'plug'}
label={get(plugin, 'name')}
destination={`/plugins/${get(plugin, 'id')}`}
/>
);
}})
: (
<li className={styles.noPluginsInstalled}>
<FormattedMessage {...messages.noPluginsInstalled} />.

13
packages/strapi-admin/admin/src/components/Logout/styles.scss
View File

@ -38,7 +38,7 @@
right: -3px !important;
min-width: 100%!important;
margin: 0 !important;
padding: 12px 0 !important;
padding: 0px;
line-height: 1.8rem;
border: none!important;
border-top-left-radius: 0!important;
@ -47,20 +47,24 @@
font-size: 14px;
> button {
padding: 12px 15px 0 15px;
&:hover, &:focus, &:active {
background-color: #ffff!important;
background-color: #FAFAFB!important;
border-radius: 0px;
cursor: pointer;
}
}
> button:first-child {
padding-top: 16px;
padding-bottom: 5px;
&:hover, &:active {
color: #333740;
}
margin-bottom: 13px;
}
> button:not(:first-child) {
padding-bottom: 16px;
color: #F75B1D;
> i {
margin-left: 10px
@ -72,4 +76,7 @@
&:active {
color: black;
}
&:hover {
background-color: #FAFAFB !important;
}
}

3
packages/strapi-helper-plugin/lib/src/components/Button/styles.scss
View File

@ -52,6 +52,9 @@
background: #FFFFFF;
}
}
&:disabled {
cursor: not-allowed;
}
}
.primary {

4
packages/strapi-plugin-email/admin/src/translations/en.json
View File

@ -1 +1,3 @@
{}
{
"plugin.description": "Send emails"
}

4
packages/strapi-plugin-email/admin/src/translations/fr.json
View File

@ -1 +1,3 @@
{}
{
"plugin.description": "Envoyez des emails"
}

3
packages/strapi-plugin-users-permissions/admin/src/components/InputSearch/styles.scss
View File

@ -4,6 +4,7 @@
margin-top: .9rem;
background-color: rgba(16, 22, 34, 0.02);
border: 1px solid #E3E9F3;
border-bottom: 0px;
border-radius: 0.25rem;
border-bottom-left-radius: 0!important;
border-bottom-right-radius: 0!important;
@ -46,7 +47,7 @@
padding-left: 1rem;
background-size: 0 !important;
border: 1px solid #E3E9F3;
// border-left: none;
border-bottom: 0px;
border-radius: 0.25rem;
border-bottom-right-radius: 0;
line-height: 3.4rem;

10
packages/strapi-plugin-users-permissions/admin/src/components/InputSearchLi/index.js
View File

@ -6,7 +6,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { router } from 'app';
import styles from './styles.scss';
function InputSearchLi({ onClick, isAdding, item }) {
@ -14,18 +13,15 @@ function InputSearchLi({ onClick, isAdding, item }) {
const liStyle = isAdding ? { cursor: 'pointer' } : {};
const handleClick = isAdding ? () => onClick(item) : () => {};
const path = `/plugins/content-manager/user/${item.id}?redirectUrl=/plugins/content-manager/user/?page=1&limit=20&sort=id&source=users-permissions`;
const handleGoto = (e) => {
e.preventDefault();
e.stopPropagation();
router.push(path);
};
return (
<li className={styles.li} style={liStyle} onClick={handleClick}>
<div>
<div className={styles.container}>
{item.username}
<i className="fa fa-external-link" onClick={handleGoto} />
<a href={`${path}`} target="_blank">
<i className="fa fa-external-link" />
</a>
</div>
<div
onClick={(e) => {

2
packages/strapi-plugin-users-permissions/admin/src/components/InputSearchLi/styles.scss
View File

@ -31,7 +31,7 @@
.container {
>i {
>a {
margin-left: 10px;
color: #1C5DE7;
font-size: 10px;

4
packages/strapi-plugin-users-permissions/admin/src/components/Policies/styles.scss
View File

@ -7,14 +7,14 @@
margin-bottom: 1.1rem;
padding-top: 2.8rem;
font-size: 18px;
font-weight: 800;
font-weight: 700;
line-height: 3.6rem;
}
.inputWrapper {
> div:nth-child(2) {
> label {
font-weight: 800!important;
// font-weight: 800!important;
}
}
}

33
packages/strapi-plugin-users-permissions/admin/src/containers/EditPage/index.js
View File

@ -102,21 +102,6 @@ export class EditPage extends React.Component { // eslint-disable-line react/pre
this.props.submit();
}
pluginHeaderActions = [
{
label: 'users-permissions.EditPage.cancel',
kind: 'secondary',
onClick: this.props.onCancel,
type: 'button',
},
{
kind: 'primary',
label: 'users-permissions.EditPage.submit',
onClick: this.handleSubmit,
type: 'submit',
},
];
render() {
const pluginHeaderTitle = this.props.match.params.actionType === 'create' ?
'users-permissions.EditPage.header.title.create'
@ -124,8 +109,22 @@ export class EditPage extends React.Component { // eslint-disable-line react/pre
const pluginHeaderDescription = this.props.match.params.actionType === 'create' ?
'users-permissions.EditPage.header.description.create'
: 'users-permissions.EditPage.header.description';
const pluginHeaderActions = !isEqual(this.props.editPage.modifiedData, this.props.editPage.initialData) ? this.pluginHeaderActions : [];
const pluginHeaderActions = [
{
label: 'users-permissions.EditPage.cancel',
kind: 'secondary',
onClick: this.props.onCancel,
type: 'button',
},
{
kind: 'primary',
label: 'users-permissions.EditPage.submit',
onClick: this.handleSubmit,
type: 'submit',
disabled: isEqual(this.props.editPage.modifiedData, this.props.editPage.initialData),
},
];
return (
<div>
<BackHeader onClick={() => this.props.history.goBack()} />

4
packages/strapi-plugin-users-permissions/admin/src/containers/EditPage/saga.js
View File

@ -85,6 +85,7 @@ export function* submit() {
method: actionType,
body,
};
const requestURL = actionType === 'POST' ? '/users-permissions/roles' : `/users-permissions/roles/${roleId}`;
const response = yield call(request, requestURL, opts);
@ -92,8 +93,7 @@ export function* submit() {
yield put(submitSucceeded());
}
} catch(error) {
console.log(error.response.payload);
// TODO handle error message
console.log(error);
}
}

190
packages/strapi-plugin-users-permissions/config/roles.json
View File

@ -258,8 +258,8 @@
}
},
"1": {
"description": "",
"name": "Guest",
"description": "",
"permissions": {
"content-manager": {
"controllers": {
@ -306,37 +306,37 @@
"enabled": false,
"policy": ""
},
"getModel": {
"enabled": false,
"policy": ""
},
"getConnections": {
"enabled": false,
"policy": ""
},
"createModel": {
"enabled": false,
"policy": ""
},
"updateModel": {
"enabled": false,
"policy": ""
},
"deleteModel": {
"enabled": false,
"policy": ""
},
"autoReload": {
"enabled": false,
"policy": ""
},
"checkTableExists": {
"enabled": false,
"policy": ""
},
"autoReload": {
"enabled": false,
"policy": ""
},
"createModel": {
"enabled": false,
"policy": ""
},
"getModel": {
"enabled": false,
"policy": ""
},
"deleteModel": {
"enabled": false,
"policy": ""
},
"identity": {
"enabled": false,
"policy": ""
},
"getConnections": {
"enabled": false,
"policy": ""
}
}
}
@ -344,50 +344,14 @@
"settings-manager": {
"controllers": {
"settingsmanager": {
"menu": {
"enabled": false,
"policy": ""
},
"environments": {
"enabled": false,
"policy": ""
},
"languages": {
"enabled": false,
"policy": ""
},
"databases": {
"enabled": false,
"policy": ""
},
"database": {
"enabled": false,
"policy": ""
},
"databaseModel": {
"enabled": false,
"policy": ""
},
"get": {
"enabled": false,
"policy": ""
},
"update": {
"enabled": false,
"policy": ""
},
"createLanguage": {
"enabled": false,
"policy": ""
},
"deleteLanguage": {
"enabled": false,
"policy": ""
},
"createDatabase": {
"enabled": false,
"policy": ""
},
"updateDatabase": {
"enabled": false,
"policy": ""
@ -400,9 +364,45 @@
"enabled": false,
"policy": ""
},
"update": {
"enabled": false,
"policy": ""
},
"databaseModel": {
"enabled": false,
"policy": ""
},
"createLanguage": {
"enabled": false,
"policy": ""
},
"get": {
"enabled": false,
"policy": ""
},
"createDatabase": {
"enabled": false,
"policy": ""
},
"databases": {
"enabled": false,
"policy": ""
},
"languages": {
"enabled": false,
"policy": ""
},
"database": {
"enabled": false,
"policy": ""
},
"identity": {
"enabled": false,
"policy": ""
},
"menu": {
"enabled": false,
"policy": ""
}
}
}
@ -458,6 +458,42 @@
}
},
"userspermissions": {
"searchUsers": {
"enabled": false,
"policy": ""
},
"getRoutes": {
"enabled": false,
"policy": ""
},
"deleteRole": {
"enabled": false,
"policy": ""
},
"getPolicies": {
"enabled": false,
"policy": ""
},
"getRoles": {
"enabled": false,
"policy": ""
},
"getRole": {
"enabled": false,
"policy": ""
},
"getPermissions": {
"enabled": false,
"policy": ""
},
"init": {
"enabled": true,
"policy": ""
},
"index": {
"enabled": false,
"policy": ""
},
"createRole": {
"enabled": false,
"policy": ""
@ -466,53 +502,17 @@
"enabled": false,
"policy": ""
},
"deleteRole": {
"enabled": false,
"policy": ""
},
"getPermissions": {
"enabled": false,
"policy": ""
},
"getPolicies": {
"enabled": false,
"policy": ""
},
"getRole": {
"enabled": false,
"policy": ""
},
"getRoles": {
"enabled": false,
"policy": ""
},
"getRoutes": {
"enabled": false,
"policy": ""
},
"index": {
"enabled": false,
"policy": ""
},
"init": {
"enabled": true,
"policy": ""
},
"searchUsers": {
"identity": {
"enabled": false,
"policy": ""
},
"updateRole": {
"enabled": false,
"policy": ""
},
"identity": {
"enabled": false,
"policy": ""
}
}
}
}
}
}
}
}