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

bzr revid: fp@openerp.com-20120713222528-5sflq6ah9redrcry

diff --cc addons/web/static/src/css/base.css
index 05c0a9b,466faec..bea27cd
--- 1/addons/web/static/src/css/base.css
--- 2/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@@ -202,7 -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 {
@@@ -1964,15 -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;
  }
@@@ -1990,10 -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: 180px;
 -  width: 112px;
++  width: 8em;
  }
  .openerp .oe_form .oe_form_field_date {
    width: 7.5em;

diff --cc addons/web/static/src/css/base.sass
index f6e3e9a,ea05249..7235e94
--- 1/addons/web/static/src/css/base.sass
--- 2/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@@ -214,7 -214,7 +214,9 @@@ $sheet-max-width: 860p
          @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
@@@ -1537,12 -1534,12 +1539,6 @@@
              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
@@@ -1556,9 -1553,9 +1552,9 @@@
              input
                  margin: 0px
          .oe_form_field_integer
--            width: 180px
++            width: 7em
          .oe_form_field_float
-             width: 180px
 -            width: 112px
++            width: 8em
          .oe_form_field_date
              width: 7.5em
          .oe_form_field_datetime

diff --cc addons/web/static/src/js/chrome.js
index 5280907,5280907..094e2f1
--- 1/addons/web/static/src/js/chrome.js
--- 2/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@@ -63,7 -63,7 +63,7 @@@ instance.web.Dialog = instance.web.Widg
          this.dialog_options = {
              modal: true,
              destroy_on_close: true,
--            width: 700,
++            width: 900,
              min_width: 0,
              max_width: '95%',
              height: 'auto',

diff --cc addons/web/static/src/js/view_form.js
index 3a3c49b,3a3c49b..bf4549a
--- 1/addons/web/static/src/js/view_form.js
--- 2/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@@ -3868,7 -3868,7 +3868,6 @@@ instance.web.form.AbstractFormPopup = i
          var self = this;
          this.renderElement();
          new instance.web.Dialog(this, {
--            width: '90%',
              min_width: '800px',
              close: function() {
                  self.check_exit(true);