diff options
| author | Gery Debongnie <ged@openerp.com> | 2014-03-19 10:01:53 +0100 |
|---|---|---|
| committer | Gery Debongnie <ged@openerp.com> | 2014-03-19 10:01:53 +0100 |
| commit | 8ac730074ac87a2e79aeaa51fc9bac3de9c81816 (patch) | |
| tree | 2417ebf2aaf60f5b75e5f44514ce471033d5ae28 /addons/web/static/src/css | |
| parent | f4cfed3f0e89f8841b16ad578dd2c360f01d18ec (diff) | |
| parent | a2f9619e267a45d0959e7a942ba4e520d91fbb94 (diff) | |
[MERGE] merge from trunk into local branch
bzr revid: ged@openerp.com-20140319090153-aczgy9uqqw72702x
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 9 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 53043f2f4c5..0bf5a2d437e 100644 --- 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"); @@ -2374,10 +2374,9 @@ } .openerp .oe_form .oe_form_embedded_html { position: relative; - width: 600px; - margin-left: 130px; - margin-top: 32px; - margin-bottom: 32px; + width: 100%; + margin: auto; + overflow: auto; text-align: justify; } .openerp .oe_form .oe_form_field_html .oe_input_icon { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 466f60fa861..e6749747021 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1923,10 +1923,9 @@ $sheet-padding: 16px overflow: hidden .oe_form_embedded_html position: relative - width: 600px - margin-left: 130px - margin-top: 32px - margin-bottom: 32px + width: 100% + margin: auto + overflow: auto text-align: justify .oe_form_field_html .oe_input_icon float: right |