diff options
| author | jpl | 2016-11-07 11:18:24 +0100 |
|---|---|---|
| committer | Thomas Haddad | 2016-11-08 18:15:11 +0100 |
| commit | 6cdab4609caf598589ce6033e181f5c5cc363114 (patch) | |
| tree | 8fc1650273bac5b0438d79a8e36247f686fc86ec /app/assets/javascripts | |
| parent | 949e09cb05b600072e505176c083b4c22fe1db9c (diff) | |
| download | chouette-core-6cdab4609caf598589ce6033e181f5c5cc363114.tar.bz2 | |
update list-grou-items components integration
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/es6_browserified/components/Todo.js | 11 | ||||
| -rw-r--r-- | app/assets/javascripts/es6_browserified/containers/AddTodo.js | 5 |
2 files changed, 8 insertions, 8 deletions
diff --git a/app/assets/javascripts/es6_browserified/components/Todo.js b/app/assets/javascripts/es6_browserified/components/Todo.js index a64c38c63..84426155d 100644 --- a/app/assets/javascripts/es6_browserified/components/Todo.js +++ b/app/assets/javascripts/es6_browserified/components/Todo.js @@ -1,14 +1,15 @@ var React = require('react') var PropTypes = require('react').PropTypes +const firstBlock = {display: 'inline-block', verticalAlign: 'middle', width: '75%'} +const secondBlock = {display: 'inline-block', verticalAlign: 'middle', width: '25%', textAlign: 'right'} + const Todo = (props) => ( - <div - className="list-group-item" - > - <div> + <div className="list-group-item"> + <div style={firstBlock}> <em className="small">{props.id}</em> </div> - <div className="text-right"> + <div style={secondBlock}> <div className="btn-group btn-group-sm"> <div className="btn btn-default"> <span className="fa fa-times"></span> diff --git a/app/assets/javascripts/es6_browserified/containers/AddTodo.js b/app/assets/javascripts/es6_browserified/containers/AddTodo.js index 21b5c88d6..ddaedf8f6 100644 --- a/app/assets/javascripts/es6_browserified/containers/AddTodo.js +++ b/app/assets/javascripts/es6_browserified/containers/AddTodo.js @@ -6,14 +6,13 @@ let AddTodo = ({ dispatch }) => { let input return ( - <div> + <div className="clearfix" style={{marginBottom: 10}}> <form onSubmit={e => { e.preventDefault() dispatch(addTodo()) }}> <button type="submit" className="btn btn-primary btn-xs pull-right"> - <span className="fa fa-plus"></span> - Ajouter un arrĂȘt // i18N? + <span className="fa fa-plus"></span> Ajouter un arrĂȘt </button> </form> </div> |
