From 0df7c45a61a97a0a636630b156e5f68bd7dd41ed Mon Sep 17 00:00:00 2001 From: David Cook Date: Wed, 17 May 2023 12:25:18 +1000 Subject: [PATCH] Change warning red to Mojo Some templates still had this colour hardcoded. They are using angular so I didn't spend time updating them. --- .../javascripts/admin/utils/services/status_message.js.coffee | 4 ++-- app/assets/javascripts/templates/admin/save_bar.html.haml | 2 +- app/webpacker/css/admin/variables.scss | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/admin/utils/services/status_message.js.coffee b/app/assets/javascripts/admin/utils/services/status_message.js.coffee index f76d8b1b98..432c6ecf70 100644 --- a/app/assets/javascripts/admin/utils/services/status_message.js.coffee +++ b/app/assets/javascripts/admin/utils/services/status_message.js.coffee @@ -5,8 +5,8 @@ angular.module("admin.utils").factory "StatusMessage", -> alert: {style: {color: 'grey'}} notice: {style: {color: 'grey'}} success: {style: {color: '#9fc820'}} - failure: {style: {color: '#da5354'}} - error: {style: {color: '#da5354'}} + failure: {style: {color: '#C85136'}} + error: {style: {color: '#C85136'}} statusMessage: text: "" diff --git a/app/assets/javascripts/templates/admin/save_bar.html.haml b/app/assets/javascripts/templates/admin/save_bar.html.haml index b5f25eb659..08b6da5361 100644 --- a/app/assets/javascripts/templates/admin/save_bar.html.haml +++ b/app/assets/javascripts/templates/admin/save_bar.html.haml @@ -3,7 +3,7 @@ .seven.columns.alpha %h5#status-message{ ng: { show: "StatusMessage.invalidMessage == ''", style: 'StatusMessage.statusMessage.style' } } {{ StatusMessage.statusMessage.text || " " }} - %h5#status-message{ ng: { show: "StatusMessage.invalidMessage !== ''" }, style: 'color: #da5354' } + %h5#status-message{ ng: { show: "StatusMessage.invalidMessage !== ''" }, style: 'color: #C85136' } {{ StatusMessage.invalidMessage || " " }} .nine.columns.omega.text-right{ ng: { transclude: true } } diff --git a/app/webpacker/css/admin/variables.scss b/app/webpacker/css/admin/variables.scss index 8767b65aa3..edaa838ef0 100644 --- a/app/webpacker/css/admin/variables.scss +++ b/app/webpacker/css/admin/variables.scss @@ -4,7 +4,7 @@ $spree-green: #9fc820; $spree-blue: #5498da; $spree-light-blue: #eff5fc; -$warning-red: #da5354; +$warning-red: $color-5; $warning-orange: #da7f52; $bright-orange: #ffa92e; $medium-grey: #919191;