From 4ca3aebc770ecca96a77034505b712b081402e49 Mon Sep 17 00:00:00 2001 From: Skia Date: Fri, 1 Sep 2017 19:26:25 +0200 Subject: [PATCH] core: improve alert and info boxes Signed-off-by: Skia --- com/tests.py | 4 ++-- core/static/core/img/info.png | Bin 0 -> 4179 bytes core/static/core/img/warning.png | Bin 0 -> 3199 bytes core/static/core/style.scss | 16 +++++++++++++--- 4 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 core/static/core/img/info.png create mode 100644 core/static/core/img/warning.png diff --git a/com/tests.py b/com/tests.py index 13b5306e..4bcdcbdb 100644 --- a/com/tests.py +++ b/com/tests.py @@ -47,7 +47,7 @@ class ComTest(TestCase): """}) r = self.client.get(reverse("core:index")) self.assertTrue(r.status_code == 200) - self.assertTrue("""
\\n

ALERTE!

\\n

Caaaataaaapuuuulte!!!!

""" in str(r.content)) + self.assertTrue("""
\\n

ALERTE!

\\n

Caaaataaaapuuuulte!!!!

""" in str(r.content)) def test_info_msg(self): response = self.client.post(reverse("com:info_edit"), {"info_msg": """ @@ -55,4 +55,4 @@ class ComTest(TestCase): """}) r = self.client.get(reverse("core:index")) self.assertTrue(r.status_code == 200) - self.assertTrue("""
\\n

INFO: Caaaataaaapuuuulte!!!!

""" in str(r.content)) + self.assertTrue("""
\\n

INFO: Caaaataaaapuuuulte!!!!

""" in str(r.content)) diff --git a/core/static/core/img/info.png b/core/static/core/img/info.png new file mode 100644 index 0000000000000000000000000000000000000000..7ead0468bb2624da1c7331e1e28135d9a5c3ea57 GIT binary patch literal 4179 zcmV-Z5UlTsP)7pbVNP*pl(Q*}V9L{$=)OPDx`?Iccoi5;JF_GPX0 z^`6=L2z_SR)DN3lNj12YB-{>W+*U;J^0@gW-c0se1 zv9;X<>mW@4E&yK#KF`A3@|y*u-Xwq-;EM=P<2^&eeVjZt&h+6?2K(z+0q?>@^z#B406vGv$F)|RJ~6@DADU!j zUmwlPQdmb(mK4sBTSw_U)(h4Or5BtB5rbBS)TGps9_qa*o0}~b7niucd>s)1rM?V& znuWRBzc?UW7CsDoh0-ODo;}RF-!VfiHMEPI+!k0bIPY)>FWiZA9A7f$e8@z7;zB~ICfOJ880g>m12kSih!7~i@ z*C}jCZgZRn-V0vh z_Mvf#vc&olss6>qLvUy(9+3b56c=u^xU`Ysyf9QxI66|NbQ0Kbp1cfzvci*<#Mi+* zM+XKtw10$^D=Ylu^Gk|&BG_gC~S@whXBOIi<0mp;3a_b zBHYd#7dLkJ?C*~9o@0FgTv{*r^KaeY{E{%*pOTkCUV5@p$V(x!p1ct9GWwDe27Bu~ zI6lU;mFv8A{uR*rp3IoLfL#8E;1i|$tq(kXiZiDUQo0=Qpg@}tDZ{1WT{`a>t+;S= zn}t7}=I}_``Pkt;!*9QRkc;bWuB8Yiu#Y}{Bo z#LOR#voQBBKfP@IGtBD4h&=b`*+ZN?Jx*zJL_A6fCNA1&Fb0f<#6Y4UHQ~B&qs?D^ zpKio!cK1I1&h;Tdfw0H`h6F`UD&6o8(#kRc7b+0knswGfM6ltQu=cMtq30Gnu)q$C7Tia|lo1A&{ z5pd1`pWE#xy2Hlo{0t%=f5+Lw3=P!rQiN?*pp~EirJ^sW=o=~m(h|QA_SF-XH|>3a zEUi0?7J3rZF{3mIW|kU7nuhn1M3E#an6!cmtLxPJ`k0tL1R@`2cK%4TqzEJ+`=Zv0 z$KE+Z=}J(7L=Y$ZKjs9@t?>Y7$yV+!HvhfYk8)(l=k!b7BE*A*j*%Hb6z zGGa_Hv(&&quOcfofA&u|?gH`c^SAlyf8XTfSWjosfrWTa0yC*0Y)ldYNn#=^T5)M@ zgIZ6GvB`q~Pcu6|#q2yuOnjfhd*1%=6lGa-9a>dsMnDHZl}UBYECN$qz`r`v$Le;; zum9~5lS7)sXs&Hp8a;*&{mKwKxu+*lhzQ;*N+%?Vq9)*DahZ5cDCVfyKwmf>m&R>o!Nn_R-r{C(H6@ zfzN1W=SLBapFB3s_U)4EYXzv?`J0Z@D=McC&Sf+h6=+X8<`tq)Psc=p$)y^4)8G%m zCxVZpl}SaP3I0}@D;<+cR5uB?mv3@wv&s16IKXjc=SMa0Bt^;0^e8)R%l3}r`b`@t z=mJ6_J38KUmmSk_N)?itj!v8^>ZzhPRRKi08^o><8~w!S?mgMHNk)Ov3X>?*ja$g= z7Mtr^92h$Qr3H8@0Uo24GB{9YWpx`b!uF0OxhYJHB{4lkvyxB@Rz9SwFVb*%Jx5ib zs@;o!=%w3}6iyiE(VfNDw89#}8bxUY<3czus|cy8(g)%i0U#^nOJ3VuU>ES2T$y)0$rEM-IZxfsDJry z>wMsm0Scoq2^c4V0j)5xelxKYQaWswyS|CrZlmLOHn&@dg8oK>oo4G)0vsJ^)bSqL znIlOA?Lz*z-Lza;@k~$EAod(|tC2f=W~=R~*A%l4HulWyfA``>WKxkTA&I+h^zNt_ zE~B7aUcV(x8`80IQiNcXxUc(m-r4>r4PClcwhzLnf z4PZ2qq{t&U>sCmR54sHwr{4d~B#BhBX0(>Y8^<*ZHIO?Bk#RcY6;` zy0#y7UUisN3bav_8!g%^8{k8&7XqoEI(7}tI z@%pBv-EvG#)JPNE>CwHYXm-I&c5?qFRW^k$9nH(z6s9of{CPur}0C zN(mYjcA_dvVnoVIVQDF2c*yX!{V8d`!8yT2(4m*#iw~md#wtjGFCDGb7CRdm&UKwp z0P%!CgF^6~1g8^&cMcTI1XwNF#ej%H&{$Ui5tLTwDp%~z<_YXH9Ytmt=rio!pJE0R zw1d*^z40Po1ssq!E!%4?Zf}h+Yh%~rQa>^PO&)%t~fi8~|`v|aDXt?a2^I#+2~LQzIZ)x{|3z_}RyU8NyM zRyyA$42=xYY&L@}r^)vd;6>7em8)w^P94O0kh1c!JDsiqBc86!njlI$r>Hr|tlv|I zwLVBedC^rFODmMlhcwU;z`;e6^OZ0jeQ@7_A=XycDnS&wxAuy=u( zjyNGu>+5BBe}ii)*TPt0VeV!nK775^Y_Y!CWORQ6>mav6QAF{q2(R0vkQG9n2YIud zL%Z-abD^0Ft=y9rdo$uZWVu9eUuI%#DDKj3_0Pw}hvukV2<^htDm<;s)6QLxJ@Wu|FC^AQnY0M^A_6MPsMb5d zb^!SR!l@v|3QRvR$dN(}j~<`l@Wc=omp1TTAxX4VBh);2 zQz`5Umw=Bx;=SMuuBUvsT(Yh!qC7#Y_+X%=-Kfw#9&K#%JYH{__a+qo@%w4)$X$;6d zjWPDz4}QqVz6Mj{L-;Cbb?AnoguD!95S+COq*ZuQqxNw22znPIW&E5fuM`nL=>j8D zGZT!A4s-4Y=O8f-_;kg_o!W0ecAMGxk7e!b>#zRkRZg6KkXE~3<5mk>ZL*P2|43C% z#G#G}_1ISFIdY(Of626NC~w;^W2_>R16#&c!bVH5A@q)n?&H|0BfN6{Rq`;!`sh#3 z7w=Z%7v{c!QeU`sWrgJ{S2=Tfoc=}+t_qEjnW7q_6;N1M&phki^T;E8y#K`gyTrfw z{R!4;hSd_MidCTMFKJ zMn;D?^UhOTUA|TgdR}5-?g^gy4|w7I_ZTbeHn9Na31;VCd+q!y$Gvkra(a^27uQ%` z*`xpx0Z|I4L*6h7)|!r+JMIkw8SFFQLjZ9;Wcp0r7JUL+=Lj_lSJ5r{2q%M<1cy*T?e81{W7^MvXXh zl4h5rN-Xy~K%^2bLS-uw7^s2u+oSB%O z;>ZIt)Ou1bUs+@2+AWH#0I4Qf-5zFl=`59`B!c+RvetTgn4H?r^vpO#UUKR6#gHdL zi2W!FbKm5>--Z8t-!JC~hf<2M$%7m^e2AfuK5lKc+1zZgwbi7#lhJM$A&v?`0uh1K zQ13};^!G9}+|R!K0}Su0v$fe`>GBe*E5FPm96#ICjsRbRaHyuYug>`7I0wcK&}cM} zN(A?zMuN~rE3E@tqG&dotgWtbZRJ|1V!MZGKEcA=rC;u$n)@Adg5#7HQbT{EL2qvl zNlz{4PJnj~n-^qR9@^9Lj$=+=i^rT+{(p`+?S1g&}{|88fsCqvF&BOoz002ovPDHLkV1iO->0JN- literal 0 HcmV?d00001 diff --git a/core/static/core/img/warning.png b/core/static/core/img/warning.png new file mode 100644 index 0000000000000000000000000000000000000000..c1f251367932590f878e8ad23d4573af1e0d27a5 GIT binary patch literal 3199 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 literal 0 HcmV?d00001 diff --git a/core/static/core/style.scss b/core/static/core/style.scss index 8234e5de..9497aebd 100644 --- a/core/static/core/style.scss +++ b/core/static/core/style.scss @@ -171,7 +171,7 @@ header { #info_boxes { display: flex; width: 90%; - margin: 0 auto; + margin: 1em auto; p { margin: 0px; padding: 0px; @@ -180,20 +180,30 @@ header { font-size: smaller; display: inline-block; flex: auto; - vertical-align: top; padding: 2px; margin: 0.2em 1.5%; min-width: 10%; max-width: 46%; min-height: 20px; + &:before { + float: left; + margin: 0.2em; + margin-right: 0.5em; + } } #info_box { border: solid 1px $primary-neutral-light-color; background: $white-color; + &:before { + content: url('img/info.png'); + } } #alert_box { border: solid 1px grey; background: gold; + &:before { + content: url('img/warning.png'); + } } } @@ -203,7 +213,7 @@ header { nav { display: block; width: 90%; - margin: 0px auto; + margin: 1em auto 0em auto; background: $primary-color; color: $white-color; a {