aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorjpl2017-05-16 16:37:12 +0200
committerjpl2017-05-16 16:37:18 +0200
commit1997ae102977f7d3d5e58a804415acf40e0cb08e (patch)
tree45b7f0754e359366aad7b9f480039af6531d2666 /app
parent34df7a4608cb5ddea8c7fddc63143c921062168c (diff)
downloadchouette-core-1997ae102977f7d3d5e58a804415acf40e0cb08e.tar.bz2
Refs #3402: fix VJ tt display
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js8
-rw-r--r--app/assets/stylesheets/modules/_vj_collection.sass7
2 files changed, 12 insertions, 3 deletions
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
index c39c81bb1..de370ac1b 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
@@ -52,9 +52,11 @@ class VehicleJourney extends Component {
<div className='th'>
<div className='strong mb-xs'>{this.props.value.objectid ? actions.humanOID(this.props.value.objectid) : '-'}</div>
<div>{actions.humanOID(this.props.value.journey_pattern.objectid)}</div>
- {this.props.value.time_tables.map((tt, i)=>
- <div key={i}>{this.timeTableURL(tt)}</div>
- )}
+ <div>
+ {this.props.value.time_tables.map((tt, i)=>
+ <span key={i} className='vj_tt'>{this.timeTableURL(tt)}</span>
+ )}
+ </div>
{(this.props.filters.policy['vehicle_journeys.edit'] == true) &&
<div className={(this.props.value.deletable ? 'disabled ' : '') + 'checkbox'}>
diff --git a/app/assets/stylesheets/modules/_vj_collection.sass b/app/assets/stylesheets/modules/_vj_collection.sass
index 8ff983310..56769e52b 100644
--- a/app/assets/stylesheets/modules/_vj_collection.sass
+++ b/app/assets/stylesheets/modules/_vj_collection.sass
@@ -105,6 +105,13 @@
.t2e-item
position: relative
+ .th .vj_tt
+ display: inline-block
+ vertical-align: top
+
+ + .vj_tt
+ margin-left: 5px
+
&.has-error
&:before
content: ''