From 4499275aeccefd3e3899270607254dd10b13d508 Mon Sep 17 00:00:00 2001 From: Svetlana Rastegina Date: Mon, 15 Mar 2021 13:39:40 +0100 Subject: [PATCH] Fixed expand article button. --- webapp/src/main/webapp/themes/iph/css/iph.css | 33 +++++++++++----- .../themes/iph/images/expand-label-image.svg | 3 ++ .../main/webapp/themes/iph/images/print.svg | 36 +++++++++--------- .../webapp/themes/iph/images/share-icon.png | Bin 1364 -> 1644 bytes .../themes/iph/templates/elenphAritcle.ftl | 2 +- .../webapp/themes/iph/templates/text-lib.ftl | 4 +- 6 files changed, 48 insertions(+), 30 deletions(-) create mode 100644 webapp/src/main/webapp/themes/iph/images/expand-label-image.svg diff --git a/webapp/src/main/webapp/themes/iph/css/iph.css b/webapp/src/main/webapp/themes/iph/css/iph.css index 6553cafd..e0e68b41 100644 --- a/webapp/src/main/webapp/themes/iph/css/iph.css +++ b/webapp/src/main/webapp/themes/iph/css/iph.css @@ -2014,7 +2014,7 @@ h3.internal-auth { color: #000000; font-family: "IPH Astra Serif"; border-right: none !important; - margin-top: 10px; + margin-top: 5px; margin-right: 0px; } #individual-info h2 { @@ -2049,7 +2049,7 @@ ul#individual-facultyMemberships li { .display-title-not-editable { color: #4F4F4F; display: block; - padding-top: 12px; + padding-top: 7px; padding-left: 10px; border-left: 1px solid #5e6363; } @@ -2768,8 +2768,14 @@ button#scrollToTopBtn:hover { background-position: top center; } span.iconControlsNotEditable { - top: 10px; + top: 0px; position: relative; + padding-top: 5px; +} +span.iconControlsEditable { + position: relative; + top: 0px; + padding-top: 5px; } .expandSwitch { width: 20%; @@ -2777,19 +2783,17 @@ span.iconControlsNotEditable { font-size: 1rem; text-align: right; /*background-color: #000000;*/ - /*background-image: url(../images/expand_button.png); + background-image: url(../images/expand-label-image.svg); background-repeat: no-repeat; - background-position: top center;*/ - padding-right: 5px; + background-position: right bottom; + margin-bottom: -1px; } - #individual-info >header { display: flex; flex-direction: row; flex-wrap: nowrap; justify-content: flex-start; width: 100%; - padding-bottom: 5px; } #articleTitleWrapper { width: 70%; @@ -2805,6 +2809,7 @@ span.iconControlsNotEditable { all: unset; cursor: pointer; padding-left: 8px; + padding-top: 5px; } .articleButtons { width: 10%; @@ -2891,7 +2896,7 @@ span.iconControlsNotEditable { } .display-title-editable { font-size: 1.15em!important; - padding-top: 12px; + padding-top: 7px; } .collapsibleLink { font-family: "IPH Astra Serif"; @@ -2989,6 +2994,16 @@ p.snippet { font-family: "IPH Astra Serif"; font-size: 1.2rem; } +input#expandCB { + display: none; +} +label.switch { + padding-top: 10px; + padding-right: 9px; +} +label.switch >img { + padding-left: 6px; +} /* -------------------------------------------------> */ /* FONTS --------------------------------> */ /* -------------------------------------------------> */ diff --git a/webapp/src/main/webapp/themes/iph/images/expand-label-image.svg b/webapp/src/main/webapp/themes/iph/images/expand-label-image.svg new file mode 100644 index 00000000..881a6676 --- /dev/null +++ b/webapp/src/main/webapp/themes/iph/images/expand-label-image.svg @@ -0,0 +1,3 @@ + + + diff --git a/webapp/src/main/webapp/themes/iph/images/print.svg b/webapp/src/main/webapp/themes/iph/images/print.svg index cd0433c0..e7c22d3c 100644 --- a/webapp/src/main/webapp/themes/iph/images/print.svg +++ b/webapp/src/main/webapp/themes/iph/images/print.svg @@ -9,11 +9,11 @@ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" data-name="Layer 1" id="Layer_1" - viewBox="0 0 30 30.000002" + viewBox="0 0 27.650404 25" version="1.1" sodipodi:docname="print.svg" - width="30" - height="30.000002" + width="27.650404" + height="25" inkscape:version="1.0 (4035a4f, 2020-05-01)"> @@ -42,8 +42,8 @@ id="namedview17" showgrid="false" inkscape:zoom="13.125" - inkscape:cx="13.261527" - inkscape:cy="20.288771" + inkscape:cx="12.832916" + inkscape:cy="18.850271" inkscape:window-x="0" inkscape:window-y="24" 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;} + width="24.999998" + height="25" + x="-0.42861053" + y="-1.4384998" /> wD+#u7kPE%y`N3Uhkfd-}7~MW%NHr$bVNrfpCx32$i`EW~Cg- zD2GUzQc_ zh#iuqxm^l#cYiRJN-Fu<^0A|X)RejC)o&9@Ru2Ho1Hd}iL_CyFQXZB>zk@jrC<_4M zMr4PXl#N8@UVr3@1~LZqM@*se0;-N_8LBBA%PXhZ3pwW-0P+|BtRzIUkm8xH?&JrK zyqqWuqyTg;_*3xPgV-)FDiX){pEV^PVf|k=koyVT;D1dp@Gy#OlTv&+V46<}Ax>{O zMlu+QpTqt~h$4vS`T;PX7+>zp$-i5f8&Q*n!6N%nWHsu`o$~oAa7pM$EyDXq47Ht~U5+za8x8f-iXe-MG(26`_T zNgPx{4S!zeL?OuvN>oRax?k(O1s=|fuaLUQ0NG3#v(BO|4t{O`sAd0n=M)I8g7MW5 zHjsudK!_mmqvAJsU6YBk#~DCS*cNQH)h^CsD7pd1l=C21KxYgCQOasOU4{?mCHVRP z;6RFYXEK?WH^i=7P<*7+fl2W*Q&`5HKl29$^3{&CRHI6_DLttr#e zFgKTE(HIKs$)1N?x1G}0GlnVHI0yIWNPq1@)Xs@?wIZ?;&7EoUz!jqAj;k`{b&;+~ z&0@O^_49#hps>+o*KH(Z3|87eXc@K^v+8}cCDHmwTul^O?64rEv#@^~mML^rH4O$#PV`3-?U4K&6ag6knh!4#U3S!zx;a^_E1>fPnt!7Z zbV?Hc4KxfyN$VEo!YIH6b1T;BJ=lxR(Ycgn<~wE>kYOD-gu6h;l~QB5%K`Zn_!&ex zXJS4A2R8`A%OVu_xG)yxiy=H$if~ z3dUaq-31mzgRg3dzsmH-B1|BQMo(F$E=(04$CYcf25J9|Y*(CB74S$fh)K30Z zod}3zhX&c-l@S$FZ5LnwuN+e^-*|*H1LaQpimj)t+>&qO>>=z`fuD^)h&NzjdoY&N zH|mlZV@dR9+d6zk9j~Fm>dIYI)sj8!4L(;fj68ztLS5}e$aM!qf5lp$wP9R8NXO6s z?=#c<*dOiD?{Ww>0)sY&On(pkGQyo{3VEG`1BAnqPF5D%{s2%fKaK?bs;!RI7@IH?yQpTmI{wj7I65TZkQCAFi#F|_p$!B}rH zw5(9e26q3Y=g~elL6lGkK!HJ^M*J<1&H_80(J?AlxW&?eXk7oV`X!`k1)bg5tnCKc eve(jRAb$g!D0GBQ9ggh)0000Ki3Ix!Ee0ErcH4-UMo~=Af5smq#7MwyskGK85+wKo zL0(OKp=BSX)_vSN<2M)XvaM@cob2qJIdjhW&g;%F{m&7p4Sxz2H0Sf(p6V_s}SyPB3{kRI+7bh zsngQ3Hn$EYzqr99GV(Vw(QhvI&o>PBZf5Ze01Q%U6p=)s7iXqQVxEgx+fd~_*MBi} z*0DEhkgnSD3V*}p0sybJm8Co^rL~fU_}I)^p9mqw02Ib~5K%6zukxObUQC_Sva?Fp z8;=Bn9v}B1g0(~n0jPtSthuh^=+%VdtzIMb!Ocwk7NS9k)CjR!*W4c;oiUP~HN|t> zUiZ5ISfdRoMF+B`+}Lq+Jg)coqyIwcn-$f*6fo-Het!jozip`Yo)P&%)9LOyf2GUg z0|2kmXNcf)Wmzw_f0?|Z_xlzTch>kyH0=y&@?OYYMv{s#ZzDP@WLnk>=$zlQ!5w#zF;*Ph;`0>0y`#2djsv1Z%H`14R;Gd=JL)|wJ;q{q@-(b7 zQgkqt&VQ`gI+*;$G2p2Tu7?A?h;oC+<&8w@0|9+zu;+2`ZUH$7{fm-F76kEGC2m2y z1bGc0h)YIx^4V>}6G;a^uZnp9;KxA1bKam7ztmkDa0wy5Le)!MUK*xmFWUJnE+2HLE4#rjT{KM#0nNhpKz7E zmwymvJxbC5qB*2B@QrMoEHd}>E)SIDTZk+zVRVJQB>iw`67m0OIh(E zc%;X^Ezzr&G|@VcI8M@f8RP-nuAABhlYgf)Uyn#Q^dubHgD~ep?{}oP$D2*q-_SLQ z8~-*4?i)D5*D=V>eWWggz=-e=eJ#`J=g^A7j#^JRv=$H6ZU8KR&}C9`d*<)-XRi!N z$A%+nuQrI4Nux#8^={x*k=oF*mLo9*Z*8E~p^4l*1%UNPo_1!Vdw<(U zCNonk=WT2wdXH9oLI~amGK3zFq3De*1F@kzSuL{?7tuQas04ppS@KoX?!$bULUazK z^BxkudBF~JQX2$|P{~n5w+XkxP|8xmD_oDF2D^}=g*cCqlv|qz;_nwSI-QpT(FeQk zCYM3<#u!nrQ z1`hzJ0`qpvY5;rCLFY-TZDW5XKN(C!7a@9DJBc=!f`ye z`wc5~s(C1FIkK}^3xYU`J>hb - style="top:5px"> + > <#include "individual-iconControls-iph.ftl"> diff --git a/webapp/src/main/webapp/themes/iph/templates/text-lib.ftl b/webapp/src/main/webapp/themes/iph/templates/text-lib.ftl index d3574b9e..37f1b6f5 100644 --- a/webapp/src/main/webapp/themes/iph/templates/text-lib.ftl +++ b/webapp/src/main/webapp/themes/iph/templates/text-lib.ftl @@ -184,7 +184,7 @@ <#macro expandSettingsSwitch >
-
@@ -192,7 +192,7 @@ <#macro expandSwitch>
-