From b739e659400a223ec2b6d41ef57f27966edfe294 Mon Sep 17 00:00:00 2001 From: Nicolas Lempereur Date: Thu, 3 May 2018 14:02:04 +0200 Subject: [PATCH 01/31] [FIX] web_editor: optimize big mail transcoding The browser may throw an error when a big mail such as one with hundreds thousands of tags is being transformed to have a style more compatible with mail clients. The error would be: "Uncaught RangeError: Maximum call stack size exceeded" This happens in jquery because we hare too many nodes (there is an ongoing issue at https://github.com./jquery/sizzle/issues/403) so this commit replace that part by a DFS traversal over DOM nodes. There was also an issue that not having the option "style-inline" would still cause some style code to be ran albeit it was intended not to be solved in 55c7d2d5b00. opw-1841107 closes #24550 --- addons/web_editor/static/src/js/backend.js | 2 +- addons/web_editor/static/src/js/transcoder.js | 32 +++++++++++++++---- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/addons/web_editor/static/src/js/backend.js b/addons/web_editor/static/src/js/backend.js index 964ececa06b..1c5feb7a7d4 100644 --- a/addons/web_editor/static/src/js/backend.js +++ b/addons/web_editor/static/src/js/backend.js @@ -146,7 +146,7 @@ var FieldTextHtmlSimple = widget.extend({ this.$content.html(this.text_to_html(value)); if (this.get("effective_readonly")) { this.resize(); - } else { + } else if (this.options['style-inline']) { transcoder.style_to_class(this.$content); } if (this.$content.is(document.activeElement)) { diff --git a/addons/web_editor/static/src/js/transcoder.js b/addons/web_editor/static/src/js/transcoder.js index a5cf20575d4..aff3b3210f6 100644 --- a/addons/web_editor/static/src/js/transcoder.js +++ b/addons/web_editor/static/src/js/transcoder.js @@ -182,14 +182,34 @@ var img_to_font = function ($editable) { }); }; +/* + * Utility function to apply function over descendants elements + * + * This is needed until the following issue of jQuery is solved: + * https://github.com./jquery/sizzle/issues/403 + * + * @param {Element} node The root Element node + * @param {Function} func The function applied over descendants + */ +var applyOverDescendants = function (node, func) { + node = node.firstChild; + while (node) { + if (node.nodeType === 1) { + func(node); + applyOverDescendants(node, func); + } + node = node.nextSibling; + } +}; + // convert class into inline style to send by mail var class_to_style = function ($editable) { if (!rulesCache.length) { getMatchedCSSRules($editable[0]); } - $editable.find('*').each(function () { - var $target = $(this); - var css = getMatchedCSSRules(this); + applyOverDescendants($editable[0], function (node) { + var $target = $(node); + var css = getMatchedCSSRules(node); var style = $target.attr("style") || ""; _.each(css, function (v,k) { if (!(new RegExp('(^|;)\s*' + k).test(style))) { @@ -209,9 +229,9 @@ var style_to_class = function ($editable) { var $c = $('').appendTo("body"); - $editable.find('*').each(function () { - var $target = $(this); - var css = getMatchedCSSRules(this); + applyOverDescendants($editable[0], function (node) { + var $target = $(node); + var css = getMatchedCSSRules(node); var style = ""; _.each(css, function (v,k) { if (!(new RegExp('(^|;)\s*' + k).test(style))) { From d595e3a258f5f1f45b0b3dcf4ab43fdfebc83d40 Mon Sep 17 00:00:00 2001 From: Nicolas Lempereur Date: Tue, 8 May 2018 16:46:23 +0200 Subject: [PATCH 02/31] [FIX] tools: mail transcoding css space consistent The transcoding of a mail (transforming CSS into inline styles on the element nodes of the mail) used the form: property:value; So when a mail is saved, it would be eg. with `style="property:value;"` and when it is being edited "property:value" is removed if available via CSS stylesheet given the structure. But the sanitize_style (introduced in bfe7aafa7) adds an espace before the value (which is more pretty but was probably not choosen in transcoding to decrease size of mail): property: value; so the inline style would not be removed when editing possibly causing conflict with the editor. With this commit, the sanitize_style doesn't add a space. It could have been changed in transcoding but the code is already rather slow and we don't want to use a regex replace or two string replace instead of the current one string replace. opw-1841107 --- odoo/addons/base/tests/test_mail.py | 4 ++-- odoo/addons/base/tests/test_mail_examples.py | 2 +- odoo/tools/mail.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/odoo/addons/base/tests/test_mail.py b/odoo/addons/base/tests/test_mail.py index 795d6824886..b94ebf57183 100644 --- a/odoo/addons/base/tests/test_mail.py +++ b/odoo/addons/base/tests/test_mail.py @@ -115,7 +115,7 @@ class TestSanitizer(unittest.TestCase): test_data = [ ( 'Coin coin ', - ['background-color: red', 'Coin coin'], + ['background-color:red', 'Coin coin'], ['position', 'top', 'left'] ), ( """
youplaboum
""", - ['font-size: 30px', 'youplaboum'], + ['font-size:30px', 'youplaboum'], ['some-property', 'top', 'cheval'] ), ( 'Coincoin', diff --git a/odoo/addons/base/tests/test_mail_examples.py b/odoo/addons/base/tests/test_mail_examples.py index a83e668d940..fcd83524fc0 100644 --- a/odoo/addons/base/tests/test_mail_examples.py +++ b/odoo/addons/base/tests/test_mail_examples.py @@ -510,7 +510,7 @@ REMOVE_CLASS = """ """ REMOVE_CLASS_IN = [ - '
', + '
', 'An error occured in a modal and I will send you back the html to try opening one on your end'] REMOVE_CLASS_OUT = [ '
', diff --git a/odoo/tools/mail.py b/odoo/tools/mail.py index 285808cd0cd..65ba6b32be1 100644 --- a/odoo/tools/mail.py +++ b/odoo/tools/mail.py @@ -154,7 +154,7 @@ class _Cleaner(clean.Cleaner): if style[0].lower() in self._style_whitelist: valid_styles[style[0].lower()] = style[1] if valid_styles: - el.attrib['style'] = '; '.join('%s: %s' % (key, val) for (key, val) in valid_styles.iteritems()) + el.attrib['style'] = '; '.join('%s:%s' % (key, val) for (key, val) in valid_styles.iteritems()) else: del el.attrib['style'] From 4431c8c843f28f9229a5cacb8b786b2b8303fd6b Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Wed, 9 May 2018 11:40:56 +0200 Subject: [PATCH 03/31] [FIX] website: GeoIP Legacy compatibility Some IPs (like google-proxy ones) are not bound to a specific country. Legacy Database used to set country_code to 'EU' for these one. geoip2, on contrary, does not set the country. Read information from `continent` attribute in this case. opw-1844888 --- addons/website/geoipresolver.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/website/geoipresolver.py b/addons/website/geoipresolver.py index 1f9b0e22724..e95b9318eb2 100644 --- a/addons/website/geoipresolver.py +++ b/addons/website/geoipresolver.py @@ -47,10 +47,14 @@ class GeoIPResolver(object): r = self._db.city(ip) except (ValueError, geoip2.errors.AddressNotFoundError): return {} + # Compatibility with Legacy database. + # Some ips cannot be located to a specific country. Legacy DB used to locate them in + # continent instead of country. Do the same to not change behavior of existing code. + country = r.country if r.country.geoname_id else r.continent return { 'city': r.city.name, - 'country_code': r.country.iso_code, - 'country_name': r.country.name, + 'country_code': country.iso_code, + 'country_name': country.name, 'region': r.subdivisions[0].iso_code if r.subdivisions else None, 'time_zone': r.location.time_zone, } From 0ca60a8d018b7009ea6082e8376188737e77bd82 Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Tue, 8 May 2018 16:20:42 +0200 Subject: [PATCH 04/31] [FIX] delivery: delivery with carrier but not linked to so When a delivery with free_over=True was not linked to a SO, it raised an error. opw:1843829 --- addons/delivery/models/stock_picking.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/delivery/models/stock_picking.py b/addons/delivery/models/stock_picking.py index 59fc0862656..f839915a48d 100644 --- a/addons/delivery/models/stock_picking.py +++ b/addons/delivery/models/stock_picking.py @@ -161,7 +161,7 @@ class StockPicking(models.Model): def send_to_shipper(self): self.ensure_one() res = self.carrier_id.send_shipping(self)[0] - if self.carrier_id.free_over and self.sale_id._compute_amount_total_without_delivery() >= self.carrier_id.amount: + if self.carrier_id.free_over and self.sale_id and self.sale_id._compute_amount_total_without_delivery() >= self.carrier_id.amount: res['exact_price'] = 0.0 self.carrier_price = res['exact_price'] self.carrier_tracking_ref = res['tracking_number'] From 475027b9889c0701f8fe5e0373a40663f6a831e1 Mon Sep 17 00:00:00 2001 From: Goffin Simon Date: Tue, 12 Dec 2017 15:16:46 +0100 Subject: [PATCH 05/31] [FIX] point_of_sale: Set the correct cashier After reopening the session in the POS by another user, the cashier was not correctly identified. Back-port of this commit: a9caef0ebbc7f3288e06f352f5bb817861e9689c opw:784422 --- addons/point_of_sale/static/src/js/models.js | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index 25b31fd0b8f..37c115973c4 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -272,6 +272,7 @@ exports.PosModel = Backbone.Model.extend({ // replace the current user with its updated version if (user.id === self.user.id) { self.user = user; + self.set_cashier(user); } } self.users = pos_users; From dff1e96ed35481c9805ec65b483a5e01e0593d98 Mon Sep 17 00:00:00 2001 From: Goffin Simon Date: Wed, 9 May 2018 14:35:59 +0200 Subject: [PATCH 06/31] [FIX] purchase: Wrong property fields in multicompany Steps to reproduce the bug: - Enable multi companies and multi-currencies - Multi company: Your Company and Test - Users: Admin and Demo - Login as admin user with the current company: Your Company - Allowed companies: Your Company, Test - Login as Demo user with the current company: Test - Allowed companies: Test - From the admin user with the current company: Test, do the following configuration in the product, - product: iPad mini, select vendor: Delta PC with price $100 with company: test, currency: USD - Change the admin's company from Test to Your Company, do the following configuration in the vendor, - vendor: Delta PC, set supplier currency: EUR and payment terms: 30 Daya Net Payment - Log in with the demo user - Create SO for that product by selecting routes: Make to order and Confirm it. - Open the PO which is generated from this SO Bug: The Currency and payment terms were set with the data set for Your Company Excpected behavior: Nothing is set for supplier currency and Payment terms as nothing is set for the company: Test Closes #24564 opw:1841379 --- addons/purchase/models/purchase.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/purchase/models/purchase.py b/addons/purchase/models/purchase.py index 56583bdda35..f97c8cf7b75 100644 --- a/addons/purchase/models/purchase.py +++ b/addons/purchase/models/purchase.py @@ -1022,10 +1022,10 @@ class ProcurementRule(models.Model): 'partner_id': partner.id, 'picking_type_id': self.picking_type_id.id, 'company_id': values['company_id'].id, - 'currency_id': partner.property_purchase_currency_id.id or self.env.user.company_id.currency_id.id, + 'currency_id': partner.with_context(force_company=values['company_id'].id).property_purchase_currency_id.id or self.env.user.company_id.currency_id.id, 'dest_address_id': values.get('partner_dest_id', False) and values['partner_dest_id'].id, 'origin': origin, - 'payment_term_id': partner.property_supplier_payment_term_id.id, + 'payment_term_id': partner.with_context(force_company=values['company_id'].id).property_supplier_payment_term_id.id, 'date_order': purchase_date.strftime(DEFAULT_SERVER_DATETIME_FORMAT), 'fiscal_position_id': fpos, 'group_id': group From 6c6c4b89a077d2345425771c854ac608ff4f136d Mon Sep 17 00:00:00 2001 From: len-odoo Date: Wed, 9 May 2018 12:11:20 +0200 Subject: [PATCH 07/31] [FIX] mail: parse eml/msg attachments When parsing an email with some eml or dmg attachment, the parsing would generate an attachment with empty content. Since this content is later encoded in base64, it would crash trying to encode None. We simply do not process attachments without content. We add a test to check that parsing mail with some empty attachment doesn't crash, since the crash implies that the mail gets stuck on server and is never fully processed by Odoo. opw 1814014 --- addons/mail/models/mail_thread.py | 2 + addons/mail/tests/test_mail_gateway.py | 146 +++++++++++++++++++++++++ 2 files changed, 148 insertions(+) diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py index 263cfb84f08..6b41b8769d9 100644 --- a/addons/mail/models/mail_thread.py +++ b/addons/mail/models/mail_thread.py @@ -1732,6 +1732,8 @@ class MailThread(models.AbstractModel): continue if isinstance(content, pycompat.text_type): content = content.encode('utf-8') + elif content is None: + continue data_attach = { 'name': name, 'datas': base64.b64encode(content), diff --git a/addons/mail/tests/test_mail_gateway.py b/addons/mail/tests/test_mail_gateway.py index 48f32099592..12eac4437ac 100644 --- a/addons/mail/tests/test_mail_gateway.py +++ b/addons/mail/tests/test_mail_gateway.py @@ -298,6 +298,146 @@ AAAAACwAAAAAAgACAAAEA3DJFQA7 --001a11416b9e9b229a05272b7052-- """ +MAIL_EML_ATTACHMENT = """Subject: Re: test attac +From: Anon +To: anon@gmail.com +References: +Message-ID: +Date: Wed, 14 Mar 2018 14:26:58 +0100 +User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 + Thunderbird/52.6.0 +MIME-Version: 1.0 +In-Reply-To: +Content-Type: multipart/mixed; + boundary="------------A6B5FD5F68F4D73ECD739009" +Content-Language: en-US + +This is a multi-part message in MIME format. +--------------A6B5FD5F68F4D73ECD739009 +Content-Type: text/plain; charset=utf-8; format=flowed +Content-Transfer-Encoding: 7bit + + + +On 14/03/18 14:20, Anon wrote: +> Some nice content +> + + +--------------A6B5FD5F68F4D73ECD739009 +Content-Type: message/rfc822; + name="original_msg.eml" +Content-Transfer-Encoding: 8bit +Content-Disposition: attachment; + filename="original_msg.eml" + +Delivered-To: anon2@gmail1.openerp.com +Received: by 10.46.1.170 with SMTP id f42csp2379722lji; + Mon, 5 Mar 2018 01:19:23 -0800 (PST) +X-Google-Smtp-Source: AG47ELsYTlAcblMxfnaEENQuF+MFoac5Q07wieyw0cybq/qOX4+DmayqoQILkiWT+NiTOcnr/ACO +X-Received: by 10.28.154.213 with SMTP id c204mr7237750wme.64.1520241563503; + Mon, 05 Mar 2018 01:19:23 -0800 (PST) +ARC-Seal: i=1; a=rsa-sha256; t=1520241563; cv=none; + d=google.com; s=arc-20160816; + b=BqgMSbqmbpYW1ZtfGTVjj/654MBmabw4XadNZEaI96hDaub6N6cP8Guu3PoxscI9os + 0OLYVP1s/B+Vv9rIzulCwHyHsgnX+aTxGYepTDN6x8SA9Qeb9aQoNSVvQLryTAoGpaFr + vXhw8aPWyr28edE03TDFA/s7X65Bf6dV5zJdMiUPVqGkfYfcTHMf3nDER5vk8vQj7tve + Cfyy0h9vLU9RSEtdFwmlEkLmgT9NQ3GDf0jQ97eMXPgR2q6duCPoMcz15KlWOno53xgH + EiV7aIZ5ZMN/m+/2xt3br/ubJ5euFojWhDnHUZoaqd08TCSQPd4fFCCx75MjDeCnwYMn + iKSg== +ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; + h=content-language:mime-version:user-agent:date:message-id:subject + :from:to:dkim-signature:arc-authentication-results; + bh=/UIFqhjCCbwBLsI4w7YY98QH6G/wxe+2W4bbMDCskjM=; + b=Wv5jt+usnSgWI96GaZWUN8/VKl1drueDpU/4gkyX/iK4d6S4CuSDjwYAc3guz/TjeW + GoKCqT30IGZoStpXQbuLry7ezXNK+Fp8MJKN2n/x5ClJWHxIsxIGlP2QC3TO8RI0P5o0 + GXG9izW93q1ubkdPJFt3unSjjwSYf5XVQAZQtRm9xKjqA+lbtFbsnbjJ4wgYBURnD8ma + Qxb2xsxXDelaZvtdlzHRDn5SEkbqhcCclEYw6oRLpVQFZeYtPxcCleVybtj2owJxdaLp + 7wXuo/gpYe6E2cPuS2opei8AzjEhYTNzlYXTPvaoxCCTTjfGTaPv22TeRDehuIXngSEl + Nmmw== +ARC-Authentication-Results: i=1; mx.google.com; + dkim=pass header.i=@odoo.com header.s=mail header.b=MCzhjB9b; + spf=pass (google.com: domain of soup@odoo.com designates 149.202.180.44 as permitted sender) smtp.mailfrom=soup@odoo.com; + dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=odoo.com +Return-Path: +Received: from mail2.odoo.com (mail2.odoo.com. [149.202.180.44]) + by mx.google.com with ESMTPS id y4si4279200wmy.148.2018.03.05.01.19.22 + (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Mon, 05 Mar 2018 01:19:23 -0800 (PST) +Received-SPF: pass (google.com: domain of soup@odoo.com designates 149.202.180.44 as permitted sender) client-ip=149.202.180.44; +Authentication-Results: mx.google.com; + dkim=pass header.i=@odoo.com header.s=mail header.b=MCzhjB9b; + spf=pass (google.com: domain of soup@odoo.com designates 149.202.180.44 as permitted sender) smtp.mailfrom=soup@odoo.com; + dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=odoo.com +Received: from [10.10.31.24] (unknown [91.183.114.50]) + (Authenticated sender: soup) + by mail2.odoo.com (Postfix) with ESMTPSA id 7B571A4085 + for ; Mon, 5 Mar 2018 10:19:21 +0100 (CET) +DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=odoo.com; s=mail; + t=1520241562; bh=L2r7Sp/vjogIdM1k8H9zDGDjnhKolsTTLLjndnFC4Jc=; + h=To:From:Subject:Date:From; + b=MCzhjB9bnsrJ3uKjq+GjujFxmtrq3fc7Vv7Vg2C72EPKnkxgqy6yPjWKtXbBlaiT3 + YjKI24aiSQlOeOPQiqFgiDzeqqemNDp+CRuhoYz1Vbz+ESRaHtkWRLb7ZjvohS2k7e + RTq7tUxY2nUL2YrNHV7DFYtJVBwiTuyLP6eAiJdE= +To: what@odoo.com +From: Soup +Subject: =?UTF-8?Q?Soupe_du_jour_:_Pois_cass=c3=a9s?= +Message-ID: +Date: Mon, 5 Mar 2018 10:19:21 +0100 +User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 + Thunderbird/52.6.0 +MIME-Version: 1.0 +Content-Type: multipart/alternative; + boundary="------------1F2D18B1129FC2F0B9EECF50" +Content-Language: en-US +X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,BAYES_00, + HTML_IMAGE_ONLY_08,HTML_MESSAGE,T_REMOTE_IMAGE autolearn=no + autolearn_force=no version=3.4.0 +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail2.odoo.com + +This is a multi-part message in MIME format. +--------------1F2D18B1129FC2F0B9EECF50 +Content-Type: text/plain; charset=utf-8; format=flowed +Content-Transfer-Encoding: 8bit + +Résultat de recherche d'images pour "dessin la princesse au petit pois" + +-- +Soup + +Odoo S.A. +Chaussée de Namur, 40 +B-1367 Grand Rosière +Web: http://www.odoo.com + + +--------------1F2D18B1129FC2F0B9EECF50 +Content-Type: text/html; charset=utf-8 +Content-Transfer-Encoding: 8bit + + + + + + + +

Résultat de recherche d'images pour "dessin la + princesse au petit pois"

+ 
--
+Soup
+
+Odoo S.A.
+Chaussée de Namur, 40
+B-1367 Grand Rosière
+Web: http://www.odoo.com
+ + + +--------------1F2D18B1129FC2F0B9EECF50-- + +--------------A6B5FD5F68F4D73ECD739009--""" class TestMailgateway(TestMail): @@ -366,6 +506,12 @@ class TestMailgateway(TestMail): self.assertEqual(res['body'], '') self.assertEqual(res['attachments'][0][0], 'thetruth.pdf') + @mute_logger('odoo.addons.mail.models.mail_thread') + def test_message_parse_eml(self): + """ Test that the parsing of mail with embedded emails as eml(msg) which generates empty attachments, can be processed. + """ + self.env['mail.thread'].message_process('mail.channel', MAIL_EML_ATTACHMENT) + @mute_logger('odoo.addons.mail.models.mail_thread') def test_message_process_cid(self): new_groups = self.format_and_process(MAIL_MULTIPART_IMAGE, subject='My Frogs', to='groups@example.com') From ba38d22f9d5584aa9d9222bdcac3cdab0148ba17 Mon Sep 17 00:00:00 2001 From: stefanorigano Date: Mon, 7 May 2018 17:21:25 +0200 Subject: [PATCH 08/31] [FIX] portal: nav in title MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The commit fix an issue causing the portal navbar to overlap/inherit wrong style in customised websites. The previous layout used to add the entire portal navbar inside an

, causing inner elements to inherit the titles style. According to WC3 standards, titles can have phrasing content only. Titles reference > https://w3c.github.io/html-reference/h3.html Phrasing content reference > https://w3c.github.io/html-reference/common-models.html#common.elem.phrasing By chance this issue was not visible on runbot, but was severely affecting our website and probably clients ones too. This commit wrap the portal navbar in a standard bootstrap navbar structure, fixing the title issue and provinding some imp. too: - Search is now available for mobile - Modules can inject a custom/botstrap class (eg. navbar-default) ot customize design if needed --- addons/portal/static/src/less/portal.less | 71 ++++++++++- addons/portal/views/portal_templates.xml | 149 ++++++++++++---------- 2 files changed, 151 insertions(+), 69 deletions(-) diff --git a/addons/portal/static/src/less/portal.less b/addons/portal/static/src/less/portal.less index e6344b3d5d9..0e34d305fb5 100644 --- a/addons/portal/static/src/less/portal.less +++ b/addons/portal/static/src/less/portal.less @@ -289,11 +289,72 @@ img { } } - .o_portal_search_panel_fixed_width { - overflow: hidden; - max-width: 125px; - text-overflow: ellipsis; - white-space: nowrap; + .o_portal_navbar { + .navbar-brand { + margin: 0; + + @media (min-width: @grid-float-breakpoint) { + padding: @navbar-padding-vertical @navbar-padding-horizontal 0 0; + } + } + + // ===== Default portal navbar design ===== + &.o_portal_navbar_default { + margin-bottom: 8px; + + .navbar-brand { + padding: @navbar-padding-vertical @navbar-padding-horizontal 0 0; + } + + .navbar-header .dropdown-menu { + right: 0; + left: auto; + } + + .navbar-toggle { + margin-right: 0; + margin-bottom: 0; + background-color: @table-bg-active; + padding: 6px 10px @navbar-padding-vertical; + border: 1px solid @btn-default-border; + 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-base; + background-color: transparent; + } + } + + @media (max-width: @grid-float-breakpoint) { + .navbar-collapse { + z-index: 0; + box-shadow: inset 0 0 0 1px @btn-default-border; + background-color: @table-bg-active; + border-radius: @btn-border-radius-base; + border-top-right-radius: 0; + .o-transform(translateY(-2px)); + + &.in { + overflow: visible; + } + } + } + + @media (min-width: @grid-float-breakpoint) { + > .container-fluid { + padding: 0; + + .navbar-form { + padding-right: 0; + } + } + } + } } table.table tr { diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml index 6b79d009158..a242c9ef9ce 100644 --- a/addons/portal/views/portal_templates.xml +++ b/addons/portal/views/portal_templates.xml @@ -66,7 +66,7 @@