From 63bedbac4b44449e6ea0d35fc04bb7d0e373b123 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Tue, 2 Oct 2018 17:41:33 +0200
Subject: [PATCH] logo is scaled properly (up to 80px)
---
frontend-js/src/main/css/global.css | 9 +++++++++
frontend-js/src/main/js/map/CustomMap.js | 2 +-
frontend-js/src/main/js/minerva.js | 2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/frontend-js/src/main/css/global.css b/frontend-js/src/main/css/global.css
index a61ff1c2bf..2166e01821 100644
--- a/frontend-js/src/main/css/global.css
+++ b/frontend-js/src/main/css/global.css
@@ -248,6 +248,15 @@
color: #999999
}
+.minerva-logo {
+ height: auto;
+ width: auto;
+ max-width: 80px;
+ max-height: 80px;
+ border: 0;
+ cursor: pointer;
+}
+
/* twitter typeahead */
.tt-query /* UPDATE: newer versions use tt-input instead of tt-query */
{
diff --git a/frontend-js/src/main/js/map/CustomMap.js b/frontend-js/src/main/js/map/CustomMap.js
index d58857135f..e7550fa091 100644
--- a/frontend-js/src/main/js/map/CustomMap.js
+++ b/frontend-js/src/main/js/map/CustomMap.js
@@ -158,7 +158,7 @@ CustomMap.prototype.createLogo = function () {
var logoControlDiv2 = Functions.createElement({type: "div", index: 0});
var logo2 = Functions.createElement({
type: 'IMG',
- style: "cursor: pointer; width: 80px",
+ className: "minerva-logo",
id: ControlType.LOGO_2_IMG,
onclick: function () {
return self.getServerConnector().getLogoLink().then(function (url) {
diff --git a/frontend-js/src/main/js/minerva.js b/frontend-js/src/main/js/minerva.js
index 72213c4088..ee195420d8 100644
--- a/frontend-js/src/main/js/minerva.js
+++ b/frontend-js/src/main/js/minerva.js
@@ -502,7 +502,7 @@ function createFooter() {
content: '<table width="100%" border="0" cellspacing="0" cellpadding="0">' +
'<tr>' +
'<td align="left"><a href="' + logoLink + '" title="' + logoText + '" target="_blank">' +
- '<img src="' + logoImg + '" width="80" height="80" border="0" alt="' + logoText + '"/>' +
+ '<img src="' + logoImg + '" class="minerva-logo" alt="' + logoText + '"/>' +
'</a></td>' +
'<td align="center" class="minerva-footer-text">MiNERVA version ' + configuration.getVersion() + ';<br/>' +
'build ' + configuration.getBuildDate() + ';<br/>' +
--
GitLab