From f554a6f64941e58945eb1b6e43ff4ffe859480e1 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Tue, 4 Feb 2020 16:57:29 +0200 Subject: [PATCH 1/4] fix duplicate link --- client/res/templates/modals/duplicate.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/res/templates/modals/duplicate.tpl b/client/res/templates/modals/duplicate.tpl index 0f3f0bdfee..22ba39044e 100644 --- a/client/res/templates/modals/duplicate.tpl +++ b/client/res/templates/modals/duplicate.tpl @@ -5,7 +5,7 @@ {{#each duplicates}} - {{name}} + {{name}} {{#if _entityType}}({{translate _entityType category='scopeNames'}}){{/if}} From b89349d0ee2c48161db1d099acb534bcb56cc32f Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Wed, 5 Feb 2020 17:09:00 +0200 Subject: [PATCH 2/4] navbar logo padding --- client/src/views/site/navbar.js | 2 +- frontend/less/espo-vertical/layout.less | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/client/src/views/site/navbar.js b/client/src/views/site/navbar.js index 190a12fa3d..b6852400fb 100644 --- a/client/src/views/site/navbar.js +++ b/client/src/views/site/navbar.js @@ -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); diff --git a/frontend/less/espo-vertical/layout.less b/frontend/less/espo-vertical/layout.less index afc04460f1..1918fcc335 100644 --- a/frontend/less/espo-vertical/layout.less +++ b/frontend/less/espo-vertical/layout.less @@ -128,7 +128,8 @@ .navbar-header { width: @navbar-width; display: block; - margin-bottom: 3px; + margin-bottom: 6px; + margin-top: 9px; } .navbar-header > a.minimizer { From 2c8407581c99a7f6c7feaf0e8d5ef278d0e4c479 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Thu, 6 Feb 2020 11:19:10 +0200 Subject: [PATCH 3/4] hazyblue background lighter --- frontend/less/hazyblue-vertical/custom.less | 2 +- frontend/less/hazyblue-vertical/variables.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/less/hazyblue-vertical/custom.less b/frontend/less/hazyblue-vertical/custom.less index bb5ca92105..504bff9e42 100644 --- a/frontend/less/hazyblue-vertical/custom.less +++ b/frontend/less/hazyblue-vertical/custom.less @@ -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 { diff --git a/frontend/less/hazyblue-vertical/variables.less b/frontend/less/hazyblue-vertical/variables.less index 90ecb51683..edd5b8cf1a 100644 --- a/frontend/less/hazyblue-vertical/variables.less +++ b/frontend/less/hazyblue-vertical/variables.less @@ -1,5 +1,5 @@ @navbar-inverse-bg: #546E7A; -@body-bg: #ececec; +@body-bg: #f3f3f3; @top-navbar-bg-color: @body-bg; @navbar-bg: @body-bg; From 8eac39bd50d843a16a8a97f8bfd34578b3fa14a6 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Thu, 6 Feb 2020 12:47:32 +0200 Subject: [PATCH 4/4] fix actitiviews view list html --- client/modules/crm/src/views/record/panels/activities.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/modules/crm/src/views/record/panels/activities.js b/client/modules/crm/src/views/record/panels/activities.js index a7cece1958..f867847b3d 100644 --- a/client/modules/crm/src/views/record/panels/activities.js +++ b/client/modules/crm/src/views/record/panels/activities.js @@ -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) + - ' ' + this.translate(data.scope, 'scopeNamesPlural'); + ' @right ' + this.translate(data.scope, 'scopeNamesPlural'); data.viewOptions = data.viewOptions || {}; data.viewOptions.massUnlinkDisabled = true;