From e403a2c174def34cfa115eab038c86923482bfbf Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Fri, 6 Jan 2023 11:35:12 +0100 Subject: [PATCH] Secondary button can actually be disabled --- .../admin/order_cycles/_add_exchange_form.html.haml | 2 +- app/webpacker/css/admin/v2/components/buttons.scss | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/views/admin/order_cycles/_add_exchange_form.html.haml b/app/views/admin/order_cycles/_add_exchange_form.html.haml index 36c8e804af..72be25f5f4 100644 --- a/app/views/admin/order_cycles/_add_exchange_form.html.haml +++ b/app/views/admin/order_cycles/_add_exchange_form.html.haml @@ -3,4 +3,4 @@ {{ enterprise.name }} = "{{ enterprise.issues_summary_#{type} ? '('+enterprise.issues_summary_#{type}+')' : '' }}" -= f.submit t(".add_#{type}"), 'ng-click' => "add#{type.capitalize}($event)", 'ng-disabled' => "!new_#{type}_id || !OrderCycle.novel#{type.capitalize}(new_#{type}_id)" += f.submit t(".add_#{type}"), 'ng-click' => "add#{type.capitalize}($event)", 'ng-disabled' => "!new_#{type}_id || !OrderCycle.novel#{type.capitalize}(new_#{type}_id)", "class": "secondary" diff --git a/app/webpacker/css/admin/v2/components/buttons.scss b/app/webpacker/css/admin/v2/components/buttons.scss index 891f2f4716..6e52bd2f54 100644 --- a/app/webpacker/css/admin/v2/components/buttons.scss +++ b/app/webpacker/css/admin/v2/components/buttons.scss @@ -26,10 +26,20 @@ fieldset .filter-actions .button:hover, } &.disabled, - &[disabled] { + &[disabled], + &.disabled.secondary, + &[disabled].secondary { @include backgroundAndBorder($v2-dark-light-grey); box-shadow: none; cursor: default; + color: white; + + &:hover { + @include backgroundAndBorder($v2-dark-light-grey); + box-shadow: none; + cursor: default; + color: white; + } } &.secondary,