From 6ccaed248cc1dcc4abdd7326ed58a310712e76e9 Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 6 Jan 2017 13:50:45 +0100 Subject: [PATCH 1/2] fix button style --- package.json | 2 +- src/components/results.js | 2 +- src/style/list.scss | 2 +- src/style/pagination.scss | 9 ++++----- src/translation/fr-FR.js | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 95b2f72..e1f5374 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "focus-search", - "version": "3.0.1-beta6", + "version": "3.0.1-beta8", "description": "Serach FOCUS", "main": "src/index.js", "scripts": { diff --git a/src/components/results.js b/src/components/results.js index 42548ac..40c9849 100644 --- a/src/components/results.js +++ b/src/components/results.js @@ -223,7 +223,7 @@ ResultList.defaultProps = { export class ResultGroup extends PureComponent { render() { - const {customLineProps, isAllScopeResults, isGroup, ListComponent, paginateFunction, scope, valuesForResults, unitSearchDispatch, groupSelected,paginateProps} = this.props; + const {customLineProps, isAllScopeResults, isGroup, ListComponent, paginateFunction, scope, valuesForResults, unitSearchDispatch, groupSelected, paginateProps} = this.props; return (
{!isAllScopeResults && diff --git a/src/style/list.scss b/src/style/list.scss index c9b11d6..11db791 100644 --- a/src/style/list.scss +++ b/src/style/list.scss @@ -26,7 +26,7 @@ position: absolute; right:0; padding:10px 20px; - & > * { + button { margin: 0 5px; cursor: pointer; } diff --git a/src/style/pagination.scss b/src/style/pagination.scss index 4f37328..6cee31e 100644 --- a/src/style/pagination.scss +++ b/src/style/pagination.scss @@ -4,10 +4,9 @@ display: flex; justify-content: flex-end; align-items: center; - >div{ - margin-left: 30px; - margin-bottom: 10px; - text-align: center; + margin: 0 0 40px 0; + & > div { + margin-left: 30px; + text-align: center; } - } diff --git a/src/translation/fr-FR.js b/src/translation/fr-FR.js index 7472d33..86d78f1 100644 --- a/src/translation/fr-FR.js +++ b/src/translation/fr-FR.js @@ -21,7 +21,7 @@ export default { totalCount_plural: '{{count}} éléments affichés' }, sort: 'Trier', - selected: 'aucun élément sélectionné', + selected: '{{count}} élément sélectionné', selected_plural: '{{count}} éléments sélectionnés', results: { number: '{{count}} résultat', From ea654362c3767d9adebb8f6cac135f1d2c050ef4 Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 6 Jan 2017 14:10:21 +0100 Subject: [PATCH 2/2] fix console log --- src/components/searchbar.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/searchbar.js b/src/components/searchbar.js index 8b8d0cc..87c5588 100644 --- a/src/components/searchbar.js +++ b/src/components/searchbar.js @@ -29,7 +29,6 @@ export class SearchBarInput extends PureComponent { if(onChange) onChange({term: value}); } render() { - console.log(this.props.placeholder) return (