From bf9544d7d430704efd006cca182a7120a55a0c8a Mon Sep 17 00:00:00 2001 From: Nicolas Lempereur Date: Fri, 24 Apr 2015 09:35:51 +0200 Subject: [PATCH] [FIX] account: float issue in reconciliation wizard The CSS on the linei with the "New" button of an bank statement reconciliation wizard was only applied when there was only a multiple of two "block" before. Hence it worked when there was a multiple of 2 cases before, but if not (for example when account_analytic_plans is installed) on: - google chrome: the button is on the right (instead of on a line by its own). - firefox: idem, but also a difference in float display positioning caused the parent container to not take floating elements into account to calculate it's height. This fix apply the CSS independently if the last block is even or odd. Before this fix in firefox: https://cloud.githubusercontent.com/assets/9977887/7315195/70ca5eca-ea6b-11e4-8892-1272f7ee0cb4.png After this fix in firefox: https://cloud.githubusercontent.com/assets/9977887/7315194/6e2b05ca-ea6b-11e4-9400-69c9cd587756.png closes #6459 opw-633703 --- .../src/css/account_bank_statement_reconciliation.css | 10 +++++----- .../src/css/account_bank_statement_reconciliation.scss | 8 +++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/addons/account/static/src/css/account_bank_statement_reconciliation.css b/addons/account/static/src/css/account_bank_statement_reconciliation.css index 0b4f5aad0af..fd7e77b9983 100644 --- a/addons/account/static/src/css/account_bank_statement_reconciliation.css +++ b/addons/account/static/src/css/account_bank_statement_reconciliation.css @@ -292,11 +292,11 @@ padding-left: 8px; } .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .create .oe_form > table input, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .create .oe_form > table select { width: 100%; } - .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .create .oe_form > table.add_line_container:nth-child(2n+1) { + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .create .oe_form > table.add_line_container { width: 98%; float: none; margin: auto; } - .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .create .oe_form > table.add_line_container td { - text-align: center; } - .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .create .oe_form > table.add_line_container .add_line { - line-height: 26px; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .create .oe_form > table.add_line_container td { + text-align: center; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .create .oe_form > table.add_line_container .add_line { + line-height: 26px; } diff --git a/addons/account/static/src/css/account_bank_statement_reconciliation.scss b/addons/account/static/src/css/account_bank_statement_reconciliation.scss index de05a8647eb..08d14a201ba 100644 --- a/addons/account/static/src/css/account_bank_statement_reconciliation.scss +++ b/addons/account/static/src/css/account_bank_statement_reconciliation.scss @@ -480,11 +480,9 @@ $aestetic_animation_speed: 300ms; } &.add_line_container { - &:nth-child(2n+1) { - width: 98%; - float: none; - margin: auto; - } + width: 98%; + float: none; + margin: auto; td { text-align: center;