diff options
| author | Benjamin Vray <bvr@odoo.com> | 2020-06-30 13:23:18 +0000 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2020-06-30 14:19:16 +0000 |
| commit | 904fea38a25b76b53f5e622e068e6b8e74ff0acb (patch) | |
| tree | 7baf14b1ef21641b31fd0101bea3dbf3bbcb1495 | |
| parent | 5879e40445f0176d545b4a50f7f7ec33b2e171c8 (diff) | |
[IMP] website, *: add minor improvements on header / footer design
*: web
+ Ease edition
Part of https://github.com/odoo/odoo/pull/49142
task-2229551
| -rw-r--r-- | addons/web/views/webclient_templates.xml | 2 | ||||
| -rw-r--r-- | addons/website/static/src/scss/website.scss | 5 | ||||
| -rw-r--r-- | addons/website/views/website_templates.xml | 6 |
3 files changed, 5 insertions, 8 deletions
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml index 4465956061e..b80c6bd3f7e 100644 --- a/addons/web/views/webclient_templates.xml +++ b/addons/web/views/webclient_templates.xml @@ -491,7 +491,7 @@ <div class="row"> <div class="col-sm text-center text-sm-left text-muted"> <t t-call="web.debug_icon"/> - <span>Copyright &copy;</span> <span t-field="res_company.name" itemprop="name">Company name</span> + <span class="o_footer_copyright_name">Copyright &copy; Company name</span> </div> <div class="col-sm text-center text-sm-right"> <t t-call="web.brand_promotion"/> diff --git a/addons/website/static/src/scss/website.scss b/addons/website/static/src/scss/website.scss index ac2f9a31a18..906a0a6b15c 100644 --- a/addons/website/static/src/scss/website.scss +++ b/addons/website/static/src/scss/website.scss @@ -108,7 +108,7 @@ $-header-nav-link-height: $nav-link-height; header { font-size: o-website-value('header-font-size'); - .dropdown-menu { + .dropdown-menu, .btn { font-size: inherit; } } @@ -856,9 +856,6 @@ header { &, ul, .o_footer_address, .o_footer_logo { padding-top: $spacer; } - li a { - text-transform: uppercase; - } } } } diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 89206552c19..5483fa70af1 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -156,7 +156,7 @@ <!-- Background now controlled by css configuration, using color combinations --> <attribute name="class" add="o_colored_level o_cc" separator=" "/> </xpath> - <xpath expr="//div[hasclass('o_footer_copyright')]//span[@t-field='res_company.name']" position="after"> + <xpath expr="//div[hasclass('o_footer_copyright')]//span[hasclass('o_footer_copyright_name')]" position="after"> <t t-call="website.language_selector"/> </xpath> <xpath expr="//t[@t-call='web.brand_promotion']/.." position="attributes"> @@ -426,7 +426,7 @@ <div class="o_footer_address"> 250 Executive Park Blvd, Suite 3400<br/>San Francisco CA 94134<br/>United States </div> - <div class="row"> + <div class="row s_nb_column_fixed"> <div class="offset-md-3 col-md-6 o_footer_logo"> <a href="/" class="footer-brand logo"> <img src="/website/static/src/img/website_logo.png" class="img-fluid" aria-label="Logo of MyCompany" title="MyCompany" role="img" style="width: 50%;"/> @@ -483,7 +483,7 @@ <div id="footer" class="oe_structure oe_structure_solo" t-ignore="true" t-if="not no_footer"> <section class="s_text_block pt16 pb8"> <div class="container"> - <div class="row"> + <div class="row s_nb_column_fixed"> <div class="offset-md-3 col-md-6 o_footer_logo text-center my-3"> <a href="/" class="footer-brand logo"> <img src="/website/static/src/img/website_logo.png" class="img-fluid" aria-label="Logo of MyCompany" title="MyCompany" role="img" style="width: 50%;"/> |