diff options
| author | Christophe Simonis <chs@odoo.com> | 2014-09-12 18:53:48 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2014-09-12 18:53:48 +0200 |
| commit | 56f2b7ae0f8c958ef78da7cf466e7908abcd29c6 (patch) | |
| tree | d4e87cd25cea80059723fd61a72b3c4eaf86841a /addons/web/static/src/css | |
| parent | d3ba8a840d986a224281a2844ccabcbc8c41ffd4 (diff) | |
| parent | fdc62713a5ac7a4f084a911311150fc6b9fe4a21 (diff) | |
[MERGE] forward port of branch saas-3 up to fdc6271
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 b120874fc8c..5002f46ce7b 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1935,17 +1935,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 { @@ -2666,7 +2666,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 6250d112fb2..d736b57c6b4 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1577,7 +1577,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 @@ -2148,7 +2148,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 |