diff options
| author | Christophe Simonis <chs@odoo.com> | 2014-06-19 16:23:32 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2014-06-19 16:23:32 +0200 |
| commit | eef6330c55bc7d829359fbb733a1adc4c149309b (patch) | |
| tree | 11dede8d58d1db5d3f2998e79b3ecd9dd0e76776 /addons/web/static/src/css | |
| parent | dc4178a9624e49b6bad7dc924206b22fc23d435e (diff) | |
| parent | adf07a9490436211d16da8b1355c3bae4448a54a (diff) | |
[MERGE] forward port of branch saas-5 up to adf07a9
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 b234e2738df..9988e7eae74 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2373,7 +2373,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 { @@ -3324,6 +3324,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 093ebf6cb0b..b85346a2c8f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1939,7 +1939,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 @@ -2691,6 +2691,8 @@ body.oe_single_form > .arrow span background-color: #729fcf !important + .oe_webclient + height: auto !important // }}} // @media print {{{ |