From d2a8cd961f83e48c61a1425ff2bd11d55b1dae3f Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 26 Apr 2018 18:03:56 +0300 Subject: [PATCH] theme fixes --- .../Espo/Resources/metadata/themes/Espo.json | 2 +- .../Resources/metadata/themes/EspoRtl.json | 2 +- .../metadata/themes/EspoVertical.json | 1 + .../Resources/metadata/themes/Hazyblue.json | 2 +- .../metadata/themes/HazyblueVertical.json | 1 + .../Resources/metadata/themes/Sakura.json | 2 +- .../metadata/themes/SakuraVertical.json | 1 + .../Resources/metadata/themes/Violet.json | 2 +- .../metadata/themes/VioletVertical.json | 1 + client/img/logo-33.png | Bin 0 -> 2728 bytes client/img/logo.png | Bin 8452 -> 3523 bytes frontend/less/espo-vertical/variables.less | 3 ++- frontend/less/espo/custom.less | 2 +- frontend/less/espo/layout.less | 21 +++++++++++++++++- frontend/less/espo/variables.less | 6 ++--- 15 files changed, 35 insertions(+), 11 deletions(-) create mode 100644 client/img/logo-33.png diff --git a/application/Espo/Resources/metadata/themes/Espo.json b/application/Espo/Resources/metadata/themes/Espo.json index 3457af895e..2c8df4a991 100644 --- a/application/Espo/Resources/metadata/themes/Espo.json +++ b/application/Espo/Resources/metadata/themes/Espo.json @@ -3,7 +3,7 @@ "stylesheetIframe": "client/css/espo/espo-iframe.css", "dashboardCellHeight": 155, "dashboardCellMargin": 19, - "navbarHeight": 44, + "navbarHeight": 43, "modalFooterAtTheTop": true, "modalFullHeight": true, "fontSize": 14, diff --git a/application/Espo/Resources/metadata/themes/EspoRtl.json b/application/Espo/Resources/metadata/themes/EspoRtl.json index 8187ec8b15..4147ea4b68 100644 --- a/application/Espo/Resources/metadata/themes/EspoRtl.json +++ b/application/Espo/Resources/metadata/themes/EspoRtl.json @@ -3,7 +3,7 @@ "stylesheetIframe": "client/css/espo/espo-rtl-iframe.css", "dashboardCellHeight": 155, "dashboardCellMargin": 19, - "navbarHeight": 44, + "navbarHeight": 43, "modalFooterAtTheTop": true, "modalFullHeight": true, "fontSize": 14, diff --git a/application/Espo/Resources/metadata/themes/EspoVertical.json b/application/Espo/Resources/metadata/themes/EspoVertical.json index 39f81c4468..b607b746cb 100644 --- a/application/Espo/Resources/metadata/themes/EspoVertical.json +++ b/application/Espo/Resources/metadata/themes/EspoVertical.json @@ -10,6 +10,7 @@ "modalFooterAtTheTop": true, "modalFullHeight": true, "fontSize": 14, + "logo": "client/img/logo-39.png", "textColor": "#333", "chartGridColor": "#ddd", "chartTickColor": "#e8eced", diff --git a/application/Espo/Resources/metadata/themes/Hazyblue.json b/application/Espo/Resources/metadata/themes/Hazyblue.json index 4d994d6621..f80267134c 100644 --- a/application/Espo/Resources/metadata/themes/Hazyblue.json +++ b/application/Espo/Resources/metadata/themes/Hazyblue.json @@ -3,7 +3,7 @@ "stylesheetIframe": "client/css/espo/hazyblue-iframe.css", "dashboardCellHeight": 155, "dashboardCellMargin": 19, - "navbarHeight": 44, + "navbarHeight": 43, "modalFooterAtTheTop": true, "modalFullHeight": true, "fontSize": 14, diff --git a/application/Espo/Resources/metadata/themes/HazyblueVertical.json b/application/Espo/Resources/metadata/themes/HazyblueVertical.json index 41fd6b4f72..6f7a25e89b 100644 --- a/application/Espo/Resources/metadata/themes/HazyblueVertical.json +++ b/application/Espo/Resources/metadata/themes/HazyblueVertical.json @@ -10,6 +10,7 @@ "modalFooterAtTheTop": true, "modalFullHeight": true, "fontSize": 14, + "logo": "client/img/logo-33.png", "textColor": "#333", "chartGridColor": "#ddd", "chartTickColor": "#e8eced", diff --git a/application/Espo/Resources/metadata/themes/Sakura.json b/application/Espo/Resources/metadata/themes/Sakura.json index ae4785c682..c5b1346ff8 100644 --- a/application/Espo/Resources/metadata/themes/Sakura.json +++ b/application/Espo/Resources/metadata/themes/Sakura.json @@ -3,7 +3,7 @@ "stylesheetIframe": "client/css/espo/sakura-iframe.css", "dashboardCellHeight": 155, "dashboardCellMargin": 19, - "navbarHeight": 44, + "navbarHeight": 43, "modalFooterAtTheTop": true, "modalFullHeight": true, "fontSize": 14, diff --git a/application/Espo/Resources/metadata/themes/SakuraVertical.json b/application/Espo/Resources/metadata/themes/SakuraVertical.json index 8e419a0d22..8fa12b4b73 100644 --- a/application/Espo/Resources/metadata/themes/SakuraVertical.json +++ b/application/Espo/Resources/metadata/themes/SakuraVertical.json @@ -10,6 +10,7 @@ "modalFooterAtTheTop": true, "modalFullHeight": true, "fontSize": 14, + "logo": "client/img/logo-33.png", "textColor": "#333", "chartGridColor": "#ddd", "chartTickColor": "#e8eced", diff --git a/application/Espo/Resources/metadata/themes/Violet.json b/application/Espo/Resources/metadata/themes/Violet.json index 7f36d4b3ac..105ef4991b 100644 --- a/application/Espo/Resources/metadata/themes/Violet.json +++ b/application/Espo/Resources/metadata/themes/Violet.json @@ -3,7 +3,7 @@ "stylesheetIframe": "client/css/espo/violet-iframe.css", "dashboardCellHeight": 155, "dashboardCellMargin": 19, - "navbarHeight": 44, + "navbarHeight": 43, "modalFooterAtTheTop": true, "modalFullHeight": true, "textColor": "#333", diff --git a/application/Espo/Resources/metadata/themes/VioletVertical.json b/application/Espo/Resources/metadata/themes/VioletVertical.json index ce896ad24f..fbb357e3d7 100644 --- a/application/Espo/Resources/metadata/themes/VioletVertical.json +++ b/application/Espo/Resources/metadata/themes/VioletVertical.json @@ -10,6 +10,7 @@ "modalFooterAtTheTop": true, "modalFullHeight": true, "fontSize": 14, + "logo": "client/img/logo-33.png", "textColor": "#333", "chartGridColor": "#ddd", "chartTickColor": "#e8eced", diff --git a/client/img/logo-33.png b/client/img/logo-33.png new file mode 100644 index 0000000000000000000000000000000000000000..448e7fcfb07742ffb2cf16b08ba9eee2b6de43db GIT binary patch literal 2728 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 diff --git a/frontend/less/espo-vertical/variables.less b/frontend/less/espo-vertical/variables.less index a7d939d63c..442d937745 100644 --- a/frontend/less/espo-vertical/variables.less +++ b/frontend/less/espo-vertical/variables.less @@ -1,4 +1,5 @@ @navbar-width: 153px; @navbar-minimized-width: 39px; @tob-bar-height: 30px; -@top-navbar-bg-color: @main-gray; \ No newline at end of file +@top-navbar-bg-color: @main-gray; +@navbar-color-border-width: 2px; \ No newline at end of file diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less index d61d1c726d..8e25bb3b62 100644 --- a/frontend/less/espo/custom.less +++ b/frontend/less/espo/custom.less @@ -1184,7 +1184,7 @@ label.attach-file-label { .stick-sub { position: fixed; top: 0; - margin: 44px 0 0 -@container-padding; + margin: @navbar-height 0 0 -@container-padding; z-index: 4; } diff --git a/frontend/less/espo/layout.less b/frontend/less/espo/layout.less index 8fb624ccda..bd7182d6a6 100644 --- a/frontend/less/espo/layout.less +++ b/frontend/less/espo/layout.less @@ -29,7 +29,6 @@ border-width: 0 0 1px; } - body { padding-top: 55px; } @@ -77,6 +76,12 @@ body > footer { body > footer { margin-top: 23px; } + + #header .navbar li.tab > a { + border-left-width: @navbar-color-border-width; + border-left-style: solid; + border-color: transparent; + } } #header a.minimizer { @@ -91,6 +96,20 @@ body > footer { .more-icon { top: 3px; } + + #header .navbar ul.nav > li.tab > a { + border-bottom-width: @navbar-color-border-width; + border-bottom-style: solid; + border-color: transparent; + padding-bottom: floor(@navbar-padding-vertical - @navbar-color-border-width); + } + + #header .navbar ul.dropdown-menu > li.tab > a { + border-left-width: @navbar-color-border-width; + border-left-style: solid; + border-color: transparent; + padding-left: 20px - @navbar-color-border-width; + } } body > #header ul.tabs span.short-label { diff --git a/frontend/less/espo/variables.less b/frontend/less/espo/variables.less index 15af5cf618..a06b27a205 100644 --- a/frontend/less/espo/variables.less +++ b/frontend/less/espo/variables.less @@ -42,7 +42,7 @@ @padding-base-horizontal: 10px; -@navbar-height: 44px; +@navbar-height: 43px; @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2); @brand-primary: #5184B0; @@ -127,7 +127,7 @@ @login-panel-heading-bg: @navbar-inverse-bg; @logo-width: 181px; -@logo-height: 44px; +@logo-height: @navbar-height; @dashlet-unit-height: 155px; @@ -139,4 +139,4 @@ @modal-title-line-height: floor(@font-size-h4 * @line-height-base); -@navbar-color-border-width: 2px; +@navbar-color-border-width: 4px;