From 1ee9d4f234ddc041ef2928a4398e960f5e4ddea7 Mon Sep 17 00:00:00 2001 From: Piotr Gawron Date: Tue, 16 Jun 2020 11:33:58 +0200 Subject: [PATCH] tooltip is centered and delay is reduced to 0ms --- CHANGELOG | 2 ++ frontend-js/src/main/css/global.css | 4 +++- .../src/main/js/gui/leftPanel/ChemicalPanel.js | 12 ++++++++---- frontend-js/src/main/js/gui/leftPanel/DrugPanel.js | 14 +++++++++----- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 63425004a..299358ad8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ minerva (15.0.0~beta.5) unstable; urgency=medium * Backward incompatible: truncation/association/dissocation points are represented as a dot in all new images/uploaded maps (#1265) + * Small improvement: warning message about disabled DAPI is centered and + tooltip appears almost immediately on hover (#1294) * Bug fix: links to Evidence Code Ontology did not appear (#1280) * Bug fix: export to GPML uses proper arrow types (#1262) * Bug fix: export to GPML uses dashed lines in reactions when possible diff --git a/frontend-js/src/main/css/global.css b/frontend-js/src/main/css/global.css index 1d1c070a6..8cd4a69d2 100644 --- a/frontend-js/src/main/css/global.css +++ b/frontend-js/src/main/css/global.css @@ -845,6 +845,7 @@ disabled close button in dialogs } a.minerva-search-link { + vertical-align: middle; display: inline-block; } @@ -855,7 +856,8 @@ a.minerva-search-link:hover { .minerva-search-link-warning { color: orange; display: inline-block; - vertical-align: top; + font-size: large; + vertical-align: middle; } .minerva-search-button { diff --git a/frontend-js/src/main/js/gui/leftPanel/ChemicalPanel.js b/frontend-js/src/main/js/gui/leftPanel/ChemicalPanel.js index b237c7486..deb3341f2 100644 --- a/frontend-js/src/main/js/gui/leftPanel/ChemicalPanel.js +++ b/frontend-js/src/main/js/gui/leftPanel/ChemicalPanel.js @@ -107,9 +107,11 @@ ChemicalPanel.prototype.init = function () { }).then(function (status) { if (!status) { var searchButton = $(".minerva-search-link", self.getElement()); - $("").insertAfter(searchButton); + ""); + warning.insertAfter(searchButton); + warning.tooltip({show: {delay: 0.1}}); } else { return self.getServerConnector().getDapiDatabaseReleases("CTD").then(function (releases) { var accepted = 0; @@ -120,9 +122,11 @@ ChemicalPanel.prototype.init = function () { } if (accepted === 0) { var searchButton = $(".minerva-search-link", self.getElement()); - $("").insertAfter(searchButton); + ""); + warning.insertAfter(searchButton); + warning.tooltip({show: {delay: 0.1}}); } }); } diff --git a/frontend-js/src/main/js/gui/leftPanel/DrugPanel.js b/frontend-js/src/main/js/gui/leftPanel/DrugPanel.js index 933f2df2a..2a8d734c1 100644 --- a/frontend-js/src/main/js/gui/leftPanel/DrugPanel.js +++ b/frontend-js/src/main/js/gui/leftPanel/DrugPanel.js @@ -91,9 +91,11 @@ DrugPanel.prototype.init = function () { }).then(function (status) { if (!status) { var searchButton = $(".minerva-search-link", self.getElement()); - $("").insertAfter(searchButton); + ""); + warning.insertAfter(searchButton); + warning.tooltip({show: {delay: 0.1}}); } else { return self.getServerConnector().getDapiDatabaseReleases("DrugBank").then(function (releases) { var accepted = 0; @@ -104,13 +106,15 @@ DrugPanel.prototype.init = function () { } if (accepted === 0) { var searchButton = $(".minerva-search-link", self.getElement()); - $("").insertAfter(searchButton); + ""); + warning.insertAfter(searchButton); + warning.tooltip({show: {delay: 0.1}}); } }); } - }).then(function(){ + }).then(function () { var query = self.getServerConnector().getSessionData().getDrugQuery(); if (query !== undefined) { return self.getOverlayDb().searchByEncodedQuery(query); -- GitLab