aboutsummaryrefslogtreecommitdiffstats
path: root/app/assets
diff options
context:
space:
mode:
authorjpl2017-03-07 15:09:32 +0100
committerjpl2017-03-07 15:09:32 +0100
commitb2d4fe9218ac1c19db1fce68cfe89e3fbf4d2e87 (patch)
treed9c40a3d0f0e697aa0a1e67352bfdadc2f172cd5 /app/assets
parent1cf6b51d1e389703a9c5c83a5dd5bc726bdcf7fb (diff)
downloadchouette-core-b2d4fe9218ac1c19db1fce68cfe89e3fbf4d2e87.tar.bz2
Refs #2728: fix disabled class regression on toolbox
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js2
-rw-r--r--app/assets/stylesheets/components/_tables.sass5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js
index 5abeb9ee5..7bf13d767 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js
@@ -26,7 +26,7 @@ class CreateModal extends Component {
<li className='st_action'>
<a
href='#'
- className={((this.props.filters.policy['vehicle_journeys.create']) ? 'disabled ' : '')}
+ className={((this.props.filters.policy['vehicle_journeys.create']) ? '' : 'disabled')}
data-toggle='modal'
data-target='#NewVehicleJourneyModal'
onClick={this.props.onOpenCreateModal}
diff --git a/app/assets/stylesheets/components/_tables.sass b/app/assets/stylesheets/components/_tables.sass
index 495e27951..dfe9d149e 100644
--- a/app/assets/stylesheets/components/_tables.sass
+++ b/app/assets/stylesheets/components/_tables.sass
@@ -111,6 +111,11 @@
&:hover
background-color: darken($red, 5%)
+ &.disabled
+ &, &[title='Supprimer'], &:hover, &:focus
+ background-color: rgba($grey, 0.3)
+ cursor: not-allowed
+
&.noselect
> ul > .st_action > a
&, &[title='Supprimer'], &:hover, &:focus