diff --git a/application/Espo/Resources/i18n/en_US/Global.json b/application/Espo/Resources/i18n/en_US/Global.json index dab9668828..41df221e99 100644 --- a/application/Espo/Resources/i18n/en_US/Global.json +++ b/application/Espo/Resources/i18n/en_US/Global.json @@ -532,6 +532,8 @@ } }, "themes": { - "Espo": "Espo" + "Espo": "Espo", + "Sacura": "Sacura", + "EspoVertical": "Espo Vertical" } } diff --git a/application/Espo/Resources/metadata/entityDefs/Settings.json b/application/Espo/Resources/metadata/entityDefs/Settings.json index 8fd9f311ff..7768d5e83e 100644 --- a/application/Espo/Resources/metadata/entityDefs/Settings.json +++ b/application/Espo/Resources/metadata/entityDefs/Settings.json @@ -242,7 +242,7 @@ "theme": { "type": "enum", "view": "Settings.Fields.Theme", - "translation": "themes" + "translation": "Global.themes" } } } diff --git a/application/Espo/Resources/metadata/themes/EspoVertical.json b/application/Espo/Resources/metadata/themes/EspoVertical.json index 6d5cafc07f..ed4ee0df26 100644 --- a/application/Espo/Resources/metadata/themes/EspoVertical.json +++ b/application/Espo/Resources/metadata/themes/EspoVertical.json @@ -2,6 +2,6 @@ "stylesheet": "client/css/espo-vertical.css", "navbarIsVertical": true, "navbarStaticItemsHeight": 44, - "recordTopButtonsStickTop": 26, + "recordTopButtonsStickTop": 61, "recordTopButtonsBlockHeight": 21 } \ No newline at end of file diff --git a/frontend/client/src/views/record/detail.js b/frontend/client/src/views/record/detail.js index 75e82c1ed9..6684729302 100644 --- a/frontend/client/src/views/record/detail.js +++ b/frontend/client/src/views/record/detail.js @@ -144,8 +144,8 @@ Espo.define('Views.Record.Detail', 'Views.Record.Base', function (Dep) { var theme = this.getConfig().get('theme'); var themeDefs = this.getMetadata().get('themes.' + theme) || {}; - var stickTop = 62 ;themeDefs.stickTop || 62; - var blockHeight = 21;themeDefs.blockHeight || 21; + var stickTop = themeDefs.stickTop || 62; + var blockHeight = themeDefs.blockHeight || 21; var $block = $('
').css('height', blockHeight + 'px').html(' ').hide().insertAfter($container); var $record = this.getView('record').$el; diff --git a/frontend/less/espo-vertical/layout.less b/frontend/less/espo-vertical/layout.less index 57704edcff..0d5ff9f0d0 100644 --- a/frontend/less/espo-vertical/layout.less +++ b/frontend/less/espo-vertical/layout.less @@ -19,8 +19,6 @@ body > .content { margin-left: @navbarWidth; } - - body { padding-top: @topBarHeight; }