From 8329e7cdd8a4418d04c8de71ac0375f628a17bee Mon Sep 17 00:00:00 2001 From: Svetlana Rastegina Date: Tue, 23 Mar 2021 17:57:44 +0100 Subject: [PATCH] Fixed entity page width size on all resolutions. --- webapp/src/main/webapp/themes/iph/css/iph.css | 38 +++++++++++++++++++ .../main/webapp/themes/iph/templates/page.ftl | 4 +- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/webapp/src/main/webapp/themes/iph/css/iph.css b/webapp/src/main/webapp/themes/iph/css/iph.css index 3c8ce6b8..82de3eec 100644 --- a/webapp/src/main/webapp/themes/iph/css/iph.css +++ b/webapp/src/main/webapp/themes/iph/css/iph.css @@ -2657,6 +2657,24 @@ ul.dropdown ul.sub_menu li a:hover { flex-wrap: nowrap; justify-content: space-between; } +.entity >div#articleWrapper { + width: 80%; + margin-left: auto; + margin-right: auto; + display: flex; + flex-direction: row-reverse; + flex-wrap: nowrap; + justify-content: space-between; +} +.entity.loggedIn >div#articleWrapper { + width: 80%; + margin-left: auto; + margin-right: auto; + display: flex; + flex-direction: row-reverse; + flex-wrap: nowrap; + justify-content: space-between; +} .display.loggedIn >div#articleWrapper { width: 80%; margin-left: auto; @@ -2683,6 +2701,14 @@ ul.dropdown ul.sub_menu li a:hover { width: 30%; margin-left: 3%; } +.entity >div#articleWrapper >div#searchRightpanel { + width: 30%; + margin-left: 3%; +} +.entity.loggedIn >div#articleWrapper >div#searchRightpanel { + width: 27%; + margin-left: 3%; +} .display > div#articleWrapper > div#searchRightpanel { width: 30%; margin-left: 3%; @@ -3286,6 +3312,12 @@ label.switch >#collapseTextControl >img { .individual.loggedIn >div#articleWrapper { width: 90%; } + .entity >div#articleWrapper { + width: 90%; + } + .entity.loggedIn >div#articleWrapper { + width: 90%; + } .display.loggedIn >div#articleWrapper { width: 90%; } @@ -3325,6 +3357,12 @@ label.switch >#collapseTextControl >img { .individual >div#articleWrapper { width: 95%; } + .entity >div#articleWrapper { + width: 95%; + } + .entity.loggedIn >div#articleWrapper { + width: 95%; + } .individual.loggedIn >div#articleWrapper { width: 95%; } diff --git a/webapp/src/main/webapp/themes/iph/templates/page.ftl b/webapp/src/main/webapp/themes/iph/templates/page.ftl index 915f16b6..224f8745 100644 --- a/webapp/src/main/webapp/themes/iph/templates/page.ftl +++ b/webapp/src/main/webapp/themes/iph/templates/page.ftl @@ -13,11 +13,11 @@ <#include "menu.ftl">
- <#if currentServlet = "individual"||currentServlet = "display"> + <#if currentServlet = "individual"||currentServlet = "display"||currentServlet = "entity"> <#include "rightPanel.ftl"> <#include "contentWrapper.ftl"> - <#if currentServlet != "individual" && currentServlet != "login" && currentServlet != "display" && currentServlet != "customsearch"> + <#if currentServlet != "individual" && currentServlet != "login" && currentServlet != "display" && currentServlet != "customsearch" && currentServlet != "entity">

filteredSearch