From e4a2fafb908dc2c66a87e59f0cda30634c8e0633 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Wed, 27 Jul 2022 10:47:08 +0300 Subject: [PATCH] thmes ref --- frontend/less/dark/iframe/main.less | 1 - frontend/less/dark/main.less | 2 +- frontend/less/dark/variables.less | 4 +++- frontend/less/espo/custom.less | 11 +++++++++-- frontend/less/hazyblue/custom.less | 23 ----------------------- frontend/less/hazyblue/main.less | 13 +++++-------- frontend/less/hazyblue/variables.less | 1 - 7 files changed, 18 insertions(+), 37 deletions(-) diff --git a/frontend/less/dark/iframe/main.less b/frontend/less/dark/iframe/main.less index 76592e87eb..d646048a33 100644 --- a/frontend/less/dark/iframe/main.less +++ b/frontend/less/dark/iframe/main.less @@ -1,7 +1,6 @@ @import "../../espo/bootstrap/variables.less"; @import "../../espo/value-variables.less"; @import "../../espo/variables.less"; -@import "../../hazyblue/variables.less"; @import "../variables.less"; @import "../../espo/root-variables.less"; @import "../../espo/iframe/iframe.less"; diff --git a/frontend/less/dark/main.less b/frontend/less/dark/main.less index 9c5700ebb2..dea4ff4b55 100644 --- a/frontend/less/dark/main.less +++ b/frontend/less/dark/main.less @@ -1,4 +1,4 @@ -@import (css) "hazyblue.css"; +@import (css) "espo.css"; @import "../espo/bootstrap/variables.less"; @import "../espo/value-variables.less"; diff --git a/frontend/less/dark/variables.less b/frontend/less/dark/variables.less index 052a663bec..b9e63d5586 100644 --- a/frontend/less/dark/variables.less +++ b/frontend/less/dark/variables.less @@ -22,10 +22,12 @@ @brand-danger-value: #b95855; @brand-info-value: #9080b5; +@state-info-bg-value: #6e608f; + @state-danger-text-value: #a95e5c; @state-success-text-value: #79a97b; @state-warning-text-value: #ad8b50; -@state-info-text-value: #929eb1; +@state-info-text-value: #b2a6c9; @state-success-bg-value: #3a5438; @state-danger-bg-value: #422a2a; diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less index 0398787471..c3d6f46e12 100644 --- a/frontend/less/espo/custom.less +++ b/frontend/less/espo/custom.less @@ -796,7 +796,7 @@ input.global-search-input { .list-buttons-container .sticked-bar { position: fixed; - background-color: @body-bg; + background-color: var(--navbar-bg); z-index: 1000; padding-top: 3px; } @@ -1797,7 +1797,7 @@ label.attach-file-label { } .stick-sub.button-container { - background-color: @body-bg; + background-color: var(--navbar-bg); padding: 3px @container-padding 0 @container-padding; width: 100%; } @@ -2723,6 +2723,13 @@ table.table-admin-panel { .admin-content { .notifications-panel-container > .panel { overflow: hidden; + + .list-group-item:first-child { + border-top: 0; + } + .list-group-item:last-child { + border-bottom: 0; + } } .table-admin-panel, diff --git a/frontend/less/hazyblue/custom.less b/frontend/less/hazyblue/custom.less index 97559f7cb8..e69de29bb2 100644 --- a/frontend/less/hazyblue/custom.less +++ b/frontend/less/hazyblue/custom.less @@ -1,23 +0,0 @@ -#navbar .navbar { - box-shadow: none; - - .navbar-right { - box-shadow: none; - } -} - -body > #content > #main > .admin-content { - .notifications-panel-container .list-group { - .list-group-item:first-child { - border-top: 0; - } - .list-group-item:last-child { - border-bottom: 0; - } - } -} - -.record .stick-sub.button-container { - background-color: var(--navbar-bg) !important; - padding-bottom: 0; -} diff --git a/frontend/less/hazyblue/main.less b/frontend/less/hazyblue/main.less index 04a9ac3571..9938dc9a73 100644 --- a/frontend/less/hazyblue/main.less +++ b/frontend/less/hazyblue/main.less @@ -1,15 +1,12 @@ -@import "../espo/init.less"; +@import (css) "espo.css"; + +@import "../espo/bootstrap/variables.less"; @import "../espo/value-variables.less"; @import "../espo/variables.less"; -@import "../espo/mixins.less"; -@import "../espo/root-variables.less"; -@import "../espo/misc.less"; -@import "../espo/layout-top.less"; -@import "../espo/layout-side.less"; -@import "../espo/custom.less"; @import "variables.less"; +@import "../espo/root-variables.less"; + @import "custom.less"; -@import "../espo/utilities.less"; body { --theme-name: Hazyblue; diff --git a/frontend/less/hazyblue/variables.less b/frontend/less/hazyblue/variables.less index 239965ca39..2ecb46da43 100644 --- a/frontend/less/hazyblue/variables.less +++ b/frontend/less/hazyblue/variables.less @@ -4,7 +4,6 @@ @navbar-inverse-bg-value: #546E7A; @state-info-bg-value: #dbd0f5; -@state-info-bg-value: #e2e2e2; @state-info-text-value: @text-color; @brand-success-value: #85b75f;