Skip to content

EspoCRM – Open Source CRM Application

theme impr

Yuri Kuznetsov074eb7f5afdc
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 @@
</div>
<div class="navbar-collapse navbar-body">
- <ul class="nav navbar-nav tabs">
- {{#each tabDefsList1}}
- <li
- data-name="{{name}}"
- class="not-in-more tab{{#if isGroup}} tab-group dropdown{{/if}}{{#if isDivider}} tab-divider{{/if}}"
- >
- {{#if isDivider}}
- <div class="{{aClassName}}"><span class="label-text">{{#if label}}{{label}}{{/if}}</span></div>
- {{/if}}
- {{#unless isDivider}}
- <a
- {{#if link}}href="{{link}}"{{else}}role="button"{{/if}}
- class="{{aClassName}}"
- {{#if color}}style="border-color: {{color}}"{{/if}}
- {{#if isGroup}}
- id="nav-tab-group-{{name}}"
- data-toggle="dropdown"
- {{/if}}
- >
+ <div class="navbar-left-container">
+ <ul class="nav navbar-nav tabs">
+ {{#each tabDefsList1}}
+ <li
+ data-name="{{name}}"
+ class="not-in-more tab{{#if isGroup}} tab-group dropdown{{/if}}{{#if isDivider}} tab-divider{{/if}}"
+ >
+ {{#if isDivider}}
+ <div class="{{aClassName}}"><span class="label-text">{{#if label}}{{label}}{{/if}}</span></div>
+ {{/if}}
+ {{#unless isDivider}}
+ <a
+ {{#if link}}href="{{link}}"{{else}}role="button"{{/if}}
+ class="{{aClassName}}"
+ {{#if color}}style="border-color: {{color}}"{{/if}}
+ {{#if isGroup}}
+ id="nav-tab-group-{{name}}"
+ data-toggle="dropdown"
+ {{/if}}
+ >
<span class="short-label"{{#if label}} title="{{label}}"{{/if}}{{#if color}} style="color: {{color}}"{{/if}}>
{{#if iconClass}}
- <span class="{{iconClass}}"></span>
+ <span class="{{iconClass}}"></span>
{{else}}
- {{#if colorIconClass}}
- <span class="{{colorIconClass}}" style="color: {{color}}"></span>
- {{/if}}
- <span class="short-label-text">{{shortLabel}}</span>
+ {{#if colorIconClass}}
+ <span class="{{colorIconClass}}" style="color: {{color}}"></span>
+ {{/if}}
+ <span class="short-label-text">{{shortLabel}}</span>
{{/if}}
</span>
- {{#if label}}
- <span class="full-label">{{label}}</span>
- {{/if}}
- {{#if html}}{{{html}}}{{/if}}
+ {{#if label}}
+ <span class="full-label">{{label}}</span>
+ {{/if}}
+ {{#if html}}{{{html}}}{{/if}}
- {{#if isGroup}}
- <span class="fas fa-caret-right group-caret"></span>
- {{/if}}
- </a>
- {{/unless}}
- {{#if isGroup}}
- <ul class="dropdown-menu" role="menu" aria-labelledby="nav-tab-group-{{name}}">
- {{#each itemList}}
- {{#if isDivider}}
- <li class="divider"></li>
- {{else}}
- <li data-name="{{name}}" class="in-group tab">
- <a
- {{#if link}}href="{{link}}"{{else}}role="button"{{/if}}
- class="{{aClassName}}"
- {{#if color}}
- style="border-color: {{color}}"
- {{/if}}
- {{#if isGroup}}
- id="nav-tab-group-{{name}}"
- data-toggle="dropdown"
- {{/if}}
- >
+ {{#if isGroup}}
+ <span class="fas fa-caret-right group-caret"></span>
+ {{/if}}
+ </a>
+ {{/unless}}
+ {{#if isGroup}}
+ <ul class="dropdown-menu" role="menu" aria-labelledby="nav-tab-group-{{name}}">
+ {{#each itemList}}
+ {{#if isDivider}}
+ <li class="divider"></li>
+ {{else}}
+ <li data-name="{{name}}" class="in-group tab">
+ <a
+ {{#if link}}href="{{link}}"{{else}}role="button"{{/if}}
+ class="{{aClassName}}"
+ {{#if color}}
+ style="border-color: {{color}}"
+ {{/if}}
+ {{#if isGroup}}
+ id="nav-tab-group-{{name}}"
+ data-toggle="dropdown"
+ {{/if}}
+ >
<span class="short-label"{{#if color}} style="color: {{color}}"{{/if}}>
{{#if iconClass}}
<span class="{{iconClass}}"></span>
@@ -79,82 +80,82 @@
<span class="short-label-text">&nbsp;</span>
{{/if}}
</span>
- <span class="full-label">{{label}}</span>
- </a>
- </li>
- {{/if}}
- {{/each}}
- </ul>
- {{/if}}
- </li>
- {{/each}}
- <li class="dropdown more{{#unless tabDefsList2.length}} hidden{{/unless}}">
- <a
- id="nav-more-tabs-dropdown"
- class="dropdown-toggle"
- data-toggle="dropdown"
- role="button"
- tabindex="0"
- ><span class="fas fa-ellipsis-h more-icon"></span></a>
- <ul class="dropdown-menu more-dropdown-menu" role="menu" aria-labelledby="nav-more-tabs-dropdown">
- {{#each tabDefsList2}}
- <li
- data-name="{{name}}"
- class="in-more tab{{#if className}} {{className}}{{/if}}{{#if isGroup}} dropdown tab-group{{/if}}{{#if isDivider}} tab-divider{{/if}}"
- >
- {{#if isDivider}}
- <div class="{{aClassName}}{{#unless label}} no-text{{/unless}}"><span class="label-text">{{#if label}}{{label}}{{/if}}</span></div>
+ <span class="full-label">{{label}}</span>
+ </a>
+ </li>
+ {{/if}}
+ {{/each}}
+ </ul>
{{/if}}
- {{#unless isDivider}}
- <a
- {{#if link}}href="{{link}}"{{else}}role="button"{{/if}}
- tabindex="0"
- class="{{aClassName}}"
- {{#if color}} style="border-color: {{color}}"{{/if}}
- {{#if isGroup}}
- id="nav-tab-group-{{name}}"
- data-toggle="dropdown"
- {{/if}}
- >
+ </li>
+ {{/each}}
+ <li class="dropdown more{{#unless tabDefsList2.length}} hidden{{/unless}}">
+ <a
+ id="nav-more-tabs-dropdown"
+ class="dropdown-toggle"
+ data-toggle="dropdown"
+ role="button"
+ tabindex="0"
+ ><span class="fas fa-ellipsis-h more-icon"></span></a>
+ <ul class="dropdown-menu more-dropdown-menu" role="menu" aria-labelledby="nav-more-tabs-dropdown">
+ {{#each tabDefsList2}}
+ <li
+ data-name="{{name}}"
+ class="in-more tab{{#if className}} {{className}}{{/if}}{{#if isGroup}} dropdown tab-group{{/if}}{{#if isDivider}} tab-divider{{/if}}"
+ >
+ {{#if isDivider}}
+ <div class="{{aClassName}}{{#unless label}} no-text{{/unless}}"><span class="label-text">{{#if label}}{{label}}{{/if}}</span></div>
+ {{/if}}
+ {{#unless isDivider}}
+ <a
+ {{#if link}}href="{{link}}"{{else}}role="button"{{/if}}
+ tabindex="0"
+ class="{{aClassName}}"
+ {{#if color}} style="border-color: {{color}}"{{/if}}
+ {{#if isGroup}}
+ id="nav-tab-group-{{name}}"
+ data-toggle="dropdown"
+ {{/if}}
+ >
<span class="short-label"{{#if color}} style="color: {{color}}"{{/if}}>
{{#if iconClass}}
- <span class="{{iconClass}}"></span>
+ <span class="{{iconClass}}"></span>
{{else}}
- {{#if colorIconClass}}
- <span class="{{colorIconClass}}" style="color: {{color}}"></span>
- {{/if}}
- <span class="short-label-text">&nbsp;</span>
+ {{#if colorIconClass}}
+ <span class="{{colorIconClass}}" style="color: {{color}}"></span>
+ {{/if}}
+ <span class="short-label-text">&nbsp;</span>
{{/if}}
</span>
- {{#if label}}
- <span class="full-label">{{label}}</span>
- {{/if}}
- {{#if html}}{{{html}}}{{/if}}
+ {{#if label}}
+ <span class="full-label">{{label}}</span>
+ {{/if}}
+ {{#if html}}{{{html}}}{{/if}}
- {{#if isGroup}}
- <span class="fas fa-caret-right group-caret"></span>
- {{/if}}
- </a>
- {{/unless}}
- {{#if isGroup}}
- <ul class="dropdown-menu" role="menu" aria-labelledby="nav-tab-group-{{name}}">
- {{#each itemList}}
- {{#if isDivider}}
- <li class="divider"></li>
- {{else}}
- <li data-name="{{name}}" class="in-group tab">
- <a
- {{#if link}}href="{{link}}"{{else}}role="button"{{/if}}
- tabindex="0"
- class="{{aClassName}}"
- {{#if color}}
- style="border-color: {{color}}"
- {{/if}}
- {{#if isGroup}}
- id="nav-tab-group-{{name}}"
- data-toggle="dropdown"
- {{/if}}
- >
+ {{#if isGroup}}
+ <span class="fas fa-caret-right group-caret"></span>
+ {{/if}}
+ </a>
+ {{/unless}}
+ {{#if isGroup}}
+ <ul class="dropdown-menu" role="menu" aria-labelledby="nav-tab-group-{{name}}">
+ {{#each itemList}}
+ {{#if isDivider}}
+ <li class="divider"></li>
+ {{else}}
+ <li data-name="{{name}}" class="in-group tab">
+ <a
+ {{#if link}}href="{{link}}"{{else}}role="button"{{/if}}
+ tabindex="0"
+ class="{{aClassName}}"
+ {{#if color}}
+ style="border-color: {{color}}"
+ {{/if}}
+ {{#if isGroup}}
+ id="nav-tab-group-{{name}}"
+ data-toggle="dropdown"
+ {{/if}}
+ >
<span class="short-label"{{#if color}} style="color: {{color}}"{{/if}}>
{{#if iconClass}}
<span class="{{iconClass}}"></span>
@@ -165,52 +166,53 @@
<span class="short-label-text">&nbsp;</span>
{{/if}}
</span>
- <span class="full-label">{{label}}</span>
- </a>
- </li>
+ <span class="full-label">{{label}}</span>
+ </a>
+ </li>
+ {{/if}}
+ {{/each}}
+ </ul>
{{/if}}
- {{/each}}
- </ul>
- {{/if}}
- </li>
- {{/each}}
- </ul>
- </li>
- </ul>
+ </li>
+ {{/each}}
+ </ul>
+ </li>
+ </ul>
+ <a class="minimizer hidden" role="button" tabindex="0">
+ <span class="fas fa-chevron-right right"></span>
+ <span class="fas fa-chevron-left left"></span>
+ </a>
+ </div>
<div class="navbar-right-container">
- <ul class="nav navbar-nav navbar-right">
- {{#each itemDataList}}
- <li class="{{class}}" data-item="{{name}}">{{{var key ../this}}}</li>
- {{/each}}
- <li class="dropdown menu-container">
- <a
- id="nav-menu-dropdown"
- class="dropdown-toggle"
- data-toggle="dropdown"
- role="button"
- tabindex="0"
- title="{{translate 'Menu'}}"
- ><span class="fas fa-ellipsis-v icon"></span></a>
- <ul class="dropdown-menu" role="menu" aria-labelledby="nav-menu-dropdown">
- {{#each menuDataList}}
- {{#unless divider}}
- <li><a
- {{#if name}}data-name="{{name}}"{{/if}}
- {{#if link}}href="{{link}}"{{else}}role="button"{{/if}}
- tabindex="0"
- class="nav-link{{#if handler}} action{{/if}}"
- >{{#if html}}{{{html}}}{{else}}{{label}}{{/if}}</a></li>
- {{else}}
- <li class="divider"></li>
- {{/unless}}
- {{/each}}
- </ul>
- </li>
- </ul>
+ <ul class="nav navbar-nav navbar-right">
+ {{#each itemDataList}}
+ <li class="{{class}}" data-item="{{name}}">{{{var key ../this}}}</li>
+ {{/each}}
+ <li class="dropdown menu-container">
+ <a
+ id="nav-menu-dropdown"
+ class="dropdown-toggle"
+ data-toggle="dropdown"
+ role="button"
+ tabindex="0"
+ title="{{translate 'Menu'}}"
+ ><span class="fas fa-ellipsis-v icon"></span></a>
+ <ul class="dropdown-menu" role="menu" aria-labelledby="nav-menu-dropdown">
+ {{#each menuDataList}}
+ {{#unless divider}}
+ <li><a
+ {{#if name}}data-name="{{name}}"{{/if}}
+ {{#if link}}href="{{link}}"{{else}}role="button"{{/if}}
+ tabindex="0"
+ class="nav-link{{#if handler}} action{{/if}}"
+ >{{#if html}}{{{html}}}{{else}}{{label}}{{/if}}</a></li>
+ {{else}}
+ <li class="divider"></li>
+ {{/unless}}
+ {{/each}}
+ </ul>
+ </li>
+ </ul>
</div>
- <a class="minimizer hidden" role="button" tabindex="0">
- <span class="fas fa-chevron-right right"></span>
- <span class="fas fa-chevron-left left"></span>
- </a>
</div>
</div>
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);