From 903e8044259fa6982e6027e721b51c56ea911a99 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Mon, 2 Jun 2014 08:11:56 -0700 Subject: [PATCH] Fixed: Tooltips in modals --- src/UI/Content/form.less | 16 ++++++++++++++++ src/UI/Shared/Tooltip.js | 12 +----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/UI/Content/form.less b/src/UI/Content/form.less index 86ade923a..66bf13a81 100644 --- a/src/UI/Content/form.less +++ b/src/UI/Content/form.less @@ -87,3 +87,19 @@ h3 { margin-left: 0px; } } + +// Tooltips + +.help-inline-checkbox, .help-inline { + .tooltip-inner { + white-space : pre-wrap; + min-width : 200px; + } + + .help-link ~ .tooltip { + .tooltip-inner { + white-space : normal; + min-width : 0px; + } + } +} diff --git a/src/UI/Shared/Tooltip.js b/src/UI/Shared/Tooltip.js index 11906faf9..6cd84d3cc 100644 --- a/src/UI/Shared/Tooltip.js +++ b/src/UI/Shared/Tooltip.js @@ -9,17 +9,7 @@ define( console.log('starting signalR'); $('body').tooltip({ - selector: '[title]', - container: 'body' - }); - - $(document).click(function(e) { - - if ($(e.target).attr('title') !== undefined) { - return; - } - - $('.tooltip').remove(); + selector: '[title]' }); return this;