yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-26 17:00:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Николай 2018-01-09 00:24:51 +03:00 committed by GitHub
commit d1605a1923
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/strapi-plugin-users-permissions/admin/src/components/InputSearch/index.js
View File

@ -6,7 +6,7 @@
import React from 'react'; import React from 'react';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
import { findIndex, has, includes, isEmpty, map, toLower, upperFirst } from 'lodash'; import { findIndex, has, includes, isEmpty, map, toLower } from 'lodash';
import cn from 'classnames'; import cn from 'classnames';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
@ -77,7 +77,7 @@ class InputSearch extends React.Component { // eslint-disable-line react/prefer-
return ( return (
<div className={cn(styles.inputSearch, 'col-md-6')}> <div className={cn(styles.inputSearch, 'col-md-6')}>
<label htmlFor={this.props.name}> <label htmlFor={this.props.name}>
<FormattedMessage id={this.props.label} values={upperFirst(this.props.labelValues)} /> <FormattedMessage id={this.props.label} values={this.props.labelValues} />
</label> </label>
<div className={cn('input-group')}> <div className={cn('input-group')}>
<span className={cn('input-group-addon', styles.addon)} /> <span className={cn('input-group-addon', styles.addon)} />