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

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

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 466faec..bea27cd 100644 (file)
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "UTF-8";
+@charset "utf-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -202,7 +202,10 @@
   -moz-background-clip: padding-box;
   background-clip: padding-box;
 }
-.openerp.ui-dialog .ui-dialog-titlebar, .openerp.ui-dialog .ui-dialog-content, .openerp.ui-dialog .ui-dialog-buttonpane {
+.openerp.ui-dialog .ui-dialog-content {
+  padding: 0px;
+}
+.openerp.ui-dialog .ui-dialog-titlebar, .openerp.ui-dialog .ui-dialog-buttonpane {
   padding: 16px;
 }
 .openerp.ui-dialog .ui-dialog-titlebar {
@@ -1763,6 +1766,10 @@
 .openerp .oe_form_readonly .oe_form .oe_form_field_date {
   width: auto;
 }
+.openerp .oe_form_nosheet {
+  margin-left: 10px;
+  margin-right: 10px;
+}
 .openerp .oe_form_nosheet > header {
   margin-left: -10px;
   margin-right: -10px;
@@ -1960,15 +1967,6 @@
 .openerp .oe_form .oe_form_field_text.oe_inline, .openerp .oe_form .oe_form_field_text.oe_inline > textarea {
   width: 500px;
 }
-.openerp .oe_form .oe_form_field_float input {
-  width: 100px;
-}
-.openerp .oe_form h1 .oe_form_field_float input {
-  width: 140px;
-}
-.openerp .oe_form h2 .oe_form_field_float input {
-  width: 120px;
-}
 .openerp .oe_form h1, .openerp .oe_form h2, .openerp .oe_form h3, .openerp .oe_form h4, .openerp .oe_form h5, .openerp .oe_form h6 {
   margin: 0 0 4px 0;
 }
@@ -1986,10 +1984,10 @@
   margin: 0px;
 }
 .openerp .oe_form .oe_form_field_integer {
-  width: 180px;
+  width: 7em;
 }
 .openerp .oe_form .oe_form_field_float {
-  width: 112px;
+  width: 8em;
 }
 .openerp .oe_form .oe_form_field_date {
   width: 7.5em;