diff --git a/frontend/src/components/Activities/EmailContent.vue b/frontend/src/components/Activities/EmailContent.vue index d4466480..a0d53724 100644 --- a/frontend/src/components/Activities/EmailContent.vue +++ b/frontend/src/components/Activities/EmailContent.vue @@ -228,6 +228,9 @@ watch(iframeRef, (iframe) => { iframe.contentWindow.document.querySelector('.email-content') let parent = emailContent.closest('html') + let theme = document.documentElement.getAttribute('data-theme') + parent.setAttribute('data-theme', theme) + iframe.style.height = parent.offsetHeight + 1 + 'px' let replyCollapsers = emailContent.querySelectorAll('.replyCollapser') diff --git a/frontend/src/components/CustomActions.vue b/frontend/src/components/CustomActions.vue index 82319924..af49ab2d 100644 --- a/frontend/src/components/CustomActions.vue +++ b/frontend/src/components/CustomActions.vue @@ -31,7 +31,7 @@ diff --git a/frontend/src/components/Modals/DealModal.vue b/frontend/src/components/Modals/DealModal.vue index 80d2e9ec..3afd2d63 100644 --- a/frontend/src/components/Modals/DealModal.vue +++ b/frontend/src/components/Modals/DealModal.vue @@ -163,7 +163,7 @@ const tabs = createResource({ if (field.fieldname == 'status') { field.fieldtype = 'Select' field.options = dealStatuses.value - field.prefix = getDealStatus(deal.status).iconColorClass + field.prefix = getDealStatus(deal.status).color } if (field.fieldtype === 'Table') { diff --git a/frontend/src/components/Modals/LeadModal.vue b/frontend/src/components/Modals/LeadModal.vue index ed27c5ef..3f7476d2 100644 --- a/frontend/src/components/Modals/LeadModal.vue +++ b/frontend/src/components/Modals/LeadModal.vue @@ -76,7 +76,7 @@ const tabs = createResource({ if (field.fieldname == 'status') { field.fieldtype = 'Select' field.options = leadStatuses.value - field.prefix = getLeadStatus(lead.status).iconColorClass + field.prefix = getLeadStatus(lead.status).color } if (field.fieldtype === 'Table') { diff --git a/frontend/src/pages/Contact.vue b/frontend/src/pages/Contact.vue index c6d08a76..f6698667 100644 --- a/frontend/src/pages/Contact.vue +++ b/frontend/src/pages/Contact.vue @@ -582,7 +582,7 @@ function getDealRowObject(deal) { annual_revenue: getFormattedCurrency('annual_revenue', deal), status: { label: deal.status, - color: getDealStatus(deal.status)?.iconColorClass, + color: getDealStatus(deal.status)?.color, }, email: deal.email, mobile_no: deal.mobile_no, diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue index 6fbc23d4..fb2af335 100644 --- a/frontend/src/pages/Deal.vue +++ b/frontend/src/pages/Deal.vue @@ -8,20 +8,22 @@