litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed shelf tools for article page.

Browse source
This commit is contained in:
Svetlana Rastegina 2021-03-18 18:15:07 +01:00
parent 4930f127cc
commit 46a1622475
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
webapp/src/main/webapp/themes/iph/css/iph.css
View file

@ -2015,7 +2015,6 @@ h3.internal-auth {
color: #5e6363; color: #5e6363;
} }
#individual-info { #individual-info {
border-bottom: 1px solid #8B4513;
font-family: "IPH Astra Serif"; font-family: "IPH Astra Serif";
} }
#titleContainer { #titleContainer {
@ -2742,7 +2741,7 @@ button.collapsible.active {
} }
#articleHeaderWrapper { #articleHeaderWrapper {
display: flex; display: flex;
flex-direction: row; flex-direction: column;
flex-wrap: nowrap; flex-wrap: nowrap;
justify-content: space-between; justify-content: space-between;
width: 100%; width: 100%;
@ -2816,18 +2815,28 @@ span.iconControlsEditable {
/*background-image: url(../images/expand-label-image.svg); /*background-image: url(../images/expand-label-image.svg);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: right bottom;*/ background-position: right bottom;*/
margin-bottom: -1px; /*margin-top: -1px;
border: 1px solid #8B4513; border: 1px solid #8B4513;
border-top-left-radius: 2em; border-bottom-left-radius: 2em;*/
/*clip-path:polygon(10% 0%, 100% 0%, 100% 100%, 0% 100%);*/ /*clip-path:polygon(10% 0%, 100% 0%, 100% 100%, 0% 100%);*/
} }
#articleTitleWrapper { #articleTitleWrapper {
width: 70%; width: 100%;
display: flex;
border-bottom: 1px solid #8B4513;
flex-direction: row;
flex-wrap: wrap;
justify-content: flex-start;
padding-bottom: 6px;
}
.articleToolsContainer {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-wrap: nowrap; flex-wrap: nowrap;
justify-content: flex-start; justify-content: flex-end;
border-bottom: 1px solid #8B4513;
background-color: #F6F6F6;
} }
#articleIconsWrapper { #articleIconsWrapper {
margin-top: 25px; margin-top: 25px;
@ -3029,6 +3038,12 @@ label.switch {
padding-top: 6px; padding-top: 6px;
padding-left: 12px; padding-left: 12px;
} }
#collapseTextControl:hover {
color: #8B4513;
}
#expandTextControl:hover {
color: #8B4513;
}
label.switch >#expandTextControl >img { label.switch >#expandTextControl >img {
padding-left: 6px; padding-left: 6px;
} }

2
webapp/src/main/webapp/themes/iph/templates/elenphAritcle.ftl
View file

@ -68,6 +68,7 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/themes/iph/js/to
</#if> </#if>
</#if> </#if>
</div> </div>
<div class="articleToolsContainer">
<div class="articleButtons"> <div class="articleButtons">
<span id="iconControlsRightSide" class="<#if editable>iconControlsEditable<#else>iconControlsNotEditable</#if>" <#if !user.hasSiteAdminAccess></#if>> <span id="iconControlsRightSide" class="<#if editable>iconControlsEditable<#else>iconControlsNotEditable</#if>" <#if !user.hasSiteAdminAccess></#if>>
<#include "individual-iconControls-iph.ftl"> <#include "individual-iconControls-iph.ftl">
@ -79,6 +80,7 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/themes/iph/js/to
<button id="print"><img onclick="javascript:printPageContent();" src="${urls.base}/themes/iph/images/print.svg"></button> <button id="print"><img onclick="javascript:printPageContent();" src="${urls.base}/themes/iph/images/print.svg"></button>
</div> </div>
<@expandSwitch /> <@expandSwitch />
</div>
</div> </div>
</header> </header>
<!-- Positions --> <!-- Positions -->