aboutsummaryrefslogtreecommitdiffstats
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorjpl2016-11-07 11:18:24 +0100
committerjpl2016-11-07 11:18:24 +0100
commitbee4a67f9791e7ca250d9b3cd1b3c8055ac3705f (patch)
treead071c1a204ecf76623729f771cf93a43d0194f2 /app/assets/javascripts
parent6ab5dda8151d45859590cd10015d0886b2f45093 (diff)
downloadchouette-core-bee4a67f9791e7ca250d9b3cd1b3c8055ac3705f.tar.bz2
update list-grou-items components integration
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/es6_browserified/components/Todo.js11
-rw-r--r--app/assets/javascripts/es6_browserified/containers/AddTodo.js5
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>