[MERGE] forward port of branch 8.0 up to 780dd98

2 files changed, 14 insertions, 29 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 2cd8b4b2ad1..9492c53aac2 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1002,20 +1002,8 @@
   text-align: center;
   margin: 10px 0 0;
 }
-.openerp .oe_about .user-details .user-info-block .navigation {
-  float: left;
-  width: auto;
-  padding: 0;
-  margin-left: 25%;
-  list-style: none;
-  border: 1px solid #a24689;
-}
-.openerp .oe_about .user-details .user-info-block .navigation li {
-  float: left;
-}
 .openerp .oe_about .user-details .user-info-block .navigation li a {
-  padding: 20px 30px;
-  float: left;
+  padding: 10px 20px;
 }
 .openerp .oe_about .user-details .user-info-block .navigation li.active a {
   background: #a24689;
@@ -1914,17 +1902,17 @@
 .openerp .oe_application .oe_form_sheet .oe_notebook_page {
   padding: 0 16px;
 }
-.openerp .oe_form > :not(.oe_form_nosheet) header {
+.openerp .oe_form > :not(.oe_form_nosheet) header, .openerp .oe_form > .oe_form_nosheet header {
   padding-left: 2px;
 }
-.openerp .oe_form > :not(.oe_form_nosheet) header ul:not(.oe_tooltip_technical):not(.oe_dropdown_menu) {
+.openerp .oe_form > :not(.oe_form_nosheet) header ul:not(.oe_tooltip_technical):not(.oe_dropdown_menu), .openerp .oe_form > .oe_form_nosheet header ul:not(.oe_tooltip_technical):not(.oe_dropdown_menu) {
   display: inline-block;
   float: right;
 }
-.openerp .oe_form > :not(.oe_form_nosheet) header .oe_button {
+.openerp .oe_form > :not(.oe_form_nosheet) header .oe_button, .openerp .oe_form > .oe_form_nosheet header .oe_button {
   margin: 3px 2px 1px;
 }
-.openerp .oe_form > :not(.oe_form_nosheet) header .oe_button:first-child {
+.openerp .oe_form > :not(.oe_form_nosheet) header .oe_button:first-child, .openerp .oe_form > .oe_form_nosheet header .oe_button:first-child {
   margin-left: 6px;
 }
 .openerp .oe_form header {
@@ -2642,7 +2630,9 @@
 .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float.oe_readonly, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer.oe_readonly {
   padding: 6px 0px 0px;
   text-align: right;
-  max-width: 100px;
+}
+.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float span, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer span {
+  padding: 0px 6px;
 }
 .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer input {
   width: 100% !important;
@@ -3373,6 +3363,7 @@ body.oe_single_form .oe_single_form_container {
 }
 .modal .oe_act_window.modal-body {
   padding: 0;
+  overflow-x: auto;
 }
 
 .ui-datepicker {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 5ba6f747a5a..9897a99fe3d 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -869,17 +869,9 @@ $sheet-padding: 16px
                     text-align: center
                     margin: 10px 0 0
                 .navigation
-                    float: left
-                    width: auto
-                    padding: 0
-                    margin-left: 25%
-                    list-style: none
-                    border: 1px solid $link-color-odoo
                     li
-                        float: left
                         a
-                            padding: 20px 30px
-                            float: left
+                            padding: 10px 20px
                         &.active a
                             background: $link-color-odoo
                             color: #fff
@@ -1579,7 +1571,7 @@ $sheet-padding: 16px
                 padding: 0 16px
     // }}}
     // FormView.header {{{
-    .oe_form > :not(.oe_form_nosheet) header
+    .oe_form > :not(.oe_form_nosheet) header, .oe_form > .oe_form_nosheet header
         padding-left: 2px
         ul:not(.oe_tooltip_technical):not(.oe_dropdown_menu)
             display: inline-block
@@ -2148,7 +2140,8 @@ $sheet-padding: 16px
                 &.oe_readonly
                     padding: 6px 0px 0px
                     text-align: right
-                    max-width: 100px
+                span
+                    padding: 0px 6px
                 input
                     width: 100% !important
                     text-align: right
@@ -2757,6 +2750,7 @@ body.oe_single_form
         margin: 0 4px 0 0
     .oe_act_window.modal-body
         padding: 0
+        overflow-x: auto
 
 .ui-datepicker
     z-index: 1500 !important