diff --git a/application/Espo/Resources/metadata/themes/Violet.json b/application/Espo/Resources/metadata/themes/Violet.json index 7539d3b63b..8cccc1ac20 100644 --- a/application/Espo/Resources/metadata/themes/Violet.json +++ b/application/Espo/Resources/metadata/themes/Violet.json @@ -1,7 +1,7 @@ { "stylesheet": "client/css/espo/violet.css", "stylesheetIframe": "client/css/espo/violet-iframe.css", - "logo": "client/img/logo.svg", + "logo": "client/img/logo-light.svg", "textColor": "#424242", "chartGridColor": "#ddd", "chartTickColor": "#e8eced", diff --git a/client/res/templates/site/navbar.tpl b/client/res/templates/site/navbar.tpl index fcaf4d2c65..dbb1f8c852 100644 --- a/client/res/templates/site/navbar.tpl +++ b/client/res/templates/site/navbar.tpl @@ -12,63 +12,64 @@
diff --git a/frontend/less/espo/elements/navbar.less b/frontend/less/espo/elements/navbar.less index 65ecb372a9..2a010d32e9 100644 --- a/frontend/less/espo/elements/navbar.less +++ b/frontend/less/espo/elements/navbar.less @@ -1,8 +1,6 @@ #navbar .navbar { border-bottom-width: 0; - box-shadow: var(--navbar-box-shadow); - img.logo { max-height: 100%; } diff --git a/frontend/less/espo/layout-side.less b/frontend/less/espo/layout-side.less index 8a4bb23cf6..e0f970ae3b 100644 --- a/frontend/less/espo/layout-side.less +++ b/frontend/less/espo/layout-side.less @@ -38,6 +38,20 @@ body[data-navbar="side"] { } } } + + .navbar-left-container { + &::after { + content: ''; + position: absolute; + z-index: 1; + box-shadow: var(--navbar-box-shadow); + pointer-events: none; + top: 0; + left: 0; + right: 0; + bottom: 0; + } + } } #content { diff --git a/frontend/less/espo/layout-top.less b/frontend/less/espo/layout-top.less index 680aca72e3..0633ff8f13 100644 --- a/frontend/less/espo/layout-top.less +++ b/frontend/less/espo/layout-top.less @@ -56,6 +56,8 @@ body:not([data-navbar="side"]) { } } + box-shadow: var(--navbar-box-shadow); + @media screen and (min-width: @screen-sm-min) { border-bottom: var(--navbar-border-width) solid var(--navbar-inverse-border); diff --git a/frontend/less/violet/variables.less b/frontend/less/violet/variables.less index d93de55fcd..950cb19561 100644 --- a/frontend/less/violet/variables.less +++ b/frontend/less/violet/variables.less @@ -17,18 +17,13 @@ @brand-danger-value: #D06473; @brand-warning-value: #e4a133; -@navbar-inverse-color-value: #c6bcc9; -@navbar-inverse-bg-value: #8d6199; -@navbar-inverse-link-color-value: #F7F7F7; -@navbar-inverse-link-active-bg-value: darken(@navbar-inverse-bg-value, 10%); -@navbar-inverse-link-hover-color-value: #fff; -@navbar-inverse-link-icon-color-value: @navbar-inverse-link-color-value; -@navbar-inverse-link-icon-hover-color-value: @navbar-inverse-link-hover-color-value; -@navbar-inverse-link-hover-bg-value: #885994; -@navbar-border-width-value: 0; +@navbar-inverse-bg-value: @body-bg-value; +@navbar-inverse-link-active-bg-value: #cdd3df; +@navbar-inverse-link-hover-bg-value: #d0d9e5; +@navbar-inverse-color-value: #8d8f93; -@login-panel-heading-bg-value: @brand-primary-value; +@navbar-box-shadow-value: @default-box-shadow-value; @panel-default-bg-value: @panel-bg-value; @panel-default-text-value: #787581; @@ -53,5 +48,6 @@ @dropdown-border-width-value: var(--1px); @panel-border-width-value: 0px; +@navbar-border-width-value: 0px; @default-box-shadow-value: 2px 2px 4px rgba(0,0,0,0.09);