From f4e350ca36668d13c9eb09fbf77c85df110ce40c Mon Sep 17 00:00:00 2001
From: qdp-odoo <qdp@openerp.com>
Date: Thu, 4 Sep 2014 11:32:16 +0200
Subject: [FIX] account: several fixes on the new bank statement reconciliation
 widget

---
 .../css/account_bank_statement_reconciliation.css  | 56 ++++++++++++-------
 .../css/account_bank_statement_reconciliation.scss | 62 +++++++++++++++-------
 2 files changed, 79 insertions(+), 39 deletions(-)

(limited to 'addons/account/static/src/css')

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 05caeab2655..040e55eb45f 100644
--- a/addons/account/static/src/css/account_bank_statement_reconciliation.css
+++ b/addons/account/static/src/css/account_bank_statement_reconciliation.css
@@ -6,18 +6,29 @@
   -o-user-select: none;
   user-select: none;
   cursor: default;
+  height: 100%;
   /* icons */ }
+  .openerp .oe_bank_statement_reconciliation .oe_form_sheetbg {
+    border-bottom: 0;
+    padding: 0;
+    height: 100%; }
+    .openerp .oe_bank_statement_reconciliation .oe_form_sheetbg .oe_form_sheet {
+      position: relative;
+      padding: 20px 15px 30px 15px;
+      border-top: 0;
+      border-bottom: 0;
+      height: 100%; }
   .openerp .oe_bank_statement_reconciliation h1 {
     width: 48%;
     padding: 0 0 0 15px;
-    margin: 0 0 35px 0;
+    margin: 0 0 25px 0;
     float: left;
-    font-size: 2.3em; }
+    font-size: 2em; }
   .openerp .oe_bank_statement_reconciliation h2 {
     font-size: 1.8em; }
   .openerp .oe_bank_statement_reconciliation .progress {
     width: 49%;
-    margin: 6px 15px 0 0;
+    margin: 4px 15px 0 0;
     float: right;
     position: relative;
     display: inline-block; }
@@ -29,9 +40,6 @@
       top: 2px;
       z-index: 10;
       text-shadow: -1px -1px 0 #f5f5f5, 1px -1px 0 #f5f5f5, -1px 1px 0 #f5f5f5, 1px 1px 0 #f5f5f5; }
-  .openerp .oe_bank_statement_reconciliation .oe_form_sheet {
-    position: relative;
-    padding-bottom: 30px; }
   .openerp .oe_bank_statement_reconciliation .protip {
     margin: 0;
     position: absolute;
@@ -100,7 +108,12 @@
       -moz-transform: rotate(0deg);
       -ms-transform: rotate(0deg);
       -o-transform: rotate(0deg);
-      transform: rotate(0deg); }
+      transform: rotate(0deg);
+      -webkit-transition-duration: 300ms;
+      -moz-transition-duration: 300ms;
+      -ms-transition-duration: 300ms;
+      -o-transition-duration: 300ms;
+      transition-duration: 300ms; }
     .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .visible_toggle, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line[data-mode="match"] .toggle_match, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line[data-mode="create"] .toggle_create {
       visibility: visible !important;
       -webkit-transform: rotate(90deg);
@@ -136,24 +149,24 @@
       .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td {
         padding: 1px 8px;
         vertical-align: middle; }
-      .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td:nth-child(1), .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td:nth-child(7), .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td:nth-child(1), .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td:nth-child(7) {
+      .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td.cell_action, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td.cell_info_popover, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td.cell_action, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td.cell_info_popover {
         width: 15px;
         padding: 0; }
-      .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td:nth-child(1), .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td:nth-child(1) {
+      .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td.cell_action, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td.cell_action {
         text-align: left; }
-      .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td:nth-child(2), .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td:nth-child(2) {
+      .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td.cell_account_code, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td.cell_account_code {
         width: 80px;
         padding-left: 3px; }
-      .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td:nth-child(3), .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td:nth-child(3) {
+      .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td.cell_due_date, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td.cell_due_date {
         width: 100px; }
-      .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td:nth-child(5), .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td:nth-child(5) {
+      .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td.cell_debit, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td.cell_debit {
         text-align: right;
         width: 15%; }
-      .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td:nth-child(6), .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td:nth-child(6) {
+      .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td.cell_credit, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td.cell_credit {
         width: 15%;
         text-align: right;
         padding-right: 3px; }
-      .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td:nth-child(7), .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td:nth-child(7) {
+      .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td.cell_info_popover, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td.cell_info_popover {
         text-align: right; }
       .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view tr.line_open_balance, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table tr.line_open_balance {
         color: #bbb; }
@@ -176,8 +189,13 @@
       -webkit-transition-property: background-color;
       -moz-transition-property: background-color;
       -ms-transition-property: background-color;
-      transition-property: background-color; }
-      .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view .initial_line > td:nth-child(1), .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view .initial_line > td:nth-child(7) {
+      transition-property: background-color;
+      -webkit-transition-duration: 300ms;
+      -moz-transition-duration: 300ms;
+      -ms-transition-duration: 300ms;
+      -o-transition-duration: 300ms;
+      transition-duration: 300ms; }
+      .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view .initial_line > td.cell_action, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view .initial_line > td.cell_info_popover {
         border-top: none;
         background: white !important;
         padding-top: 6px;
@@ -188,9 +206,9 @@
       font-weight: bold;
       height: 26px;
       margin: 0 15px 4px 15px; }
-      .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view caption .button_ok {
+      .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view caption button {
         float: right; }
-        .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view caption .button_ok:disabled {
+        .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view caption button:disabled {
           opacity: 0.5; }
       .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view caption > span, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view caption > input {
         position: relative;
@@ -198,7 +216,7 @@
         /* meh */
         font-weight: bold;
         cursor: pointer; }
-    .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td:nth-child(6) {
+    .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td.cell_credit {
       border-left: 1px solid black; }
     .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match .match_controls {
       padding: 0 0 5px 18px; }
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 248536b7a9b..92788e3bb51 100644
--- a/addons/account/static/src/css/account_bank_statement_reconciliation.scss
+++ b/addons/account/static/src/css/account_bank_statement_reconciliation.scss
@@ -3,6 +3,8 @@ $mainTableBordersPadding: 3px;
 $lightBorder: 1px solid #bbb;
 $accountingBorder: 1px solid #000;
 $initialLineBackground: #f0f0f0;
+// Warning, this value is also specified in the instance.web.account.abstractReconciliation widget
+$aestetic_animation_speed: 300ms;
 
 
 .openerp .oe_bank_statement_reconciliation {
@@ -13,13 +15,28 @@ $initialLineBackground: #f0f0f0;
     -o-user-select: none;
     user-select: none;
     cursor: default;
+    height: 100%;
+
+    .oe_form_sheetbg {
+        border-bottom: 0;
+        padding: 0;
+        height: 100%;
+
+        .oe_form_sheet {
+            position: relative;
+            padding: 20px 15px 30px 15px;
+            border-top: 0;
+            border-bottom: 0;
+            height: 100%;
+        }
+    }
 
     h1 {
         width: 48%;
         padding: 0 0 0 $actionColWidth;
-        margin: 0 0 35px 0;
+        margin: 0 0 25px 0;
         float: left;
-        font-size: 2.3em;
+        font-size: 2em;
     }
 
     h2 {
@@ -28,7 +45,7 @@ $initialLineBackground: #f0f0f0;
 
     .progress {
         width: 49%;
-        margin: 6px $actionColWidth 0 0;
+        margin: 4px $actionColWidth 0 0;
         float: right;
         position: relative;
         display: inline-block;
@@ -48,11 +65,6 @@ $initialLineBackground: #f0f0f0;
         }
     }
 
-    .oe_form_sheet {
-        position: relative;
-        padding-bottom: 30px;
-    }
-
     .protip {
         margin: 0;
         position: absolute;
@@ -145,6 +157,11 @@ $initialLineBackground: #f0f0f0;
             -ms-transform: rotate(0deg);
             -o-transform: rotate(0deg);
             transform: rotate(0deg);
+            -webkit-transition-duration: $aestetic_animation_speed;
+            -moz-transition-duration: $aestetic_animation_speed;
+            -ms-transition-duration: $aestetic_animation_speed;
+            -o-transition-duration: $aestetic_animation_speed;
+            transition-duration: $aestetic_animation_speed;
         }
 
         .visible_toggle {
@@ -228,40 +245,40 @@ $initialLineBackground: #f0f0f0;
                 vertical-align: middle;
             }
 
-            td:nth-child(1), td:nth-child(7) {
+            td.cell_action, td.cell_info_popover {
                 width: $actionColWidth;
                 padding: 0;
             }
 
-            td:nth-child(1) {
+            td.cell_action {
                 text-align: left;
             }
 
-            td:nth-child(2) {
+            td.cell_account_code {
                 width: 80px;
                 padding-left: $mainTableBordersPadding;
             }
 
-            td:nth-child(3) {
+            td.cell_due_date {
                 width: 100px;
             }
 
-            td:nth-child(4) {
+            td.cell_label {
 
             }
 
-            td:nth-child(5) {
+            td.cell_debit {
                 text-align: right;
                 width: 15%;
             }
 
-            td:nth-child(6) {
+            td.cell_credit {
                 width: 15%;
                 text-align: right;
                 padding-right: $mainTableBordersPadding;
             }
 
-            td:nth-child(7) {
+            td.cell_info_popover {
                 text-align: right;
             }
 
@@ -301,8 +318,13 @@ $initialLineBackground: #f0f0f0;
                 -moz-transition-property: background-color;
                 -ms-transition-property: background-color;
                 transition-property: background-color;
+                -webkit-transition-duration: $aestetic_animation_speed;
+                -moz-transition-duration: $aestetic_animation_speed;
+                -ms-transition-duration: $aestetic_animation_speed;
+                -o-transition-duration: $aestetic_animation_speed;
+                transition-duration: $aestetic_animation_speed;
 
-                &:nth-child(1), &:nth-child(7) {
+                &.cell_action, &.cell_info_popover {
                     border-top: none;
                     background: white !important;
                     // Hack pour l'alignement au px près
@@ -318,7 +340,7 @@ $initialLineBackground: #f0f0f0;
                 height: 26px;
                 margin: 0 $actionColWidth 4px $actionColWidth;
 
-                .button_ok {
+                button {
                     float: right;
 
                     &:disabled {
@@ -334,7 +356,7 @@ $initialLineBackground: #f0f0f0;
             }
 
             // accounting "T"
-            td:nth-child(6) { border-left: $accountingBorder; }
+            td.cell_credit { border-left: $accountingBorder; }
         }
 
 
@@ -434,4 +456,4 @@ $initialLineBackground: #f0f0f0;
             }
         }
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3