aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjpl2017-06-21 10:10:45 +0200
committerjpl2017-06-21 10:10:45 +0200
commitbad80527a2083027835f072411a4eab8ac4df745 (patch)
tree7584ed1bd7a2e83ab813d7df51e684db68ade7fa
parentb749813066da2353dfd5cf938f961234a68153ce (diff)
downloadchouette-core-bad80527a2083027835f072411a4eab8ac4df745.tar.bz2
Refs #3804: updating OID formatting on VJ info modal
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js2
-rw-r--r--app/assets/stylesheets/components/_dropdown.sass2
-rw-r--r--app/assets/stylesheets/components/_tables.sass2
3 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js
index 932c56532..9919ee9dd 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js
@@ -70,7 +70,7 @@ class EditVehicleJourney extends Component {
<input
type='text'
className='form-control'
- value={(this.props.modal.modalProps.vehicleJourney.journey_pattern.objectid) + ' - ' + (this.props.modal.modalProps.vehicleJourney.journey_pattern.name)}
+ value={actions.humanOID(this.props.modal.modalProps.vehicleJourney.journey_pattern.objectid) + ' - ' + (this.props.modal.modalProps.vehicleJourney.journey_pattern.name)}
disabled={true}
/>
</div>
diff --git a/app/assets/stylesheets/components/_dropdown.sass b/app/assets/stylesheets/components/_dropdown.sass
index 99dc6292e..8a8d69063 100644
--- a/app/assets/stylesheets/components/_dropdown.sass
+++ b/app/assets/stylesheets/components/_dropdown.sass
@@ -3,6 +3,8 @@
//-------------//
.dropdown-menu
+ z-index: 2001
+
> li > button
display: block
width: 100%
diff --git a/app/assets/stylesheets/components/_tables.sass b/app/assets/stylesheets/components/_tables.sass
index 4e1e073da..e3a33e131 100644
--- a/app/assets/stylesheets/components/_tables.sass
+++ b/app/assets/stylesheets/components/_tables.sass
@@ -148,7 +148,7 @@
background-color: #fff
box-shadow: 0 0 3px $darkgrey
position: fixed
- z-index: 999
+ z-index: 2000
right: 50px
bottom: 15px