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

Fixed expand article button.

Browse source
This commit is contained in:
Svetlana Rastegina 2021-03-15 13:39:40 +01:00
parent 397f29b83e
commit ee5b41c4f9
6 changed files with 48 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2014,7 +2014,7 @@ h3.internal-auth {
color: #000000; color: #000000;
font-family: "IPH Astra Serif"; font-family: "IPH Astra Serif";
border-right: none !important; border-right: none !important;
margin-top: 10px; margin-top: 5px;
margin-right: 0px; margin-right: 0px;
} }
#individual-info h2 { #individual-info h2 {
@ -2049,7 +2049,7 @@ ul#individual-facultyMemberships li {
.display-title-not-editable { .display-title-not-editable {
color: #4F4F4F; color: #4F4F4F;
display: block; display: block;
padding-top: 12px; padding-top: 7px;
padding-left: 10px; padding-left: 10px;
border-left: 1px solid #5e6363; border-left: 1px solid #5e6363;
} }
@ -2768,8 +2768,14 @@ button#scrollToTopBtn:hover {
background-position: top center; background-position: top center;
} }
span.iconControlsNotEditable { span.iconControlsNotEditable {
top: 10px; top: 0px;
position: relative; position: relative;
padding-top: 5px;
}
span.iconControlsEditable {
position: relative;
top: 0px;
padding-top: 5px;
} }
.expandSwitch { .expandSwitch {
width: 20%; width: 20%;
@ -2777,19 +2783,17 @@ span.iconControlsNotEditable {
font-size: 1rem; font-size: 1rem;
text-align: right; text-align: right;
/*background-color: #000000;*/ /*background-color: #000000;*/
/*background-image: url(../images/expand_button.png); background-image: url(../images/expand-label-image.svg);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: top center;*/ background-position: right bottom;
padding-right: 5px; margin-bottom: -1px;
} }
#individual-info >header { #individual-info >header {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-wrap: nowrap; flex-wrap: nowrap;
justify-content: flex-start; justify-content: flex-start;
width: 100%; width: 100%;
padding-bottom: 5px;
} }
#articleTitleWrapper { #articleTitleWrapper {
width: 70%; width: 70%;
@ -2805,6 +2809,7 @@ span.iconControlsNotEditable {
all: unset; all: unset;
cursor: pointer; cursor: pointer;
padding-left: 8px; padding-left: 8px;
padding-top: 5px;
} }
.articleButtons { .articleButtons {
width: 10%; width: 10%;
@ -2891,7 +2896,7 @@ span.iconControlsNotEditable {
} }
.display-title-editable { .display-title-editable {
font-size: 1.15em!important; font-size: 1.15em!important;
padding-top: 12px; padding-top: 7px;
} }
.collapsibleLink { .collapsibleLink {
font-family: "IPH Astra Serif"; font-family: "IPH Astra Serif";
@ -2989,6 +2994,16 @@ p.snippet {
font-family: "IPH Astra Serif"; font-family: "IPH Astra Serif";
font-size: 1.2rem; font-size: 1.2rem;
} }
input#expandCB {
display: none;
}
label.switch {
padding-top: 10px;
padding-right: 9px;
}
label.switch >img {
padding-left: 6px;
}
/* -------------------------------------------------> */ /* -------------------------------------------------> */
/* FONTS --------------------------------> */ /* FONTS --------------------------------> */
/* -------------------------------------------------> */ /* -------------------------------------------------> */

3
webapp/src/main/webapp/themes/iph/images/expand-label-image.svg Normal file
View file

@ -0,0 +1,3 @@
<svg width="200" height="32" viewBox="0 0 200 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M1 31L13.9836 1H199V31" stroke="#8B4513"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 157 B

36
webapp/src/main/webapp/themes/iph/images/print.svg
View file

@ -9,11 +9,11 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
data-name="Layer 1" data-name="Layer 1"
id="Layer_1" id="Layer_1"
viewBox="0 0 30 30.000002" viewBox="0 0 27.650404 25"
version="1.1" version="1.1"
sodipodi:docname="print.svg" sodipodi:docname="print.svg"
width="30" width="27.650404"
height="30.000002" height="25"
inkscape:version="1.0 (4035a4f, 2020-05-01)"> inkscape:version="1.0 (4035a4f, 2020-05-01)">
<metadata <metadata
id="metadata19"> id="metadata19">
@ -42,8 +42,8 @@
id="namedview17" id="namedview17"
showgrid="false" showgrid="false"
inkscape:zoom="13.125" inkscape:zoom="13.125"
inkscape:cx="13.261527" inkscape:cx="12.832916"
inkscape:cy="20.288771" inkscape:cy="18.850271"
inkscape:window-x="0" inkscape:window-x="0"
inkscape:window-y="24" inkscape:window-y="24"
inkscape:window-maximized="1" inkscape:window-maximized="1"
@ -56,23 +56,23 @@
id="style879">.cls-1{fill:none;stroke:#078cd6;stroke-linecap:round;stroke-linejoin:round;stroke-width:2px;}.cls-2{fill:#078cd6;}</style> id="style879">.cls-1{fill:none;stroke:#078cd6;stroke-linecap:round;stroke-linejoin:round;stroke-width:2px;}.cls-2{fill:#078cd6;}</style>
</defs> </defs>
<rect <rect
style="fill:none;fill-opacity:1;stroke:none;stroke-width:1.31713;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" style="fill:none;fill-opacity:1;stroke:none;stroke-width:1.09761;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
id="rect844" id="rect844"
width="30" width="24.999998"
height="30.000002" height="25"
x="0" x="-0.42861053"
y="0" /> y="-1.4384998" />
<g <g
style="fill:none;fill-opacity:1;stroke:#8b4513;stroke-width:2.16260918;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:none;fill-opacity:1;stroke:#8b4513;stroke-width:2.16261;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
transform="matrix(0.55488528,0,0,0.55488528,-2.769864,-3.2226527)" transform="matrix(0.53008093,0,0,0.53008093,-3.1373873,-4.7276301)"
id="g909"> id="g909">
<path <path
style="fill:none;fill-opacity:1;stroke:#8b4513;stroke-width:2.16260918;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:none;fill-opacity:1;stroke:#8b4513;stroke-width:2.16261;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
class="cls-1" class="cls-1"
d="M 16,46 H 11 A 4,4 0 0 1 7,42 V 24 a 4,4 0 0 1 4,-4 h 42 a 4,4 0 0 1 4,4 v 18 a 4,4 0 0 1 -4,4 h -5" d="M 16,46 H 11 A 4,4 0 0 1 7,42 V 24 a 4,4 0 0 1 4,-4 h 42 a 4,4 0 0 1 4,4 v 18 a 4,4 0 0 1 -4,4 h -5"
id="path885" /> id="path885" />
<line <line
style="fill:none;fill-opacity:1;stroke:#8b4513;stroke-width:2.16260918;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:none;fill-opacity:1;stroke:#8b4513;stroke-width:2.16261;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
class="cls-1" class="cls-1"
x1="15" x1="15"
x2="49" x2="49"
@ -80,24 +80,24 @@
y2="41" y2="41"
id="line887" /> id="line887" />
<path <path
style="fill:none;fill-opacity:1;stroke:#8b4513;stroke-width:2.16260918;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:none;fill-opacity:1;stroke:#8b4513;stroke-width:2.16261;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
class="cls-1" class="cls-1"
d="m 20,41 h 24 v 12 a 2,2 0 0 1 -2,2 H 22 a 2,2 0 0 1 -2,-2 z" d="m 20,41 h 24 v 12 a 2,2 0 0 1 -2,2 H 22 a 2,2 0 0 1 -2,-2 z"
id="path889" /> id="path889" />
<circle <circle
style="fill:none;fill-opacity:1;stroke:#8b4513;stroke-width:2.16260918;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:none;fill-opacity:1;stroke:#8b4513;stroke-width:2.16261;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
class="cls-2" class="cls-2"
cx="45.5" cx="45.5"
cy="29.5" cy="29.5"
r="2" r="2"
id="circle891" /> id="circle891" />
<path <path
style="fill:none;fill-opacity:1;stroke:#8b4513;stroke-width:2.16260918;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:none;fill-opacity:1;stroke:#8b4513;stroke-width:2.16261;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
class="cls-1" class="cls-1"
d="m 39,10 v 4 a 2,2 0 0 0 2,2 h 4.06 L 39.77,10 H 21 a 2,2 0 0 0 -2,2 v 7" d="m 39,10 v 4 a 2,2 0 0 0 2,2 h 4.06 L 39.77,10 H 21 a 2,2 0 0 0 -2,2 v 7"
id="path893" /> id="path893" />
<line <line
style="fill:none;fill-opacity:1;stroke:#8b4513;stroke-width:2.16260918;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:none;fill-opacity:1;stroke:#8b4513;stroke-width:2.16261;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
class="cls-1" class="cls-1"
x1="26" x1="26"
x2="38" x2="38"

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
webapp/src/main/webapp/themes/iph/images/share-icon.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

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

@ -68,7 +68,7 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/themes/iph/js/to
</#if> </#if>
</div> </div>
<div class="articleButtons"> <div class="articleButtons">
<span id="iconControlsRightSide" class="<#if editable>iconControlsEditable<#else>iconControlsNotEditable</#if>" <#if !user.hasSiteAdminAccess>style="top:5px"</#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">
</span> </span>

2
webapp/src/main/webapp/themes/iph/templates/text-lib.ftl
View file

@ -192,7 +192,7 @@
<#macro expandSwitch> <#macro expandSwitch>
<div class="expandSwitch"> <div class="expandSwitch">
<label class="switch">Раскрыть документ <label class="switch">Раскрыть документ<img src="${urls.base}/themes/iph/images/arrow-down.svg"/>
<input id="expandCB" type="checkbox" onclick="switchExpand();"> <input id="expandCB" type="checkbox" onclick="switchExpand();">
</label> </label>
</div> </div>