From bdeea8ea65fa6e64635dd23ea949788f86210446 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 24 Apr 2012 14:22:49 +0200 Subject: [PATCH] [IMP] Improved styling bzr revid: fme@openerp.com-20120424122249-04hyeiq4mowetbns --- addons/web/static/src/css/base.css | 11 ++++++++--- addons/web/static/src/css/base.sass | 9 +++++++-- addons/web/static/src/js/view_form.js | 1 + addons/web/static/src/xml/base.xml | 3 ++- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 4a00d45bf9e..3bfec370679 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1382,13 +1382,18 @@ .openerp .oe_form_autolayout .oe_form_group_cell.oe_form_group_nested { padding: 0; } -.openerp .oe_form label { - font-weight: bold; -} .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_label_help[for] span, .openerp .oe_form .oe_form_label[for] span { + font-size: 80%; + color: darkGreen; + vertical-align: top; + position: relative; + top: -4px; + padding: 0 2px; +} .openerp .oe_form textarea { resize: vertical; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 46bcf1cb332..9d97b7f9aee 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1140,11 +1140,16 @@ $colour4: #8a89ba // }}} // FormView.label {{{ .oe_form - label - font-weight: bold .oe_form_label_help[for], .oe_form_label[for] white-space: nowrap padding-right: 8px + span + font-size: 80% + color: darkGreen + vertical-align: top + position: relative + top: -4px + padding: 0 2px // }}} // FormView.fields {{{ .oe_form diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 3ce3fd3ae9c..677838a79a6 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -1211,6 +1211,7 @@ instance.web.form.FormRenderingEngine = instance.web.Class.extend({ if (modifiers.invisible !== undefined) new instance.web.form.InvisibilityChanger(this.view, this.view, modifiers.invisible, $new_element); $new_element.addClass($node.attr("class") || ""); + $new_element.attr('style', $node.attr('style')); }, }); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 624abcf10ca..1ed4ed6a72d 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -794,7 +794,8 @@ - + +