yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-10 23:29:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update CSS & improve error management

Browse Source
This commit is contained in:
Aurelsicoko 2018-06-21 13:06:52 +02:00
parent 1d071db90d
commit 0b1241300c
6 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/strapi-helper-plugin/lib/internals/eslint/.eslintrc.json
View File

@ -87,6 +87,7 @@
"redux-saga/no-yield-in-race": 2, "redux-saga/no-yield-in-race": 2,
"redux-saga/yield-effects": 2, "redux-saga/yield-effects": 2,
"require-yield": 0, "require-yield": 0,
"react/forbid-prop-types": 0,
"react/no-unescaped-entities": 0, "react/no-unescaped-entities": 0,
"react/prefer-stateless-function": 0, "react/prefer-stateless-function": 0,
"react/sort-prop-types": 2, "react/sort-prop-types": 2,

2
packages/strapi-helper-plugin/lib/src/components/InputJSON/index.js
View File

@ -80,7 +80,7 @@ class InputJSON extends React.Component {
} }
} }
setSize = () => this.codeMirror.setSize('100%', 600); setSize = () => this.codeMirror.setSize('100%', 'auto');
setTheme = (theme) => this.codeMirror.setOption('theme', theme); setTheme = (theme) => this.codeMirror.setOption('theme', theme);

21
packages/strapi-helper-plugin/lib/src/components/InputJSON/styles.scss
View File

@ -4,16 +4,31 @@
margin-bottom: -14px; margin-bottom: -14px;
line-height: 18px; line-height: 18px;
div { >div {
font-size: 1.3rem !important; border-radius: 3px;
>div:last-of-type{
min-height: 320px;
max-height: 635px;
font-weight: 500;
font-size: 1.3rem !important;
}
} }
} }
.select { .select {
z-index: 100;
position: absolute; position: absolute;
bottom: 0; right: 0; bottom: 0; right: 0;
background: white; height: 24px;
padding: 0 10px;
background: rgba(255, 255, 255, 0.04);
border-radius: 0 !important; border-radius: 0 !important;
border-top-left-radius: 3px !important;
-webkit-appearance: none;
text-transform: capitalize;
color: #787E8F;
&:focus, &:active { &:focus, &:active {
outline: 0; outline: 0;
} }

8
packages/strapi-helper-plugin/lib/src/components/InputJSONWithErrors/index.js
View File

@ -68,6 +68,11 @@ class InputJSONWithErrors extends React.Component { // eslint-disable-line react
} }
} }
handleChange = (e) => {
this.setState({ errors: [] });
this.props.onChange(e);
}
render() { render() {
const { const {
autoFocus, autoFocus,
@ -87,7 +92,6 @@ class InputJSONWithErrors extends React.Component { // eslint-disable-line react
name, name,
noErrorsDescription, noErrorsDescription,
onBlur, onBlur,
onChange,
placeholder, placeholder,
resetProps, resetProps,
style, style,
@ -124,7 +128,7 @@ class InputJSONWithErrors extends React.Component { // eslint-disable-line react
deactivateErrorHighlight={deactivateErrorHighlight} deactivateErrorHighlight={deactivateErrorHighlight}
name={name} name={name}
onBlur={handleBlur} onBlur={handleBlur}
onChange={onChange} onChange={this.handleChange}
placeholder={placeholder} placeholder={placeholder}
resetProps={resetProps} resetProps={resetProps}
style={inputStyle} style={inputStyle}

16
packages/strapi-helper-plugin/package.json
View File

@ -53,15 +53,15 @@
"cross-env": "^5.0.5", "cross-env": "^5.0.5",
"css-loader": "^0.28.5", "css-loader": "^0.28.5",
"draft-js": "^0.10.5", "draft-js": "^0.10.5",
"eslint": "^4.4.1", "eslint": "4.4.1",
"eslint-config-airbnb": "^15.1.0", "eslint-config-airbnb": "15.1.0",
"eslint-config-airbnb-base": "^11.3.1", "eslint-config-airbnb-base": "11.3.1",
"eslint-config-prettier": "^2.3.0", "eslint-config-prettier": "2.3.0",
"eslint-import-resolver-webpack": "^0.8.3", "eslint-import-resolver-webpack": "0.8.3",
"eslint-plugin-import": "2.8.0", "eslint-plugin-import": "2.8.0",
"eslint-plugin-jsx-a11y": "^6.0.2", "eslint-plugin-jsx-a11y": "6.0.2",
"eslint-plugin-react": "^7.2.1", "eslint-plugin-react": "7.2.1",
"eslint-plugin-redux-saga": "^0.4.0", "eslint-plugin-redux-saga": "0.4.0",
"exports-loader": "^0.6.4", "exports-loader": "^0.6.4",
"express": "^4.15.4", "express": "^4.15.4",
"extract-text-webpack-plugin": "^3.0.0", "extract-text-webpack-plugin": "^3.0.0",

1
packages/strapi-lint/lib/internals/eslint/front/.eslintrc.json
View File

@ -74,6 +74,7 @@
"no-use-before-define": 0, "no-use-before-define": 0,
"prefer-template": 2, "prefer-template": 2,
"class-methods-use-this": 0, "class-methods-use-this": 0,
"react/forbid-prop-types": 0,
"react/react-in-jsx-scope": 0, "react/react-in-jsx-scope": 0,
"react/forbid-prop-types": 0, "react/forbid-prop-types": 0,
"react/jsx-first-prop-new-line": [ "react/jsx-first-prop-new-line": [