TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-28 12:11:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dashboard-refactor' into 'master'

Browse Source 
toastr refactor

See merge request mohit.panjvani/crater-web!55
This commit is contained in:
Mohit Panjwani
2019-11-19 13:47:42 +00:00
parent 2a8c1deff6 4ef5a3efb2
commit e799e986b4
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/views/dashboard/Dashboard.vue
View File

@ -635,7 +635,7 @@ export default {
return true return true
} }
if (response.data.error === 'user_email_does_not_exist') { 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 return true
} }
window.toastr['error'](this.$tc('estimates.something_went_wrong')) window.toastr['error'](this.$tc('estimates.something_went_wrong'))

2
resources/assets/js/views/estimates/Index.vue
View File

@ -595,7 +595,7 @@ export default {
return true return true
} }
if (response.data.error === 'user_email_does_not_exist') { 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 return true
} }
window.toastr['error'](this.$tc('estimates.something_went_wrong')) window.toastr['error'](this.$tc('estimates.something_went_wrong'))

2
resources/assets/js/views/estimates/View.vue
View File

@ -265,7 +265,7 @@ export default {
return true return true
} }
if (response.data.error === 'user_email_does_not_exist') { 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 return true
} }
window.toastr['error'](this.$tc('estimates.something_went_wrong')) window.toastr['error'](this.$tc('estimates.something_went_wrong'))

6
resources/assets/sass/base.scss vendored
View File

@ -116,6 +116,12 @@ code, .code {
height: 70px !important; 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 { .avatar-cropper-btn:hover {
background-color: $ls-color-primary !important; background-color: $ls-color-primary !important;
color: $white; color: $white;