diff options
| author | Christophe Simonis <chs@odoo.com> | 2014-06-19 16:13:35 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2014-06-19 16:13:35 +0200 |
| commit | adf07a9490436211d16da8b1355c3bae4448a54a (patch) | |
| tree | ceab9f348148bd97729209cde4cc892ea1b195a7 /addons/web/static/src/css | |
| parent | 6618a9a1e5067444eedba4ac3c5c3c843a74798c (diff) | |
| parent | 5087612d1da85a8661f7aa124969b2ee9e155c10 (diff) | |
[MERGE] forward port of branch saas-4 up to 5087612
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 5 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index f664baf5319..901e0325cae 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2350,7 +2350,7 @@ } .openerp .oe_fileupload .oe_add button.oe_attach .oe_e { position: relative; - top: -1px; + top: -10px; left: -9px; } .openerp .oe_fileupload .oe_add input.oe_form_binary_file { @@ -3301,6 +3301,9 @@ body.oe_single_form .oe_single_form_container { .openerp_ie ul.oe_form_status li.oe_active > .arrow span, .openerp_ie ul.oe_form_status_clickable li.oe_active > .arrow span { background-color: #729fcf !important; } +} +.openerp_ie .oe_webclient { + height: auto !important; @media print { .openerp { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 4d952cc47bb..136cdbdef24 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1918,7 +1918,7 @@ $sheet-padding: 16px text-shadow: none .oe_e position: relative - top: -1px + top: -10px left: -9px input.oe_form_binary_file display: inline-block @@ -2670,6 +2670,8 @@ body.oe_single_form > .arrow span background-color: #729fcf !important + .oe_webclient + height: auto !important // }}} // @media print {{{ |