diff options
| author | Christophe Simonis <chs@odoo.com> | 2014-09-15 13:52:44 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2014-09-15 14:00:02 +0200 |
| commit | 780dd9891f5783fd07a075a445314df912d0a88c (patch) | |
| tree | f84fd550af3b0e0de1e41328b498c9593355b8f8 /addons/web/static/src/css | |
| parent | 9c0964ccadadb7358ac0184effdf3c836a04f7ce (diff) | |
| parent | 7eab880660da4a1a9cc25619f2314bdde5062091 (diff) | |
[MERGE] forward port of branch saas-5 up to 7eab880
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 12 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 5 |
2 files changed, 10 insertions, 7 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index fb02252e548..aa8278d99e8 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1900,17 +1900,17 @@ .openerp .oe_application .oe_form_sheet .oe_notebook_page { padding: 0 16px; } -.openerp .oe_form > :not(.oe_form_nosheet) header { +.openerp .oe_form > :not(.oe_form_nosheet) header, .openerp .oe_form > .oe_form_nosheet header { padding-left: 2px; } -.openerp .oe_form > :not(.oe_form_nosheet) header ul:not(.oe_tooltip_technical):not(.oe_dropdown_menu) { +.openerp .oe_form > :not(.oe_form_nosheet) header ul:not(.oe_tooltip_technical):not(.oe_dropdown_menu), .openerp .oe_form > .oe_form_nosheet header ul:not(.oe_tooltip_technical):not(.oe_dropdown_menu) { display: inline-block; float: right; } -.openerp .oe_form > :not(.oe_form_nosheet) header .oe_button { +.openerp .oe_form > :not(.oe_form_nosheet) header .oe_button, .openerp .oe_form > .oe_form_nosheet header .oe_button { margin: 3px 2px 1px; } -.openerp .oe_form > :not(.oe_form_nosheet) header .oe_button:first-child { +.openerp .oe_form > :not(.oe_form_nosheet) header .oe_button:first-child, .openerp .oe_form > .oe_form_nosheet header .oe_button:first-child { margin-left: 6px; } .openerp .oe_form header { @@ -2631,7 +2631,9 @@ .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float.oe_readonly, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer.oe_readonly { padding: 6px 0px 0px; text-align: right; - max-width: 100px; +} +.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float span, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer span { + padding: 0px 6px; } .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer input { width: 100% !important; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 9205683eeb4..e8b379ea50f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1571,7 +1571,7 @@ $sheet-padding: 16px padding: 0 16px // }}} // FormView.header {{{ - .oe_form > :not(.oe_form_nosheet) header + .oe_form > :not(.oe_form_nosheet) header, .oe_form > .oe_form_nosheet header padding-left: 2px ul:not(.oe_tooltip_technical):not(.oe_dropdown_menu) display: inline-block @@ -2142,7 +2142,8 @@ $sheet-padding: 16px &.oe_readonly padding: 6px 0px 0px text-align: right - max-width: 100px + span + padding: 0px 6px input width: 100% !important text-align: right |