Merge branch 'hotfix/5.8.2' of ssh://172.20.0.1/var/git/espo/backend into hotfix/5.8.2

This commit is contained in:
Taras Machyshyn
2020-02-06 16:37:52 +02:00
6 changed files with 7 additions and 6 deletions
@@ -540,7 +540,7 @@ define('crm:views/record/panels/activities', ['views/record/panels/relationship'
actionViewRelatedList: function (data) {
data.url = 'Activities/' + this.model.name + '/' + this.model.id + '/' + this.name + '/list/' + data.scope;
data.title = this.translate(this.defs.label) +
' <span class="chevron-right"></span> ' + this.translate(data.scope, 'scopeNamesPlural');
' @right ' + this.translate(data.scope, 'scopeNamesPlural');
data.viewOptions = data.viewOptions || {};
data.viewOptions.massUnlinkDisabled = true;
+1 -1
View File
@@ -5,7 +5,7 @@
{{#each duplicates}}
<tr>
<td>
<a href="#{{#if _entityType}}{{_entityType}}{{else}}{{../scope}}{{/if}}/view/{{id}}" target="_BLANK">{{name}}</a>
<a href="#{{#if _entityType}}{{_entityType}}111{{else}}{{../../scope}}{{/if}}/view/{{id}}" target="_BLANK">{{name}}</a>
{{#if _entityType}}({{translate _entityType category='scopeNames'}}){{/if}}
</td>
</tr>
+1 -1
View File
@@ -379,7 +379,7 @@ define('views/site/navbar', 'view', function (Dep) {
adjustVertical: function () {
var smallScreenWidth = this.getThemeManager().getParam('screenWidthXs');
var navbarStaticItemsHeight = this.getThemeManager().getParam('navbarStaticItemsHeight') || 73;
var navbarStaticItemsHeight = this.getThemeManager().getParam('navbarStaticItemsHeight') || 85;
var $window = $(window);
+2 -1
View File
@@ -128,7 +128,8 @@
.navbar-header {
width: @navbar-width;
display: block;
margin-bottom: 3px;
margin-bottom: 6px;
margin-top: 9px;
}
.navbar-header > a.minimizer {
+1 -1
View File
@@ -94,7 +94,7 @@ table.table {
.list-kanban > div > table > thead,
.list-group-panel,
.popup-notification {
.box-shadow(3px 3px 4px rgba(0,0,0,0.13));
.box-shadow(2px 2px 4px rgba(0,0,0,0.13));
}
.stick-sub.button-container {
@@ -1,5 +1,5 @@
@navbar-inverse-bg: #546E7A;
@body-bg: #ececec;
@body-bg: #f3f3f3;
@top-navbar-bg-color: @body-bg;
@navbar-bg: @body-bg;