[IMP] layout web, mianly dialogs and improved mit merge

[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 ea05249..7235e94 100644 (file)
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -214,7 +214,9 @@ $sheet-max-width: 860px
         @include radius(8px)
         @include box-shadow(0 1px 12px rgba(0, 0, 0, 0.6))
         @include background-clip()
-        .ui-dialog-titlebar, .ui-dialog-content, .ui-dialog-buttonpane
+        .ui-dialog-content
+            padding: 0px
+        .ui-dialog-titlebar, .ui-dialog-buttonpane
             padding: 16px
         .ui-dialog-titlebar
             border-bottom: 1px solid #cacaca
@@ -1372,6 +1374,9 @@ $sheet-max-width: 860px
             display: none !important
         .oe_form .oe_form_field_date
             width: auto
+    .oe_form_nosheet
+        margin-left: 10px
+        margin-right: 10px
     .oe_form_nosheet > header
         margin-left: -10px
         margin-right: -10px
@@ -1534,12 +1539,6 @@ $sheet-max-width: 860px
             width: 100%
         .oe_form_field_text.oe_inline, .oe_form_field_text.oe_inline > textarea
             width: 500px
-        .oe_form_field_float input
-            width: 100px
-        h1 .oe_form_field_float input
-            width: 140px
-        h2 .oe_form_field_float input
-            width: 120px
         h1, h2, h3, h4, h5, h6
             margin: 0 0 4px 0
             input
@@ -1553,9 +1552,9 @@ $sheet-max-width: 860px
             input
                 margin: 0px
         .oe_form_field_integer
-            width: 180px
+            width: 7em
         .oe_form_field_float
-            width: 112px
+            width: 8em
         .oe_form_field_date
             width: 7.5em
         .oe_form_field_datetime