[MERGE] from master

[odoo/odoo.git] / addons / web / static / src / css / base.sass

diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 2e6e28b..fa37c1c 100644 (file)
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -908,6 +908,8 @@ $sheet-padding: 16px
         -webkit-user-select: none
         -moz-user-select: none
         user-select: none
+        .oe-button-column
+            height: 30px
         .dropdown-menu
             li
                 position: relative
@@ -1424,7 +1426,7 @@ $sheet-padding: 16px
             td.oe_form_group_cell_label
                 border-right: none
             .oe_subtotal_footer_separator
-                width: 108px
+                min-width: 108px
                 border-top: 1px solid #cacaca
                 margin-top: 4px
                 padding-top: 4px
@@ -1691,6 +1693,9 @@ $sheet-padding: 16px
                 @include box-sizing(border)
             &:hover .oe_form_field_image_controls
                 display: block
+            img
+                max-width: 256px
+                max-height: 256px
     .oe_fileupload
         display: inline-block
         clear: both