From b1d5af2e6ce3f9a8ac89a024c31e4ff11f3ac40f Mon Sep 17 00:00:00 2001 From: sri-odoo Date: Fri, 31 Aug 2018 15:36:34 +0200 Subject: [PATCH 01/17] [REF] portal: review main layout --- addons/portal/views/portal_templates.xml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml index 8e2c17fc9eb..6a64a94e09c 100644 --- a/addons/portal/views/portal_templates.xml +++ b/addons/portal/views/portal_templates.xml @@ -84,16 +84,17 @@
-
-
+
+
-
+
-

Your Details Change

+

Your Details Change

+
@@ -126,7 +127,7 @@
-

Your Documents

+

Your Documents

From 60d837044a028e578f804570361af128b40a12b6 Mon Sep 17 00:00:00 2001 From: sri-odoo Date: Wed, 29 Aug 2018 12:44:11 +0200 Subject: [PATCH 02/17] [FIX] base, portal: format address widget Empty space were used to compensate the icons size. Unfortunatly icons may have different sizes and the surrounding text barely match the empty space provided, causing misalignment. --- addons/portal/static/src/scss/portal.scss | 31 +++++++++++++++++++ addons/portal/views/portal_templates.xml | 2 +- .../base/views/ir_qweb_widget_templates.xml | 2 +- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/addons/portal/static/src/scss/portal.scss b/addons/portal/static/src/scss/portal.scss index 0e39035b624..108cb1adb06 100644 --- a/addons/portal/static/src/scss/portal.scss +++ b/addons/portal/static/src/scss/portal.scss @@ -326,6 +326,37 @@ img.o_we_custom_image { } } + address { + span[itemprop="name"] { + font-weight: bold; + margin-bottom: 0.3em; + } + + div[itemprop="address"] > div { + position: relative; + + span[itemprop="streetAddress"] { + line-height: 1.2; + margin-bottom: 0.3em; + } + + .fa { + @include o-position-absolute(0, $left: 0); + line-height: $line-height-base; + + + span { + display: block; + // FontAwesome '.fa-fw' fixed-with + margin + padding-left: 1.28571429em + 0.5em; + } + } + } + } + + .o_my_sidebar div[itemprop="address"] > div { + margin-top: 0.5em; + } + .o_portal_navbar { .navbar-brand { margin: 0; diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml index 6a64a94e09c..670e08d5d28 100644 --- a/addons/portal/views/portal_templates.xml +++ b/addons/portal/views/portal_templates.xml @@ -93,7 +93,7 @@
-

Your Details Change

+

Your Details Edit

diff --git a/odoo/addons/base/views/ir_qweb_widget_templates.xml b/odoo/addons/base/views/ir_qweb_widget_templates.xml index 0732305b6d3..5b322e479a2 100644 --- a/odoo/addons/base/views/ir_qweb_widget_templates.xml +++ b/odoo/addons/base/views/ir_qweb_widget_templates.xml @@ -23,7 +23,7 @@
- +
From 7a419ec2c2514e756bb7d3a252437db04cc8814f Mon Sep 17 00:00:00 2001 From: sri-odoo Date: Fri, 31 Aug 2018 15:32:38 +0200 Subject: [PATCH 03/17] [REF] portal: review 'search/filters' toolbar --- addons/portal/static/src/scss/portal.scss | 84 +++---------- addons/portal/views/portal_templates.xml | 136 +++++++++++----------- 2 files changed, 85 insertions(+), 135 deletions(-) diff --git a/addons/portal/static/src/scss/portal.scss b/addons/portal/static/src/scss/portal.scss index 108cb1adb06..7f4945639f6 100644 --- a/addons/portal/static/src/scss/portal.scss +++ b/addons/portal/static/src/scss/portal.scss @@ -3,8 +3,14 @@ /// rules. /// +// ====== Variables ========= $-navbar-height: $nav-link-height !default; +// Portal toolbar (filters, search bar) +$o-portal-mobile-toolbar: true; // Enable/Disable custom design +$o-portal-mobile-toolbar-border: $border-color; +$o-portal-mobile-toolbar-bg: $gray-200; + // Resize and vertically align navbar’s items relative to navbar @mixin o-w-fill-navbar($ratio: 1) { height: round($-navbar-height * $ratio * 100) / 100; @@ -299,12 +305,11 @@ img.o_we_custom_image { // Portal specific .o_portal { .breadcrumb { - background-color: rgba(0, 0, 0, 0); - margin-bottom: 0px; - } + background-color: transparent; - .record_pager { - padding: 8px 0px; + .breadcrumb-item { + display: inline-flex; + } } > tbody.o_portal_report_tbody { @@ -357,68 +362,13 @@ img.o_we_custom_image { margin-top: 0.5em; } - .o_portal_navbar { - .navbar-brand { - margin: 0; - - @include media-breakpoint-up(md) { - padding: $navbar-padding-y $navbar-padding-x 0 0; - } - } - - // ===== Default portal navbar design ===== - &.o_portal_navbar_default { - margin-bottom: 8px; - - .navbar-brand { - padding: $navbar-padding-y $navbar-padding-x 0 0; - } - - .navbar-header .dropdown-menu { - right: 0; - left: auto; - } - - .navbar-toggle { - margin-right: 0; - margin-bottom: 0; - background-color: $table-active-bg; - padding: 6px 10px $navbar-padding-y; - border-width: 1px 1px 0 1px; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; - z-index: 1; - - &.collapsed { - padding:6px 10px; - border-width: 1px; - border-radius: $btn-border-radius; - background-color: transparent; - } - } - - @include media-breakpoint-down(sm) { - .navbar-collapse { - z-index: 0; - background-color: $table-active-bg; - border-radius: $btn-border-radius; - border-top-right-radius: 0; - transform: translateY(-2px); - - &.in { - overflow: visible; - } - } - } - - @include media-breakpoint-up(md) { - > .container-fluid { - padding: 0; - - .navbar-form { - padding-right: 0; - } - } + @if ($o-portal-mobile-toolbar) { + #o_portal_navbar_content { + @include media-breakpoint-down(md) { + margin: $navbar-padding-y (-$navbar-padding-x) 0; + padding: $navbar-padding-y $navbar-padding-x ; + border-top: $border-width solid $o-portal-mobile-toolbar-border; + background-color: $o-portal-mobile-toolbar-bg; } } } diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml index 670e08d5d28..24eb02631ff 100644 --- a/addons/portal/views/portal_templates.xml +++ b/addons/portal/views/portal_templates.xml @@ -68,16 +68,16 @@ diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml index af2d69a10c7..f78fa107b32 100644 --- a/addons/portal/views/portal_templates.xml +++ b/addons/portal/views/portal_templates.xml @@ -128,13 +128,20 @@

Your Documents

-
    -
+
+
+ +