[FIX] lp:1119289, update base.sass to reflect earlier changes to css

+ regenerate css https://launchpad.net/bugs/1119289
OCA · Jul 2, 2014 · 60ccc93 · 60ccc93
1 parent f2bf3e1
commit 60ccc93
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
@@ -2142,7 +2142,7 @@
   min-height: 330px;
   padding: 16px;
 }
-.openerp .oe_form_sheet .oe_form_field_one2many, .openerp .oe_form_sheet .oe_form_field_many2many {
+.openerp .oe_form_sheet .oe_list {
   overflow-x: auto;
 }
 .openerp .oe_application .oe_form_sheetbg {
@@ -2195,8 +2195,8 @@
 .openerp .oe_form div.oe_chatter {
   box-sizing: border-box;
   min-width: 682px;
-  max-width: 892px;
-  margin: 0 auto;
+  max-width: 0 auto;
+  margin: 16px;
   padding: 16px 16px 48px;
 }
 .openerp .oe_form div.oe_form_configuration p, .openerp .oe_form div.oe_form_configuration ul, .openerp .oe_form div.oe_form_configuration ol {
@@ -2764,6 +2764,9 @@
 .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page {
   display: none;
 }
+.openerp .oe_form_field_one2many, .openerp .oe_form_field_many2many {
+  overflow-x: auto;
+}
 .openerp .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page, .openerp .oe_form_field_many2many > .oe_view_manager .oe_list_pager_single_page {
   display: none !important;
 }

diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
@@ -9,7 +9,7 @@ $tag-border: #afafb6
 $tag-border-selected: #a6a6fe
 $hover-background: #f0f0fa
 $link-color: #7C7BAD
-$sheet-max-width: 860px
+$sheet-max-width: auto
 $sheet-min-width: 650px
 $sheet-padding: 16px
 // }}}
@@ -1688,7 +1688,7 @@ $sheet-padding: 16px
     .oe_form_sheet_width
         min-width: 650px
         max-width: $sheet-max-width
-        margin: 0 auto
+        margin: 16px
     .oe_form_sheet
         background: white
         min-height: 330px
@@ -1735,8 +1735,8 @@ $sheet-padding: 16px
         div.oe_chatter
             box-sizing: border-box
             min-width: $sheet-min-width + 2* $sheet-padding
-            max-width: $sheet-max-width + 2* $sheet-padding
-            margin: 0 auto
+            max-width: 0 auto
+            margin: 16px
             padding: 16px 16px 48px
         div.oe_form_configuration
             p, ul, ol
@@ -2169,6 +2169,7 @@ $sheet-padding: 16px
             display: none
     .oe_form_field_one2many,.oe_form_field_many2many
         // TODO: oe_form_field_one2many_list?
+        overflow-x: auto
         > .oe_view_manager
             .oe_list_pager_single_page
                 display: none !important
@@ -2628,7 +2629,7 @@ div.ui-widget-overlay
                     filter: alpha(opacity = 0)
                     border: none
                     width: 0
-                    border-right: none 
+                    border-right: none
         .label
             border-bottom: 1px solid #cacaca
             background: transparent