From 23504d3d858a120e8aec730822326333ece71444 Mon Sep 17 00:00:00 2001 From: "stefanorigano (SRI)" Date: Fri, 10 Mar 2023 14:26:34 +0000 Subject: [PATCH] [IMP] web: searchbar, mini-calendar & CommandPalette design Ensure square-ish table cell in mini-calendar. Better breadcrumbs actions alignment in ControlPanel. task-2818586 Part-of: odoo/odoo#116641 --- .../static/src/components/lunch_dashboard.xml | 2 +- .../src/core/commands/command_palette.xml | 2 +- .../static/src/scss/bootstrap_overridden.scss | 4 +- .../static/src/scss/primary_variables.scss | 11 ++-- addons/web/static/src/search/layout.xml | 2 +- .../src/search/search_panel/search_panel.xml | 2 +- .../views/calendar/calendar_controller.scss | 51 +++++++++++-------- .../form_status_indicator.xml | 11 ++-- 8 files changed, 47 insertions(+), 38 deletions(-) diff --git a/addons/lunch/static/src/components/lunch_dashboard.xml b/addons/lunch/static/src/components/lunch_dashboard.xml index 59a8c02552b..92e1bd16822 100644 --- a/addons/lunch/static/src/components/lunch_dashboard.xml +++ b/addons/lunch/static/src/components/lunch_dashboard.xml @@ -72,7 +72,7 @@ -
+
diff --git a/addons/web/static/src/core/commands/command_palette.xml b/addons/web/static/src/core/commands/command_palette.xml index 4b9f69e0833..8838bd23dbf 100644 --- a/addons/web/static/src/core/commands/command_palette.xml +++ b/addons/web/static/src/core/commands/command_palette.xml @@ -46,7 +46,7 @@
- diff --git a/addons/web/static/src/scss/bootstrap_overridden.scss b/addons/web/static/src/scss/bootstrap_overridden.scss index 1af2f030e9c..83a06050a3c 100644 --- a/addons/web/static/src/scss/bootstrap_overridden.scss +++ b/addons/web/static/src/scss/bootstrap_overridden.scss @@ -98,8 +98,8 @@ $border-radius-sm: $o-border-radius-sm !default; $border-radius-lg: $o-border-radius-lg !default; $border-color: $o-gray-300 !default; -$component-active-color: $o-brand-primary !default; -$component-active-bg: $gray-200 !default; +$component-active-color: $o-component-active-color !default; +$component-active-bg: $o-component-active-bg !default; $caret-width: 4px !default; diff --git a/addons/web/static/src/scss/primary_variables.scss b/addons/web/static/src/scss/primary_variables.scss index d52f09310fc..f42537ce803 100644 --- a/addons/web/static/src/scss/primary_variables.scss +++ b/addons/web/static/src/scss/primary_variables.scss @@ -104,7 +104,10 @@ $o-main-favorite-color: #f3cc00 !default; $o-main-code-color: #d2317b !default; // Components colors -// TODO: move variables in components +$o-component-active-color: $o-gray-900 !default; +$o-component-active-bg: mix($o-action, $o-gray-100, 20%) !default; +$o-component-active-border: $o-action !default; + $o-view-background-color: white !default; $o-shadow-color: #303030 !default; @@ -247,9 +250,9 @@ $o-btns-bs-override: map-merge(( hover-border: $o-gray-400, hover-color: $o-gray-900, - active-background: mix($o-action, $o-gray-100, 20%), - active-border: $o-action, - active-color: $o-gray-900, + active-background: $o-component-active-bg, + active-border: $o-component-active-border, + active-color: $o-component-active-color, ), "light": ( background: $o-white, diff --git a/addons/web/static/src/search/layout.xml b/addons/web/static/src/search/layout.xml index 703cc31fa4e..0fb06748c83 100644 --- a/addons/web/static/src/search/layout.xml +++ b/addons/web/static/src/search/layout.xml @@ -7,7 +7,7 @@ -
+
diff --git a/addons/web/static/src/search/search_panel/search_panel.xml b/addons/web/static/src/search/search_panel/search_panel.xml index efb17b4a4f7..d4719fcbc3e 100644 --- a/addons/web/static/src/search/search_panel/search_panel.xml +++ b/addons/web/static/src/search/search_panel/search_panel.xml @@ -11,7 +11,7 @@ -
+

No quick filter available.

Update the filters in the search bar to display more records.

diff --git a/addons/web/static/src/views/calendar/calendar_controller.scss b/addons/web/static/src/views/calendar/calendar_controller.scss index be2d006784e..9ad08edb9ce 100644 --- a/addons/web/static/src/views/calendar/calendar_controller.scss +++ b/addons/web/static/src/views/calendar/calendar_controller.scss @@ -1,5 +1,5 @@ // Variables -$o-cw-color-today-accent: #fc3d39; +$o-cw-color-today-accent: #fe3b30; $o-cw-filter-avatar-size: 20px; // Animations @@ -66,32 +66,39 @@ $o-cw-filter-avatar-size: 20px; a, span { - padding: 5px 0; + display: flex; + width: 100%; + align-items: center; + justify-content: center; + aspect-ratio: 4/3; background: none; - text-align: center; - vertical-align: middle; - font-size: 1.2rem; - color: map-get($grays, "900"); - font-weight: 400; + color: $headings-color; + line-height: 1; } - &.ui-datepicker-current-day a { - background: $info; - color: color-contrast($info); - font-weight: bold; + &.ui-datepicker-today, &.ui-datepicker-current-day { + &, a { + position: relative; + color: var(--ui-datepicker-badge-color, #{$o-component-active-color}); + } + + &:before { + @include o-position-absolute(0, $left: 50%); + display: block; + height: 100%; + aspect-ratio: 1; + border-radius: 100%; + border: var(--ui-datepicker-badge-border, 1px solid #{$o-component-active-border}); + background: var(--ui-datepicker-badge-background, #{$o-component-active-bg}); + transform: translateX(-50%); + content: ""; + } } - &.ui-datepicker-today a { - margin: auto; - border-radius: 100%; - padding: 0.1em; - width: 25px; - background: mix($o-cw-color-today-accent, white, 80%); - color: white; - } - - &.ui-datepicker-current-day.ui-datepicker-today a { - background: $o-cw-color-today-accent; + &.ui-datepicker-today { + --ui-datepicker-badge-border: 1px solid #{$o-cw-color-today-accent}; + --ui-datepicker-badge-background: #{$o-cw-color-today-accent}; + --ui-datepicker-badge-color: #{color-contrast($o-cw-color-today-accent)}; } } diff --git a/addons/web/static/src/views/form/form_status_indicator/form_status_indicator.xml b/addons/web/static/src/views/form/form_status_indicator/form_status_indicator.xml index aeebcfb3f8d..15c225dd4b1 100644 --- a/addons/web/static/src/views/form/form_status_indicator/form_status_indicator.xml +++ b/addons/web/static/src/views/form/form_status_indicator/form_status_indicator.xml @@ -2,12 +2,12 @@ -
+