From 637c7dfb1982aeff924ac1c6b260e91f9b22ce20 Mon Sep 17 00:00:00 2001 From: Zanz2 Date: Fri, 17 Aug 2018 11:33:44 +0200 Subject: [PATCH] modified styling and behaviour of popovers (tooltips) also made relevant text changes, except for last one in epic --- .../javascripts/sitewide/popover_helper.js | 18 ++++-- app/views/shared/_navigation.html.erb | 10 +-- config/locales/en.yml | 64 ++++++++++++++++--- 3 files changed, 71 insertions(+), 21 deletions(-) diff --git a/app/assets/javascripts/sitewide/popover_helper.js b/app/assets/javascripts/sitewide/popover_helper.js index 1a92ab29d..cc9216687 100644 --- a/app/assets/javascripts/sitewide/popover_helper.js +++ b/app/assets/javascripts/sitewide/popover_helper.js @@ -3,32 +3,36 @@ $(document).ready(function() { $('.popover_v2').each(function(i,obj) { - + var link = $(obj).data('popover-link') $(obj).popover({ html: true, container: 'body', placement: 'auto right', trigger: 'manual', - template: '' }).on("mouseenter", function () { setTimeout(function () { if ($(obj).hover().length) { $(obj).popover("show") var top = $(obj).offset().top; - $('body').find('.popover_'+i+'_window').css({ + $('.popover_'+i+'_window').css({ top: (top) + 'px' }); - $('body').find(".popover_"+i+"_window").on("mouseleave", function () { + $(".popover_"+i+"_window").on("mouseleave", function () { + $(".popover_"+i+"_window").css("background-color","#F0F0F0"); $(obj).popover('hide'); }); + $(".popover_"+i+"_window").on("mouseenter", function () { + $(".popover_"+i+"_window").css("background-color","#DADADA"); + }); } }, 1000); }).on("mouseleave", function () { setTimeout(function () { - if (!$('body').find(".popover_"+i+"_window:hover").length) { + if (!$(".popover_"+i+"_window:hover").length) { $(obj).popover("hide") } }, 500); diff --git a/app/views/shared/_navigation.html.erb b/app/views/shared/_navigation.html.erb index 6575dfab8..36cf190f5 100644 --- a/app/views/shared/_navigation.html.erb +++ b/app/views/shared/_navigation.html.erb @@ -71,16 +71,16 @@