EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
Style fix
Yuriib8c07b6006f8
diff --git a/client/src/views/modals/resolve-save-conflict.js b/client/src/views/modals/resolve-save-conflict.jsindex 6164cde343..4876f25e36 100644--- a/client/src/views/modals/resolve-save-conflict.js+++ b/client/src/views/modals/resolve-save-conflict.js@@ -49,10 +49,10 @@ class ResolveSaveConflictModalView extends ModalView {<tbody>{{#each dataList}}<tr>- <td class="cell cell-nowrap">- <span>- {{translate field category='fields' scope=../entityType}}- </span>+ <td class="cell cell-nowrap ">+ <div class="detail-field-container">+ {{translate field category='fields' scope=../entityType}}+ </div></td><td class="cell"><select class="form-control" data-name="resolution" data-field="{{field}}">@@ -60,7 +60,11 @@ class ResolveSaveConflictModalView extends ModalView {</select></td><td class="cell">- <div data-name="field" data-field="{{field}}">+ <div+ data-name="field"+ data-field="{{field}}"+ class="detail-field-container"+ >{{{var viewKey ../this}}}</div></td>