From a181c840a80edf3a59100a944f89cb23a0b73587 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 10 Apr 2012 14:26:17 +0200 Subject: [PATCH] [FIX] Fixed m2o and tooltip styling bzr revid: fme@openerp.com-20120410122617-ipj1phnn07k7n069 --- .../static/lib/jquery.tipsy/jquery.tipsy.js | 2 +- addons/web/static/src/css/base.css | 33 ++++++++++++++++--- addons/web/static/src/css/base.sass | 25 +++++++++++--- 3 files changed, 49 insertions(+), 11 deletions(-) diff --git a/addons/web/static/lib/jquery.tipsy/jquery.tipsy.js b/addons/web/static/lib/jquery.tipsy/jquery.tipsy.js index 09dda6a3060..f36c9bdb43a 100644 --- a/addons/web/static/lib/jquery.tipsy/jquery.tipsy.js +++ b/addons/web/static/lib/jquery.tipsy/jquery.tipsy.js @@ -63,7 +63,7 @@ } } - $tip.css(tp).addClass('tipsy-' + gravity); + $tip.css(tp).addClass('openerp oe_tooltip tipsy-' + gravity); $tip.find('.tipsy-arrow')[0].className = 'tipsy-arrow tipsy-arrow-' + gravity.charAt(0); if (this.options.className) { $tip.addClass(maybeCall(this.options.className, this.$element[0])); diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 217998adcab..7f0ae38989b 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -11,6 +11,7 @@ .openerp.openerp-web-client-container { height: 100%; + position: relative; } .openerp { @@ -20,15 +21,16 @@ color: #4c4c4c; font-size: 13px; background: white; - position: relative; - height: 100%; - /* http://www.quirksmode.org/dom/inputfile.html - * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ } .openerp a { text-decoration: none; } + +.openerp { + /* http://www.quirksmode.org/dom/inputfile.html + * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image + */ +} .openerp table { padding: 0; font-size: 13px; @@ -1739,6 +1741,27 @@ .openerp .oe_trad_field.touched { border: 1px solid green !important; } +.openerp.oe_tooltip { + font-size: 12px; +} +.openerp.oe_tooltip .oe_tooltip_string { + color: #ffdd55; + font-weight: bold; + font-size: 13px; +} +.openerp.oe_tooltip .oe_tooltip_help { + white-space: pre-wrap; +} +.openerp.oe_tooltip .oe_tooltip_technical { + padding: 0 0 4px 0; + margin: 5px 0 0 15px; +} +.openerp.oe_tooltip .oe_tooltip_technical li { + list-style: circle; +} +.openerp.oe_tooltip .oe_tooltip_technical_title { + font-weight: bold; +} .openerp .oe_layout_debugging .oe_form_group { border: 2px dashed red; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 4913a12a449..9b5b5e7219b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -68,10 +68,9 @@ $colour4: #8a89ba .openerp.openerp-web-client-container height: 100% + position: relative .openerp - // Group {{{ - // }}} // Global style {{{ padding: 0 margin: 0 @@ -79,12 +78,11 @@ $colour4: #8a89ba color: #4c4c4c font-size: 13px background: white - position: relative - height: 100% - a text-decoration: none // }}} + +.openerp // Tag reset {{{ table padding: 0 @@ -1456,6 +1454,23 @@ $colour4: #8a89ba .oe_trad_field.touched border: 1px solid green !important // }}} + // Tooltips {{{ + &.oe_tooltip + font-size: 12px + .oe_tooltip_string + color: #FD5 + font-weight: bold + font-size: 13px + .oe_tooltip_help + white-space: pre-wrap + .oe_tooltip_technical + padding: 0 0 4px 0 + margin: 5px 0 0 15px + li + list-style: circle + .oe_tooltip_technical_title + font-weight: bold + // }}} // Debugging stuff {{{ .oe_layout_debugging