diff --git a/addons/event_booth/data/event_booth_category_data.xml b/addons/event_booth/data/event_booth_category_data.xml index 69123f1e6a8..fc9c1bcb159 100644 --- a/addons/event_booth/data/event_booth_category_data.xml +++ b/addons/event_booth/data/event_booth_category_data.xml @@ -7,14 +7,14 @@
-
+

Standard

  • 1 Branded Booth
  • -
  • +
  • 4m²
  • diff --git a/addons/website_event/data/event_demo.xml b/addons/website_event/data/event_demo.xml index 250ab5174ae..7c9c529b938 100644 --- a/addons/website_event/data/event_demo.xml +++ b/addons/website_event/data/event_demo.xml @@ -10,7 +10,7 @@

    Every year we invite our community, partners and end-users to come and meet us! It's the ideal event to get together and present new features, roadmap of future versions, achievements of the software, workshops, training sessions, etc....

    This event is also an opportunity to showcase our partners' case studies, methodology or developments. Be there and see directly from the source the features of the version 12!

    -
    +

    This event and all the conferences are in English!

    What's new?
    @@ -27,11 +27,11 @@
  • Business Room - To discuss implementation methodologies, best sales practices, etc.
  • Workshop Room - Mainly for developers.
-
+

If you wish to make a presentation, please send your topic proposal as soon as possible for approval to Mr. Famke Jenssens at ngh (a) yourcompany (dot) com. The presentations should be, for example, a presentation of a community module, a case study, methodology feedback, technical, etc. Each presentation must be in English.

For any additional information, please contact us at events@yourcompany.com.

-
+

OpenElec Applications reserves the right to cancel, re-name or re-locate the event or change the dates on which it is held.

@@ -51,7 +51,7 @@

Around one hundred ballons will simultaneously take flight and turn the sky into a beautiful canvas of colours.

This is the perfect place for spending a nice day with your family, we guarantee you will be leaving with beautiful everlasting memories !

For any additional information, please contact us at events@yourcompany.com.

-
+

We reserve the right to cancel, re-name or re-locate the event or change the dates on which it is held in case the weather fails us.

The safety of our attendees and our aeronauts comes first !

@@ -84,7 +84,7 @@

For any additional information, please contact us at events@odoo.com

-
+
SPEAKER
@@ -112,7 +112,7 @@

Bands like Bar Fighters, Led Slippers and Link Floyd will offer you the show of the century during our three day event.

This is the perfect place for spending a nice time with your friends while listening to some of the most iconic rock songs of all times!

For any additional information, please contact us at events@yourcompany.com.

-
+

We reserve the right to cancel, re-name or re-locate the event or change the dates on which it is held in case the weather fails us.

@@ -137,7 +137,7 @@ to chat with experienced players and trainers once the tournament is over !

For any additional information, please contact us at events@yourcompany.com.

-
+

We reserve the right to cancel, re-name or re-locate the event or change the dates on which it is held in case the weather fails us.

@@ -163,7 +163,7 @@ Special discount codes will be handed out during the various streams, make sure to be there on time.

For any additional information, please contact us at events@penwood.example.com.

-
+

This event is fully online and FREE, if you have paid for tickets, you should get a refund.
It will require a good Internet connection to get the best video quality.

diff --git a/addons/website_event/static/src/scss/event_templates_common.scss b/addons/website_event/static/src/scss/event_templates_common.scss index 41b6e26af59..4ff4597787e 100644 --- a/addons/website_event/static/src/scss/event_templates_common.scss +++ b/addons/website_event/static/src/scss/event_templates_common.scss @@ -1,3 +1,25 @@ +$o-wevent-color-ratio-bg: 15%; +$o-wevent-bg-color-base: mix(map-get($theme-colors, 'primary'), $body-bg, $o-wevent-color-ratio-bg); +$o-wevent-bg-color-base-contrast: color-contrast($o-wevent-bg-color-base); +$o-wevent-bg-color-light: mix($o-wevent-bg-color-base, #E9ECEF); +$o-wevent-bg-color-dark: mix($o-wevent-bg-color-base, #24363a); +$o-wevent-color: mix(map-get($theme-colors, 'primary'), $body-color, $o-wevent-color-ratio-bg); + +.o_wevent_theme_bg_base { + background-color: $o-wevent-bg-color-base !important; + color: $o-wevent-color; +} + +.o_wevent_theme_bg_light { + background-color: $o-wevent-bg-color-light !important; + color: $o-wevent-color; +} + +.o_wevent_theme_bg_dark { + background-color: $o-wevent-bg-color-dark !important; + color: $o-wevent-color; +} + .o_wevent_index, .o_wevent_event { // Simple colored tags according to assigned background color @@ -24,11 +46,11 @@ // Complex colored tags according to assigned background color with hover effect @for $size from 1 through length($o-colors) { .o_tag_color_hovered_#{$size - 1} { - $background-color: white; + $background-color: $o-wevent-bg-color-base; // no color selected @if $size == 1 { & { - color: black; + color: color-contrast($background-color); background-color: $background-color; box-shadow: inset 0 0 0 1px nth($o-colors, $size); } @@ -53,8 +75,8 @@ .o_wevent_index_topbar_filters { .dropdown-toggle { - border: $border-width solid map-get($grays, '400'); - @include o-bg-color(map-get($grays, 'white'), $with-extras: false); + border: $border-width solid mix(map-get($theme-colors, 'primary'), map-get($grays, '400')); + @extend .o_wevent_theme_bg_light; @include border-radius($dropdown-border-radius); &:hover, &:focus { border-color: map-get($theme-colors, 'primary'); @@ -66,7 +88,7 @@ } .fa { margin-right: .4em; - color: map-get($theme-colors, 'primary'); + color: $o-wevent-color; } } .dropdown-menu { @@ -74,9 +96,14 @@ min-width: 12rem; max-height: 250px; overflow-y: auto; + @extend .o_wevent_theme_bg_light; } } + .o_wevent_event_searchbar_form > input { + @extend .o_wevent_theme_bg_light; + } + /* * COMMON TO ALL ONLINE-* PAGES */ @@ -87,10 +114,6 @@ opacity: 0.4; } // background color-based for new styling - .event_color_0 { - // bg-100 background but DO NOT extend bg-100 as it messes with text-muted colors - background-color: #F8F9FA; - } .event_color_1 { background-color: rgba(240, 96, 80, 0.2); } @@ -143,7 +166,7 @@ // Left panel .o_wevent_online_page_aside { - + @extend .o_wevent_theme_bg_base; // Left panel: content display .o_wevent_online_page_aside_content { border: 1px solid $border-color; diff --git a/addons/website_event/static/src/scss/event_templates_list.scss b/addons/website_event/static/src/scss/event_templates_list.scss index dbda8f159dd..b3f945a5c15 100644 --- a/addons/website_event/static/src/scss/event_templates_list.scss +++ b/addons/website_event/static/src/scss/event_templates_list.scss @@ -33,11 +33,6 @@ min-width: 0; } } - &.opt_event_list_cards_bg { - @if (map-get($colors, 'body') == $o-portal-default-body-bg) { - @extend .bg-200; - } - } .opt_events_list_columns { header { height: 200px; @@ -66,6 +61,8 @@ height: 4rem; border-radius: 50%; text-align: center; + background-color: $o-wevent-bg-color-base; + color: $o-wevent-color; .o_wevent_event_day { font-size: 1.125rem; @@ -86,8 +83,13 @@ padding: $card-spacer-y $card-spacer-x; text-align: right; } - .card-title { - color: $body-color; + article { + background-color: $o-wevent-bg-color-base; + color: $o-wevent-color; + .card-body { + background-color: $o-wevent-bg-color-base !important; + color: $o-wevent-color; + } } } .o_wevent_sidebar_title { @@ -115,4 +117,8 @@ color: #fff; } } + .o_half_screen_height { + // Set min-height to the same value as the header + min-height: 200px !important; + } } diff --git a/addons/website_event/static/src/scss/event_templates_page.scss b/addons/website_event/static/src/scss/event_templates_page.scss index 3aeb0d5c5b0..97bf69295a5 100644 --- a/addons/website_event/static/src/scss/event_templates_page.scss +++ b/addons/website_event/static/src/scss/event_templates_page.scss @@ -99,8 +99,8 @@ */ .o_wevent_event .event_color_0 { - background-color: white; - color: #5a5a5a; + background-color: $o-wevent-bg-color-base; + color: $o-wevent-color; } .o_wevent_event .event_color_1 { background-color: #cccccc; diff --git a/addons/website_event/views/event_templates_list.xml b/addons/website_event/views/event_templates_list.xml index c164c5adbae..4df8ca970b8 100644 --- a/addons/website_event/views/event_templates_list.xml +++ b/addons/website_event/views/event_templates_list.xml @@ -15,7 +15,7 @@
-
+
@@ -79,7 +79,7 @@