diff options
| author | Darshan Kalola (OpenERP) <dka@tinyerp.com> | 2014-03-31 15:02:50 +0530 |
|---|---|---|
| committer | Darshan Kalola (OpenERP) <dka@tinyerp.com> | 2014-03-31 15:02:50 +0530 |
| commit | ad99e8cfaebd2d686d48f6d7928ebefaa852d547 (patch) | |
| tree | 28f6b719c4c250b7397c6a39db260d8e91f5c023 /addons/web/static/src/css | |
| parent | 48388c9ad4d338050b065bdc0904a2a09ec225af (diff) | |
| parent | fc760dd0d03a07bf0c5833d93b3bcd7566a12e66 (diff) | |
[MERGE]sync with trunk.
bzr revid: dka@tinyerp.com-20140331093250-wq0tgglwqvlgyw53
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 e43a2fb654e..6a20442ed41 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"); @@ -2339,10 +2339,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 b19db9e4ebd..38a47eed1c5 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1893,10 +1893,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 |