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

Merge branch 'master' into fix-ctb

Browse Source
This commit is contained in:
Jim LAURIE 2018-03-05 15:17:10 +01:00 committed by GitHub
commit ac7545b53e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/strapi-helper-plugin/lib/src/components/InputSearch/styles.scss
View File

@ -63,6 +63,7 @@
.addonFocus { .addonFocus {
border-color: #78caff; border-color: #78caff;
border-right: 0; border-right: 0;
transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
} }
.invalidSearch { .invalidSearch {

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

@ -27,7 +27,7 @@ class InputSelectWithErrors extends React.Component {
this.setState({ errors }); this.setState({ errors });
} }
if (isEmpty(this.props.value) && this.props.validations.required) { if (isEmpty(this.props.value) && this.props.validations.required === true) {
const target = { const target = {
type: 'select', type: 'select',
name: this.props.name, name: this.props.name,

2
packages/strapi-plugin-content-manager/admin/src/utils/formValidations.js
View File

@ -76,7 +76,7 @@ function validate(value, validations) {
} }
break; break;
case 'required': case 'required':
if (value.length === 0) { if (validationValue === true && value.length === 0) {
errors.push({ id: 'content-manager.error.validation.required' }); errors.push({ id: 'content-manager.error.validation.required' });
} }
break; break;

2
packages/strapi-plugin-upload/admin/src/components/Li/styles.scss
View File

@ -98,7 +98,7 @@
} }
.truncate { .truncate {
overflow-x: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }

2
packages/strapi-plugin-upload/admin/src/translations/en.json
View File

@ -7,7 +7,7 @@
"EditForm.Input.select.inputDescription": "Files can either be uploaded on your server or on external providers.", "EditForm.Input.select.inputDescription": "Files can either be uploaded on your server or on external providers.",
"EditForm.Input.toggle.label": "Enable file upload", "EditForm.Input.toggle.label": "Enable file upload",
"EmptyLi.message": "There is no uploaded files", "EmptyLi.message": "There are no uploaded files",
"EntriesNumber.number": "{number} file found", "EntriesNumber.number": "{number} file found",
"EntriesNumber.number.plural": "{number} files found", "EntriesNumber.number.plural": "{number} files found",