Merge branch 'fix'

This commit is contained in:
Yuri Kuznetsov
2023-04-18 10:33:30 +03:00
4 changed files with 38 additions and 9 deletions

View File

@@ -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
}
]

View File

@@ -1 +1 @@
{{#if accountIsInactive}}<del>{{/if}}{{value}}{{#if accountIsInactive}}</del>{{/if}}
{{#if accountIsInactive}}<del>{{/if}}<span title="{{value}}">{{value}}</span>{{#if accountIsInactive}}</del>{{/if}}

View File

@@ -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);
});
});

View File

@@ -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;
}
@@ -2512,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;
@@ -2552,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;
}