From 1bc1d239348e05fb7a497e6ce9e73b44293cd718 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Wed, 20 Jul 2022 20:34:16 +0300 Subject: [PATCH] theme impr --- client/css/misc/layout-manager-grid.css | 3 +++ client/css/misc/layout-manager-rows.css | 1 + frontend/less/espo/elements/dropdown.less | 21 ++++++++++++++++++++- frontend/less/espo/elements/modal.less | 23 +++++++++++++++++++++++ frontend/less/espo/elements/panel.less | 22 +++++++++++++++++++--- frontend/less/sakura/variables.less | 6 +++++- 6 files changed, 71 insertions(+), 5 deletions(-) diff --git a/client/css/misc/layout-manager-grid.css b/client/css/misc/layout-manager-grid.css index 898cf5d433..7d85f19465 100644 --- a/client/css/misc/layout-manager-grid.css +++ b/client/css/misc/layout-manager-grid.css @@ -6,6 +6,7 @@ #layout ul > li { background-color: var(--select-item-bg); + border-radius: var(--border-radius); } #layout ul.panels > li { @@ -13,6 +14,7 @@ margin-bottom: 20px; min-height: 80px; border: 1px solid var(--select-item-border); + border-radius: var(--border-radius); background-color: var(--panel-bg); list-style: none; } @@ -25,6 +27,7 @@ list-style: none; border: 1px solid var(--select-item-border); background-color: var(--panel-bg); + border-radius: var(--border-radius); margin: 8px 0; padding: 5px; height: 72px; diff --git a/client/css/misc/layout-manager-rows.css b/client/css/misc/layout-manager-rows.css index eee59062a0..02c10b86c2 100644 --- a/client/css/misc/layout-manager-rows.css +++ b/client/css/misc/layout-manager-rows.css @@ -25,6 +25,7 @@ #layout ul > li { background-color: var(--select-item-bg); color: var(--select-item-text-color); + border-radius: var(--border-radius); } #layout ul.enabled > li .right { diff --git a/frontend/less/espo/elements/dropdown.less b/frontend/less/espo/elements/dropdown.less index 55d3b39d40..e6b0e4288d 100644 --- a/frontend/less/espo/elements/dropdown.less +++ b/frontend/less/espo/elements/dropdown.less @@ -1,6 +1,6 @@ .autocomplete-suggestions { - border: 1px solid var(--dropdown-border); + border: var(--dropdown-border-width) solid var(--dropdown-border); background-color: var(--dropdown-bg); color: var(--dropdown-link-color); cursor: default; @@ -23,15 +23,34 @@ } } +.popover, .dropdown-menu, .selectize-dropdown, .autocomplete-suggestions, .ui-timepicker-wrapper { + border: var(--dropdown-border-width) solid var(--dropdown-border); box-shadow: var(--dropdown-box-shadow); border-radius: var(--dropdown-border-radius); border-width: var(--dropdown-border-width); } +.popover { + background-color: var(--dropdown-bg); + + &.bottom > .arrow { + border-bottom-color: var(--dropdown-border); + } + &.top > .arrow { + border-top-color: var(--dropdown-border); + } + &.left > .arrow { + border-left-color: var(--dropdown-border); + } + &.right > .arrow { + border-right-color: var(--dropdown-border); + } +} + .ui-timepicker-wrapper { border-top-right-radius: 0; border-bottom-right-radius: 0; diff --git a/frontend/less/espo/elements/modal.less b/frontend/less/espo/elements/modal.less index d87c16b10e..f3fed5db6b 100644 --- a/frontend/less/espo/elements/modal.less +++ b/frontend/less/espo/elements/modal.less @@ -189,6 +189,29 @@ } } +.dialog-confirm, +.dialog-centered { + > .modal-dialog > .modal-content { + border-radius: var(--panel-border-radius); + + > .modal-header { + border-top-left-radius: var(--panel-border-radius); + border-top-right-radius: var(--panel-border-radius); + } + + > .modal-footer { + border-bottom-left-radius: var(--panel-border-radius); + border-bottom-right-radius: var(--panel-border-radius); + } + + > .modal-body { + .panel.no-side-margin { + box-shadow: none; + } + } + } +} + .modal-body > .no-side-margin { margin-left: -@panel-padding; margin-right: -@panel-padding; diff --git a/frontend/less/espo/elements/panel.less b/frontend/less/espo/elements/panel.less index 65091aadff..980e930497 100644 --- a/frontend/less/espo/elements/panel.less +++ b/frontend/less/espo/elements/panel.less @@ -1,5 +1,7 @@ -.panel { +.panel, +.well { border-radius: var(--panel-border-radius); + border: var(--panel-border-width) solid var(--panel-border); } .panel-body { @@ -7,10 +9,24 @@ .clearfix(); } -.panel-group .panel + .panel { - margin-top: 4px; +.panel-group { + > .panel:first-child { + border-top-left-radius: var(--panel-border-radius); + border-top-right-radius: var(--panel-border-radius); + } + + > .panel:last-child { + border-bottom-left-radius: var(--panel-border-radius); + border-bottom-right-radius: var(--panel-border-radius); + } + + .panel + .panel { + margin-top: 4px; + } } +.panel-group + .panel > .panel-body.panel-body-form { padding-bottom: @panel-padding - @form-group-margin-bottom; } diff --git a/frontend/less/sakura/variables.less b/frontend/less/sakura/variables.less index 160329eeee..f611649c32 100644 --- a/frontend/less/sakura/variables.less +++ b/frontend/less/sakura/variables.less @@ -33,11 +33,15 @@ @modal-header-bg-value: @body-bg-value; +@dropdown-border-value: @default-border-color-value; + +@select-item-border-value: @btn-default-border-value; + @border-radius-value: 6px; @panel-border-radius-value: 6px; @dropdown-border-radius-value: 6px; -@dropdown-border-width-value: 0; +@dropdown-border-width-value: 1px; @panel-border-width-value: 0px; @default-box-shadow-value: 2px 2px 4px rgba(0,0,0,0.09);