From b0a811c51d8294f7dd6c4a97cb71124193e14b7b Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Sat, 15 Apr 2023 10:25:47 +0300 Subject: [PATCH 1/5] stream update css fix --- frontend/less/espo/custom.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less index 086dfa1fd9..e369d0d6f0 100644 --- a/frontend/less/espo/custom.less +++ b/frontend/less/espo/custom.less @@ -2346,9 +2346,10 @@ stream-head-text-container .span { table.audited-summary-table { margin-top: 8px; background-color: transparent; + table-layout: fixed; td { - white-space: nowrap; + //white-space: nowrap; text-overflow: ellipsis; overflow: hidden; } From 7a98325eaeb6b111db9bc5ea6883878a611f40b3 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Sat, 15 Apr 2023 10:54:58 +0300 Subject: [PATCH 2/5] fix email stickable --- client/src/views/email/list.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/client/src/views/email/list.js b/client/src/views/email/list.js index e24e0af973..30970fa1ae 100644 --- a/client/src/views/email/list.js +++ b/client/src/views/email/list.js @@ -311,6 +311,13 @@ define('views/email/list', ['views/list'], function (Dep) { promise.then(view => { this.listenTo(view, 'update-ui', () => { this.stickableTop = null; + + setTimeout(() => { + $(window).trigger('scroll') + + // If search fields are not yet rendered, the value may be wrong. + this.stickableTop = null; + }, 100); }); }); From e9c55bbd43c27ec5a32cd5e1166fa4539751b945 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Sat, 15 Apr 2023 17:22:16 +0300 Subject: [PATCH 3/5] css fix --- frontend/less/espo/custom.less | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less index e369d0d6f0..9dc92e592e 100644 --- a/frontend/less/espo/custom.less +++ b/frontend/less/espo/custom.less @@ -2513,8 +2513,8 @@ table.table td.cell .html-container { h5:first-child, h6:first-child, p:first-child, - ul:first-child, - ol:first-child, + > ul:first-child, + > ol:first-child, pre:first-child, blockquote:first-child { margin-top: 0 !important; @@ -2553,13 +2553,23 @@ table.table td.cell .html-container { } p:last-child, - ul:last-child, - ol:last-child, + > ul:last-child, + > ol:last-child, blockquote:last-child, pre:last-child { margin-bottom: 0; } + ul, + ol { + > li { + ul, ol{ + margin-top: 4px; + margin-bottom: 4px; + } + } + } + ul > li { list-style-type: disc; } From e8dae0cfd1f6522019ada7cbdec3007ad45b1f2f Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Mon, 17 Apr 2023 12:20:14 +0300 Subject: [PATCH 4/5] account role title --- .../crm/res/templates/contact/fields/account-role/detail.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/modules/crm/res/templates/contact/fields/account-role/detail.tpl b/client/modules/crm/res/templates/contact/fields/account-role/detail.tpl index 3d0857a70b..77d1e1906f 100644 --- a/client/modules/crm/res/templates/contact/fields/account-role/detail.tpl +++ b/client/modules/crm/res/templates/contact/fields/account-role/detail.tpl @@ -1 +1 @@ -{{#if accountIsInactive}}{{/if}}{{value}}{{#if accountIsInactive}}{{/if}} \ No newline at end of file +{{#if accountIsInactive}}{{/if}}{{value}}{{#if accountIsInactive}}{{/if}} From 0a57e538d56b35031a5b3ba1ec1c67c2e2e144bd Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Mon, 17 Apr 2023 12:20:20 +0300 Subject: [PATCH 5/5] fix layout --- .../layouts/Contact/listForAccount.json | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/application/Espo/Modules/Crm/Resources/layouts/Contact/listForAccount.json b/application/Espo/Modules/Crm/Resources/layouts/Contact/listForAccount.json index 48f96d026c..30515fa772 100644 --- a/application/Espo/Modules/Crm/Resources/layouts/Contact/listForAccount.json +++ b/application/Espo/Modules/Crm/Resources/layouts/Contact/listForAccount.json @@ -1,5 +1,16 @@ [ - {"name":"name", "width": 35,"link":"true", "view": "crm:views/contact/fields/name-for-account"}, - {"name":"accountRole", "width": 35, "notSortable": true}, - {"name":"emailAddress"} + { + "name": "name", + "link": "true", + "view": "crm:views/contact/fields/name-for-account" + }, + { + "name": "accountRole", + "width": 28, + "notSortable": true + }, + { + "name":"emailAddress", + "width": 33 + } ]