From 39170a5765fa5e3a34b626f221623d961ede13aa Mon Sep 17 00:00:00 2001 From: yogesh_gohil Date: Tue, 19 Nov 2019 16:23:30 +0530 Subject: [PATCH 1/2] change checkbox color --- resources/assets/sass/base.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/resources/assets/sass/base.scss b/resources/assets/sass/base.scss index 22a99a11..e3ac96b3 100644 --- a/resources/assets/sass/base.scss +++ b/resources/assets/sass/base.scss @@ -116,6 +116,12 @@ code, .code { height: 70px !important; } +.custom-control-input:checked ~ .custom-control-label::before { + color: #fff; + border-color: $ls-color-primary !important; + background-color: $ls-color-primary !important; +} + .avatar-cropper-btn:hover { background-color: $ls-color-primary !important; color: $white; From 360b353ab13f7da8daa51b1d51bc5db3808ba56a Mon Sep 17 00:00:00 2001 From: Jay_Makwana Date: Tue, 19 Nov 2019 18:40:41 +0530 Subject: [PATCH 2/2] refactor notification of user have no email --- resources/assets/js/views/dashboard/Dashboard.vue | 2 +- resources/assets/js/views/estimates/Index.vue | 2 +- resources/assets/js/views/estimates/View.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/assets/js/views/dashboard/Dashboard.vue b/resources/assets/js/views/dashboard/Dashboard.vue index caf7889c..7c4eae6b 100644 --- a/resources/assets/js/views/dashboard/Dashboard.vue +++ b/resources/assets/js/views/dashboard/Dashboard.vue @@ -635,7 +635,7 @@ export default { return true } if (response.data.error === 'user_email_does_not_exist') { - window.toastr['success'](this.$tc('estimates.user_email_does_not_exist')) + window.toastr['error'](this.$tc('estimates.user_email_does_not_exist')) return true } window.toastr['error'](this.$tc('estimates.something_went_wrong')) diff --git a/resources/assets/js/views/estimates/Index.vue b/resources/assets/js/views/estimates/Index.vue index 904cd3df..2ca0cd1d 100644 --- a/resources/assets/js/views/estimates/Index.vue +++ b/resources/assets/js/views/estimates/Index.vue @@ -595,7 +595,7 @@ export default { return true } if (response.data.error === 'user_email_does_not_exist') { - window.toastr['success'](this.$tc('estimates.user_email_does_not_exist')) + window.toastr['error'](this.$tc('estimates.user_email_does_not_exist')) return true } window.toastr['error'](this.$tc('estimates.something_went_wrong')) diff --git a/resources/assets/js/views/estimates/View.vue b/resources/assets/js/views/estimates/View.vue index 9d74e0c5..de92043a 100644 --- a/resources/assets/js/views/estimates/View.vue +++ b/resources/assets/js/views/estimates/View.vue @@ -265,7 +265,7 @@ export default { return true } if (response.data.error === 'user_email_does_not_exist') { - window.toastr['success'](this.$tc('estimates.user_email_does_not_exist')) + window.toastr['error'](this.$tc('estimates.user_email_does_not_exist')) return true } window.toastr['error'](this.$tc('estimates.something_went_wrong'))