From 7f941364ca0885362a9857e81653dd5685356181 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 24 Apr 2012 11:03:50 +0200 Subject: [PATCH] [ADD] Add some css classes for new layout bzr revid: fme@openerp.com-20120424090350-0lwpaf5sord0bhor --- addons/web/static/src/css/base.css | 28 +++++++++++++++++--------- addons/web/static/src/css/base.sass | 29 ++++++++++++++++++--------- addons/web/static/src/js/view_form.js | 2 +- addons/web/static/src/xml/base.xml | 1 - 4 files changed, 40 insertions(+), 20 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index b5c224e2fd3..4646abbc780 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1353,10 +1353,6 @@ padding: 2px; height: 25px; } -.openerp .oe_form_autolayout .oe_form_group_cell .oe_form_button { - width: 100%; - white-space: nowrap; -} .openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_many2one, .openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_many2one input, .openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_char input, @@ -1373,23 +1369,33 @@ } .openerp .oe_form_autolayout .oe_form_button.oe_button { color: #4c4c4c; - white-space: nowrap; - min-width: 100%; - width: 100%; - height: 22px; } .openerp .oe_form_autolayout .oe_form_button.oe_button span { position: relative; vertical-align: top; } +.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_button.oe_button { + white-space: nowrap; + min-width: 100%; + width: 100%; +} .openerp .oe_form_autolayout .oe_form_group_cell.oe_form_group_nested { padding: 0; } .openerp .oe_form label { font-weight: bold; } -.openerp .oe_form_label_help[for], .openerp .oe_form_label[for] { +.openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] { white-space: nowrap; + padding-right: 8px; +} +.openerp .oe_form .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:nth-child(odd), +.openerp .oe_form .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell_label { + border-right: 1px solid #dddddd; +} +.openerp .oe_form .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:nth-child(even), +.openerp .oe_form .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:not(.oe_form_group_cell_label):not(:first-child) { + padding-left: 8px; } .openerp .oe_form textarea { resize: vertical; @@ -1617,6 +1623,10 @@ height: auto; line-height: 16px; } +.openerp .oe_form .oe_form_title, .openerp .oe_form .oe_form_title input { + font-size: 20px; + font-weight: bold; +} .openerp .oe_listview_nocontent > img { float: left; margin-right: 1.5em; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 65c5b0b283a..673230865e1 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1113,9 +1113,6 @@ $colour4: #8a89ba line-height: 18px padding: 2px height: 25px - .oe_form_button - width: 100% - white-space: nowrap .oe_form_group_cell > .oe_form_field_many2one, .oe_form_group_cell > .oe_form_field_many2one input, .oe_form_group_cell > .oe_form_field_char input, @@ -1131,13 +1128,13 @@ $colour4: #8a89ba width: 100% .oe_form_button.oe_button color: #4c4c4c - white-space: nowrap - min-width: 100% - width: 100% - height: 22px span position: relative vertical-align: top + .oe_form_group_cell > .oe_form_button.oe_button + white-space: nowrap + min-width: 100% + width: 100% .oe_form_group_cell.oe_form_group_nested padding: 0 // }}} @@ -1145,8 +1142,15 @@ $colour4: #8a89ba .oe_form label font-weight: bold - .oe_form_label_help[for], .oe_form_label[for] - white-space: nowrap + .oe_form_label_help[for], .oe_form_label[for] + white-space: nowrap + padding-right: 8px + .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:nth-child(odd), + .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell_label + border-right: 1px solid #ddd + .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:nth-child(even), + .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:not(.oe_form_group_cell_label):not(:first-child) + padding-left: 8px // }}} // FormView.fields {{{ .oe_form @@ -1362,6 +1366,13 @@ $colour4: #8a89ba height: auto line-height: 16px + // }}} + // FormView.classes for openerp views {{{ + .oe_form + .oe_form_title, .oe_form_title input + font-size: 20px + font-weight: bold + // }}} // ListView {{{ .oe_listview_nocontent diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 2e48ec75649..af333bd2eeb 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -1110,7 +1110,7 @@ instance.web.form.FormRenderingEngine = instance.web.Class.extend({ break; case 'label': if ($child.attr('for')) { - $td.attr('width', '1%'); + $td.attr('width', '1%').addClass('oe_form_group_cell_label'); row_cols--; total--; } diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index f8277c30ac3..15eef62c64b 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -835,7 +835,6 @@ t-attf-class="#{classnames} oe_form_label#{help ? '_help' : ''} oe_align_#{align}"> ? - :