From f605bbe71bbda9201703b93abe194ec40bc1b857 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Fri, 25 Jan 2013 16:22:16 +0100 Subject: [PATCH] some frontend changes --- catalogue/static/catalogue/css/carousel.css | 32 +++++++----- catalogue/static/catalogue/css/carousel.scss | 33 +++++++----- catalogue/static/catalogue/css/layout.css | 15 +++--- catalogue/static/catalogue/css/layout.scss | 17 ++++--- .../static/catalogue/img/carousel-right.png | Bin 1963 -> 1794 bytes catalogue/static/catalogue/js/carousel.js | 3 +- .../catalogue/latest_blog_posts.html | 4 +- .../templates/catalogue/lesson_detail.html | 10 ++-- .../templates/catalogue/section_list.html | 10 ++-- .../catalogue/snippets/carousel.html | 23 ++++++--- .../catalogue/snippets/chosen_topics.html | 4 +- .../catalogue/snippets/section_buttons.html | 4 +- edumed/static/css/base.css | 16 +++++- edumed/static/css/base.scss | 23 +++++++-- edumed/static/css/main.css | 42 ++++++++-------- edumed/static/css/main.scss | 47 ++++++++---------- edumed/static/img/icons/activity_dark.png | Bin 0 -> 545 bytes .../{activity.png => activity_orange.png} | Bin edumed/static/img/icons/activity_white.png | Bin 0 -> 398 bytes edumed/static/img/icons/announce_dark.png | Bin 0 -> 530 bytes .../{announce.png => announce_orange.png} | Bin edumed/static/img/icons/announce_white.png | Bin 0 -> 432 bytes edumed/static/img/icons/knowledge_dark.png | Bin 0 -> 376 bytes .../{knowledge.png => knowledge_orange.png} | Bin edumed/static/img/icons/knowledge_white.png | Bin 0 -> 356 bytes edumed/static/img/icons/lesson-plan_dark.png | Bin 0 -> 457 bytes ...lesson-plan.png => lesson-plan_orange.png} | Bin edumed/static/img/icons/lesson-plan_white.png | Bin 0 -> 430 bytes edumed/static/img/icons/reference_active.png | Bin 406 -> 0 bytes edumed/static/img/icons/reference_dark.png | Bin 0 -> 402 bytes .../{reference.png => reference_orange.png} | Bin edumed/static/img/icons/reference_white.png | Bin 0 -> 369 bytes edumed/static/img/icons/time_dark.png | Bin 0 -> 478 bytes .../img/icons/{time.png => time_orange.png} | Bin edumed/static/img/icons/time_white.png | Bin 0 -> 396 bytes edumed/static/img/menu/katalog.png | Bin 821 -> 824 bytes edumed/static/img/menu/katalog_active.png | Bin 823 -> 821 bytes edumed/static/img/menu/kontakt.png | Bin 436 -> 439 bytes edumed/static/img/menu/kontakt_active.png | Bin 433 -> 436 bytes edumed/static/img/menu/lekcje.png | Bin 744 -> 745 bytes edumed/static/img/menu/lekcje_active.png | Bin 746 -> 744 bytes edumed/static/img/menu/o-nas.png | Bin 628 -> 632 bytes edumed/static/img/menu/o-nas_active.png | Bin 631 -> 628 bytes edumed/static/img/menu/szkolenia.png | Bin 723 -> 727 bytes edumed/static/img/menu/szkolenia_active.png | Bin 783 -> 723 bytes edumed/static/img/menu/wesprzyj.png | Bin 740 -> 739 bytes edumed/static/img/menu/wesprzyj_active.png | Bin 746 -> 740 bytes edumed/static/img/menu/wspolpraca.png | Bin 603 -> 603 bytes edumed/static/img/menu/wspolpraca_active.png | Bin 626 -> 603 bytes 49 files changed, 166 insertions(+), 117 deletions(-) create mode 100644 edumed/static/img/icons/activity_dark.png rename edumed/static/img/icons/{activity.png => activity_orange.png} (100%) create mode 100644 edumed/static/img/icons/activity_white.png create mode 100644 edumed/static/img/icons/announce_dark.png rename edumed/static/img/icons/{announce.png => announce_orange.png} (100%) create mode 100644 edumed/static/img/icons/announce_white.png create mode 100644 edumed/static/img/icons/knowledge_dark.png rename edumed/static/img/icons/{knowledge.png => knowledge_orange.png} (100%) create mode 100644 edumed/static/img/icons/knowledge_white.png create mode 100644 edumed/static/img/icons/lesson-plan_dark.png rename edumed/static/img/icons/{lesson-plan.png => lesson-plan_orange.png} (100%) create mode 100644 edumed/static/img/icons/lesson-plan_white.png delete mode 100644 edumed/static/img/icons/reference_active.png create mode 100644 edumed/static/img/icons/reference_dark.png rename edumed/static/img/icons/{reference.png => reference_orange.png} (100%) create mode 100644 edumed/static/img/icons/reference_white.png create mode 100644 edumed/static/img/icons/time_dark.png rename edumed/static/img/icons/{time.png => time_orange.png} (100%) create mode 100644 edumed/static/img/icons/time_white.png diff --git a/catalogue/static/catalogue/css/carousel.css b/catalogue/static/catalogue/css/carousel.css index fdf14f3..3392bb2 100644 --- a/catalogue/static/catalogue/css/carousel.css +++ b/catalogue/static/catalogue/css/carousel.css @@ -17,20 +17,19 @@ top: 0; left: 0; height: 100%; - background-image: url(/static/test.jpg); - /* set real background image */ + /* background-image: url(/static/test.jpg); set real background image */ background-size: 100% 100%; border-top-left-radius: 0.938em 6.38%; border-bottom-left-radius: 0.938em 6.38%; } #catalogue-carousel #catalogue-carousel-links li a { display: block; + overflow: hidden; width: 28.75em; height: 100%; background-image: url(/static/catalogue/img/carousel-left.png); background-position: 100% 0; background-repeat: no-repeat; - background-size: 4.375em 100%; - /* left part of mask as background */ } + background-size: 4.375em 100%; } #catalogue-carousel #catalogue-carousel-switcher { margin: 0; padding: 3.125em 0 0 3.625em; @@ -41,30 +40,37 @@ top: 0; list-style: none; border-radius: 0 0.938em 0.938em 0; - background-color: #16a487; + background-color: #ed7831; background-image: url(/static/catalogue/img/carousel-right.png); background-position: 0 0; background-repeat: no-repeat; background-size: auto 14.688em; /* right part of mask as background */ } #catalogue-carousel #catalogue-carousel-switcher li { - margin-bottom: .9em; - /* TODO: active sprites */ } + margin-bottom: .9em; } #catalogue-carousel #catalogue-carousel-switcher li a { text-transform: uppercase; color: #363a3e; font-size: .9em; font-weight: bold; } - #catalogue-carousel #catalogue-carousel-switcher li a.active { - color: white; } #catalogue-carousel #catalogue-carousel-switcher li a:before { vertical-align: top; margin-right: 1.5em; } #catalogue-carousel #catalogue-carousel-switcher li .knowledge:before { - content: url(/static/img/icons/knowledge.png); } + content: url(/static/img/icons/knowledge_dark.png); } #catalogue-carousel #catalogue-carousel-switcher li .activity:before { - content: url(/static/img/icons/activity.png); } + content: url(/static/img/icons/activity_dark.png); } #catalogue-carousel #catalogue-carousel-switcher li .lesson-plan:before { - content: url(/static/img/icons/lesson-plan.png); } + content: url(/static/img/icons/lesson-plan_dark.png); } #catalogue-carousel #catalogue-carousel-switcher li .reference:before { - content: url(/static/img/icons/reference.png); } + content: url(/static/img/icons/reference_dark.png); } + #catalogue-carousel #catalogue-carousel-switcher li.activeSlide a { + color: white; } + #catalogue-carousel #catalogue-carousel-switcher li.activeSlide .knowledge:before { + content: url(/static/img/icons/knowledge_white.png); } + #catalogue-carousel #catalogue-carousel-switcher li.activeSlide .activity:before { + content: url(/static/img/icons/activity_white.png); } + #catalogue-carousel #catalogue-carousel-switcher li.activeSlide .lesson-plan:before { + content: url(/static/img/icons/lesson-plan_white.png); } + #catalogue-carousel #catalogue-carousel-switcher li.activeSlide .reference:before { + content: url(/static/img/icons/reference_white.png); } diff --git a/catalogue/static/catalogue/css/carousel.scss b/catalogue/static/catalogue/css/carousel.scss index 9f1fceb..ec28f71 100755 --- a/catalogue/static/catalogue/css/carousel.scss +++ b/catalogue/static/catalogue/css/carousel.scss @@ -1,5 +1,8 @@ $px: .0625em; +$ciemny: #363a3e; + + #catalogue-carousel { float: left; position: relative; @@ -21,21 +24,20 @@ $px: .0625em; top: 0; left: 0; height: 100%; - background-image: url(/static/test.jpg); /* set real background image */ + /* background-image: url(/static/test.jpg); set real background image */ background-size: 100% 100%; border-top-left-radius: 15*$px 6.38%; border-bottom-left-radius: 15*$px 6.38%; a { display: block; + overflow: hidden; width: 460*$px; height: 100%; background-image: url(/static/catalogue/img/carousel-left.png); background-position: 100% 0; background-repeat: no-repeat; background-size: 70*$px 100%; - - /* left part of mask as background */ } } } @@ -49,7 +51,7 @@ $px: .0625em; top: 0; list-style: none; border-radius: 0 15*$px 15*$px 0; - background-color: #16a487; + background-color: #ed7831; background-image: url(/static/catalogue/img/carousel-right.png); background-position: 0 0; background-repeat: no-repeat; @@ -62,22 +64,27 @@ $px: .0625em; a { text-transform: uppercase; - color: #363a3e; + color: $ciemny; font-size: .9em; font-weight: bold; } - a.active { - color: white; - } a:before { vertical-align: top; margin-right: 1.5em; } - .knowledge:before {content: url(/static/img/icons/knowledge.png);} - .activity:before {content: url(/static/img/icons/activity.png);} - .lesson-plan:before {content: url(/static/img/icons/lesson-plan.png);} - .reference:before {content: url(/static/img/icons/reference.png);} - /* TODO: active sprites */ + .knowledge:before {content: url(/static/img/icons/knowledge_dark.png);} + .activity:before {content: url(/static/img/icons/activity_dark.png);} + .lesson-plan:before {content: url(/static/img/icons/lesson-plan_dark.png);} + .reference:before {content: url(/static/img/icons/reference_dark.png);} + } + li.activeSlide { + a { + color: white; + } + .knowledge:before {content: url(/static/img/icons/knowledge_white.png);} + .activity:before {content: url(/static/img/icons/activity_white.png);} + .lesson-plan:before {content: url(/static/img/icons/lesson-plan_white.png);} + .reference:before {content: url(/static/img/icons/reference_white.png);} } } diff --git a/catalogue/static/catalogue/css/layout.css b/catalogue/static/catalogue/css/layout.css index 0006fdc..b972784 100644 --- a/catalogue/static/catalogue/css/layout.css +++ b/catalogue/static/catalogue/css/layout.css @@ -11,15 +11,18 @@ margin: 0; } #sidebar section h1.realisation { font-weight: normal; } - #sidebar section h1.realisation:before { - content: url(/static/img/icons/time.png); - vertical-align: middle; - margin-right: 0.625em; } #sidebar .box { - background-color: #16a487; + background-color: #d4d6d8; border-radius: 0.938em; padding: 1.063em 0.75em 1.063em 0.75em; } - #sidebar .box .dl-button { + #sidebar .box h1 { + font-size: 1em; + text-transform: uppercase; } + #sidebar .box-button { + background-color: #ed7831; + border-radius: 0.938em; + padding: 1.063em 0.75em 1.063em 0.75em; } + #sidebar .box-button .dl-button { color: white; } #sidebar .dl-button { color: #363a3e; diff --git a/catalogue/static/catalogue/css/layout.scss b/catalogue/static/catalogue/css/layout.scss index 1e14cf0..ed4cb33 100755 --- a/catalogue/static/catalogue/css/layout.scss +++ b/catalogue/static/catalogue/css/layout.scss @@ -16,18 +16,21 @@ $new_black: #363a3e; h1.realisation { font-weight: normal; } - h1.realisation:before { - content: url(/static/img/icons/time.png); - vertical-align: middle; - margin-right: 10*$px; - } } .box { - background-color: #16a487; + background-color: #d4d6d8; + border-radius: 15*$px; + padding: 17*$px 12*$px 17*$px 12*$px; + h1 { + font-size: 1em; + text-transform: uppercase; + } + } + .box-button { + background-color: #ed7831; border-radius: 15*$px; padding: 17*$px 12*$px 17*$px 12*$px; - .dl-button { color: white; } diff --git a/catalogue/static/catalogue/img/carousel-right.png b/catalogue/static/catalogue/img/carousel-right.png index 1c8949bc67ea10300d81c6a56f353d169b7ca240..3987678a4884608a201cedfa6e6541f88b1393c1 100644 GIT binary patch delta 1737 zcmV;)1~&Pt4}uPmDlz{6{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G` z2i*Y~4hA$2b?VKLTPJ@8YDq*vRCwC$-A`y-RTRhZ-@K$r98W* z=b{TS^WJ3s+&|~sd+stc?+zc%{Wb$L@1>$Bis0#L&dH z^G5e14-*#iD1H8>@qNj|RIbb#>k1o~*7^!+*T1l`H)(&E%J(xs7z)h)re)&}>PtUb z+n+2<_2)UO`;&x;$_3Oj-wMpmRl9Xj>l;MAFgMOye+}edn%PCPHtq-v#c3f2Lm|2( zVJJkGCJd2dL<)vVbjiU`nieuJl%h)thEjBC!4Nw}Bw(mTmkbQWX|WDNF}fsRC`OkC z4AEm`6^4Imbgjcso)&8`l%s1EhH`Z6!Vo`3R$!<{*BT6mX)zANA-YyzI7HVD43lGI z6oyN5jl*!77Gp4+qH7d}Q*_P3Fgr#@V7Nus7!1d0(GJ5gx<+6)M%N4s(_^F+hHG@S z!*HG!Z7`gps}+WGboIh8KSo+$xJOqTj0@AE9L9fz=xTv+A-Z~C963fxVO)u>au}DU zMH!4s(NzlLQgqeAIChMbz_=D&WiT#I%fK)$Mpp@pi_ujBN`V0?&fe=wdLqn==ViEhs@K21y4Fg``M zCm4U9qT3scXUC{37~i7XHH?qbvMY>_(d`Px$LMwk~7m2w4u1Al)AQG`KN1j7!&!}kZ zgh{0*FmmV_(TIB!DG^S9kq9TiNQ67VNQC2IB*F zyZ*AMZxQYq#esgQtI7im+N3ha#*L#-#`=e;lGK5mpZ4N`$pMa@Bw$3~!dhTlh_JQ?fpd?rHW=;^4s>3ebA393pH7 zhCzg_z;K9gU~6OQ5w-?HJ;H&_%_&FNE)3xaTZN$<;lTC_pc-N8FjONPPgUu<%Lj-Fd3NPslyoBcR*mMPYo>?LJ=kfLn*?fU??3YaxhdPOb&+1)X;<> z5Mh!q6e3I#1^~v6of4S1HMD>40QNlow7|rz^zmsR2n42WY92X=(IY1WCT=}&d>X0r zgut}Dz=tN0KJl8sB>i1u`u=+?U;yC3lW$`=f7c9OI|nG1eP4FaR(#xgUF9 z`T(i1ae--j_x>{?mejBaz6@iIcwHxPA`R;v$#k|0@wWnT2^`}oz z{q-E8?Ja?6TVaU$A6HPjc>#^(1%Zh*`sXfcH!q->%b=OdASxFGCT_Jhv;QGgO9=C; f_kX_iH~t0dBl}84W|s}300000NkvXXu0mjfdLJU* delta 1907 zcmV-(2aNcF4yzB4DlrxSqyUGzPC8-$000SaNLh0L01FcU01FcV0GgZ_00007bV*G` z2i*Yz49M3 zSW}{m2&rVWy{YKMXzwDZ7rp3(Oo|a<;2SrVe>Mwg(Hyg}p{Q)e&8y&)^yW&vYF>3- z^?JScoZf68-gEBX^E~JGd!F9|z8K8&T)zD7=bkI~o}=ixt~-AuU7D_sE(ZLrPS5y! z*Yx<~_k9ab+?|~$@&yCC6v@JP{(3Oiad~Xe(KPCMX~w^N$m~DL5GJ%5T<@rHblaJCYpeScJ%~_Yf|}M-dE?UB zAOB4rOZHf)qC|gj&P_E`v|l)F)$v4_81EN-9oOrJ``)+mps2%ybj?|Iwcg=gnlH5a z*l3?hK~3v9aQT~Te<+y2;`l1kN$JaNJ-?4t6qI2?y5`Kea(?&X`r00r`=AP=>H0{) z&)=uBj)E;rpz8N#cck|>Qii$q&&Z{&>G5)2`=NNb_J@ChH?o>*U*owahKcbMx79t% zdsFaXei^^_8!uPTJe5Ma=GxnIE?d*}tu!$kR!x7W%Z@0ZCq~ot!QG8Dd3Nm&c48Vw z`|sMhKh%lwW;NF;EZ+;EoS6H*g?2lmfDLn|``2A|KL&7Nf|}OTJNxf(3bSc7kGbwa zcpT91wH<$5kP`y|U65fQpbIVx6m-Fbfr2hHe8Hd#YGNRv3n~mGbissyhAx;e(9nf~ zFF15TObkSHL4<*buI*uCv_IsRS8a+rmIc*S0Xw z(Y5Q$7d*PQObiBeZ3%+`UG8D9pvyfB7Ib;ziw1vPt`ma^U9Mp;q021{Hgvg#!Gx}n8V11Zp>k1LpN4@r9(HSiIEZAn8JU^h;Gy{vZ5O`jI8KJ!&h2#BTkIW=tc}9 zGrFc>WJlLDjO^%|;VV75h7&{RnuH;A4Z;w*CSeF&V|)o+qlqDOO~Mem24M(YlQ4v? z@k$vwn)B@{`4T=cpXI-Di!vC5IeD-kn=%-LNmbR77k4~EQ)BdU{X<#hB&9G2voC-B z$%@BPQs*g0_eyjdB>gi6n$g!VtnHVF=*}VF+Q9Fodvq7(&=A3?Xb1h7gVr zh7dOYe2nx6n|^Rec7#pC$c}Kt4=2iuaKtb&BOL9M;nE@;^&|7LA{;f0tO&>SwHz4{ zjwy_c2*>)JNa+xc`OBiRAsllU*${t@>kH{JAskm2nGlZmY9P`e9QS2XWI;IYFtQ+= z(50AUKscc=G9aAjb?`F3E;`;uVGP!L&*f)R7zq(h>UzE+Bb-zikr7Vz3edtLob)xr zMMXI2Frp%C$>sM&MA(urA|jmh<@X={WQc}vvSE}*KcXRQ+1+wPL)g+APlBCJAq5D*at5e6c{Dv-wk4q+%^z#$AKOscAuyu5R72Zb?M z-<7^GLt%g;3@QvHgrS82gD|)-P!I+e1`5I;!$3e7WEcntLk;7oK5&1yn8Fx6Fh$Ax zBed+w6CS5%xaxoGD9bmRkM59;a)orwS$4JF;a-|Aq>0(|wCb(=IP1gbi<)R+ zOqO$Qs-dF&!f6U)u!5S_^X|=-2VK+Sk=bW2r{oqz> z*^Gbr5QQ;#@$#()+G_{87VC!YR8tt^H8Hd>+tD&Mu%%^epu{)3wz{9f7%WZKN9Na7 t2XA}a3sWn;lupmzI~@*(qu=Yv`5%uV5v2O$&hh{N002ovPDHLkV1n2TnHc~8 diff --git a/catalogue/static/catalogue/js/carousel.js b/catalogue/static/catalogue/js/carousel.js index 0b61b47..e340eaa 100755 --- a/catalogue/static/catalogue/js/carousel.js +++ b/catalogue/static/catalogue/js/carousel.js @@ -21,7 +21,8 @@ $("#catalogue-carousel-links").cycle({ easeIn: 'easeInQuad', easeOut: 'easeOutQuad', speed: 1000, - + pager: '#catalogue-carousel-switcher', + pagerAnchorBuilder: function(){}, }); diff --git a/catalogue/templates/catalogue/latest_blog_posts.html b/catalogue/templates/catalogue/latest_blog_posts.html index d2c90e1..e9eb109 100755 --- a/catalogue/templates/catalogue/latest_blog_posts.html +++ b/catalogue/templates/catalogue/latest_blog_posts.html @@ -1,5 +1,5 @@ -
    + \ No newline at end of file +
diff --git a/catalogue/templates/catalogue/lesson_detail.html b/catalogue/templates/catalogue/lesson_detail.html index 2197ea8..81ca932 100755 --- a/catalogue/templates/catalogue/lesson_detail.html +++ b/catalogue/templates/catalogue/lesson_detail.html @@ -11,22 +11,22 @@

Realizacja i czas lekcji

{% if object.depth == 0 %}

To lekcja jest syntezą działu - {{ object.section }}. + {{ object.section }}. Dostępny jest również - szczegółowy kurs + szczegółowy kurs dla tego działu.

{% else %}

Ta lekcja jest częścią działu - {{ object.section }}. + {{ object.section }}. Dostępna jest również - lekcja syntetyczna + lekcja syntetyczna dla tego działu.

{% endif %}

Czas trwania: 45 minut.

-
Pobierz całą lekcję
+
Pobierz całą lekcję
Pobierz lekcję w wersji dla ucznia

Korzystanie z informacji

diff --git a/catalogue/templates/catalogue/section_list.html b/catalogue/templates/catalogue/section_list.html index 6ab5580..1dd9cb9 100755 --- a/catalogue/templates/catalogue/section_list.html +++ b/catalogue/templates/catalogue/section_list.html @@ -14,14 +14,14 @@

Czas trwania: 45 minut

-
Pobierz wszystkie lekcje
+
Pobierz wszystkie lekcje
Pobierz wszystkie lekcje w wersji dla ucznia

Zebrane z wszystkich działów

-
diff --git a/catalogue/templates/catalogue/snippets/carousel.html b/catalogue/templates/catalogue/snippets/carousel.html index 2c0106d..692a9b8 100755 --- a/catalogue/templates/catalogue/snippets/carousel.html +++ b/catalogue/templates/catalogue/snippets/carousel.html @@ -1,17 +1,24 @@ +{% load url from future %} diff --git a/catalogue/templates/catalogue/snippets/chosen_topics.html b/catalogue/templates/catalogue/snippets/chosen_topics.html index 725ba91..fe9ff43 100755 --- a/catalogue/templates/catalogue/snippets/chosen_topics.html +++ b/catalogue/templates/catalogue/snippets/chosen_topics.html @@ -1,6 +1,6 @@ - diff --git a/catalogue/templates/catalogue/snippets/section_buttons.html b/catalogue/templates/catalogue/snippets/section_buttons.html index 6964726..d926dbe 100755 --- a/catalogue/templates/catalogue/snippets/section_buttons.html +++ b/catalogue/templates/catalogue/snippets/section_buttons.html @@ -3,6 +3,6 @@
    {% for object in object_list %} {% url "catalogue_lessons" as lessons_url %} -
  • {{ object }}
  • +
  • {{ object }}
  • {% endfor %} -
\ No newline at end of file + diff --git a/edumed/static/css/base.css b/edumed/static/css/base.css index 24cc530..424469c 100644 --- a/edumed/static/css/base.css +++ b/edumed/static/css/base.css @@ -1,3 +1,4 @@ +@charset "UTF-8"; @import url(http://fonts.googleapis.com/css?family=Dosis:400,700&subset=latin,latin-ext); a { text-decoration: none; @@ -44,12 +45,12 @@ header.main { text-align: center; /*position:relative;*/ } header.main nav a { - color: #ed7831; + color: #363a3e; display: block; vertical-align: bottom; font-size: .85em; } header.main nav a:hover { - color: #363a3e; } + color: #ed7831; } header.main nav a:before { display: block; margin-bottom: .8em; } @@ -152,3 +153,14 @@ footer.main { text-transform: uppercase; } #search input::-ms-placeholder { text-transform: uppercase; } + +.link-list { + list-style: none; + padding: 0; } + .link-list a:before { + content: "→"; + margin-right: .5em; } + .link-list a { + color: #363a3e; } + .link-list a:hover { + color: #ed7831; } diff --git a/edumed/static/css/base.scss b/edumed/static/css/base.scss index 4b3a53d..da9312c 100644 --- a/edumed/static/css/base.scss +++ b/edumed/static/css/base.scss @@ -66,14 +66,14 @@ header.main { /*position:relative;*/ } a { - color: $oranji; + color: $ciemny; display: block; vertical-align: bottom; font-size: .85em; } a:hover { - color: $ciemny; + color: $oranji; } a:before { display: block; @@ -192,4 +192,21 @@ footer.main { text-transform: uppercase; } -} \ No newline at end of file +} + + +.link-list { + list-style: none; + padding: 0; + + a:before { + content: "→"; + margin-right: .5em; + } + a { + color: $ciemny; + } + a:hover { + color: $oranji; + } +} diff --git a/edumed/static/css/main.css b/edumed/static/css/main.css index 71a4e6c..98fb208 100644 --- a/edumed/static/css/main.css +++ b/edumed/static/css/main.css @@ -1,10 +1,7 @@ #main-promobox { - /*position: absolute; - top: 0; - right: 10 * $px;*/ float: right; border-radius: 0.938em; - background: #f8b323; + background: #16a487; padding: 1.5em 1.25em; width: 11.25em; height: 11.688em; } @@ -14,7 +11,7 @@ text-transform: uppercase; font-size: .9em; } #main-promobox h1:before { - content: url(/static/img/icons/announce.png); + content: url(/static/img/icons/announce_white.png); margin-right: 1.2em; vertical-align: top; } #main-promobox h2 { @@ -48,16 +45,26 @@ float: left; width: 10em; height: 5.625em; - border-radius: 0.938em; - display: table; } + border-radius: 0.938em; } #main-sections ul li a { - display: table-cell; - padding-left: 1.688em; - vertical-align: middle; - height: 100%; color: white; text-transform: uppercase; - font-size: .9em; } + display: block; + height: 4.375em; + width: 8.75em; + display: table; + padding: 0.625em; } + #main-sections ul li a span { + font-size: .9em; + height: 100%; + width: 100%; + display: table-cell; + vertical-align: middle; + border: 1px solid transparent; + border-radius: 0.625em; + padding-left: 1em; } + #main-sections ul li a:hover span { + border: 1px solid white; } #main-sections ul .box1 { background-color: #adaeaf; } #main-sections ul .box2 { @@ -84,15 +91,11 @@ margin: 0 0 0 1.4em; text-transform: uppercase; } #main-chosen ul { - margin: 1.063em 0 0 1.4em; - padding: 0; - list-style-position: inside; } + margin: 1.063em 0 0 1.4em; } #main-chosen ul li { font-size: .9em; text-transform: uppercase; line-height: 1.25em; } - #main-chosen ul li a { - color: #363a3e; } #main-tools { clear: both; } @@ -107,10 +110,5 @@ text-transform: uppercase; } #main-tools .main-tools-box ul, #main-tools .main-tools-box ol { margin: 1.1em 0 0 0; - padding: 0; - list-style-position: inside; - color: #ed7831; font-size: .9em; line-height: 1.15em; } - #main-tools .main-tools-box ul li a, #main-tools .main-tools-box ol li a { - color: #ed7831; } diff --git a/edumed/static/css/main.scss b/edumed/static/css/main.scss index 2905854..59422de 100755 --- a/edumed/static/css/main.scss +++ b/edumed/static/css/main.scss @@ -1,14 +1,11 @@ $px: .0625em; #main-promobox { - /*position: absolute; - top: 0; - right: 10 * $px;*/ float: right; border-radius: 15*$px; - background: #f8b323; + background: #16a487; padding: 1.5em 20*$px; width: 220*$px - 2 * 20*$px; height: 235*$px - 2 * 1.5em; @@ -20,7 +17,7 @@ $px: .0625em; font-size: .9em; } h1:before { - content: url(/static/img/icons/announce.png); + content: url(/static/img/icons/announce_white.png); margin-right: 1.2em; vertical-align: top; } @@ -64,16 +61,29 @@ $px: .0625em; width: 160*$px; height: 90*$px; border-radius: 15*$px; - display: table; a { - display: table-cell; - padding-left: 27*$px; - vertical-align: middle; - height: 100%; color: white; text-transform: uppercase; - font-size: .9em; + display: block; + height: 70*$px; + width: 140*$px; + display: table; + padding: 10*$px; + + span { + font-size: .9em; + height: 100%; + width: 100%; + display: table-cell; + vertical-align: middle; + border: 1px solid transparent; + border-radius: 10*$px; + padding-left: 16*$px; + } + } + a:hover span { + border: 1px solid white; } } .box1 {background-color: #adaeaf;} @@ -100,17 +110,11 @@ $px: .0625em; ul { margin: 17*$px 0 0 1.4em;; - padding: 0; - list-style-position:inside; li { font-size: .9em; text-transform: uppercase; line-height: 1.25em; - - a { - color: #363a3e; - } } } } @@ -131,17 +135,8 @@ $px: .0625em; ul, ol { margin: 1.1em 0 0 0; - padding: 0; - list-style-position:inside; - color: #ed7831; font-size: .9em; line-height: 1.15em; - - li { - a { - color: #ed7831; - } - } } } } diff --git a/edumed/static/img/icons/activity_dark.png b/edumed/static/img/icons/activity_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..a2cbaba6704af1ff7a04d0cc29a50f2816ef0005 GIT binary patch literal 545 zcmV++0^a?JP)200006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-2oX677O#y)u8|Y02y>e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00D_fL_t(I%cYbtQo=wKhQELZ zNT10hc9v9(lOl%BPU$Sk2^>xUo&awUJOPwi5x3Z48}SBs18$(rTV`DY6XI(!+3bGv z|L=dBfDSdx@&T{`LSPS!j8~{c`0=xzuqBwaoTD?Yb@&()jMbH7b6?GLbv5KX?A3)ka6Bq)kC{9wNRT;%eY88vh zE1>S30L}%t2gXJ#8wkK;nB|qxssz@uK9JDH!4aTqZ7c^u;07q1t!sI=(@-|1-_WZ9 zSa{o}z|2v80REX%A1JrP9;|^U>22*C`vnB(pRjxz#YrKSQ{csDHIL#1?*f#*+rSBB z=2%XFmABU(UI=h%w0dsJ#M-};X9zqRt=5vH53FQQc?{?({T7wDw!D_u-j*_6N2@o? z^1=yXB!H$lYz4ITE%aT|cEKCDDXoD37m_YOD5?v`ZsFXhy6qn=kbXAR-p;1`S8uD- j)>a^&Ky9?z(XoC2r;D*_GErG800000NkvXXu0mjfiq78k literal 0 HcmV?d00001 diff --git a/edumed/static/img/icons/activity.png b/edumed/static/img/icons/activity_orange.png similarity index 100% rename from edumed/static/img/icons/activity.png rename to edumed/static/img/icons/activity_orange.png diff --git a/edumed/static/img/icons/activity_white.png b/edumed/static/img/icons/activity_white.png new file mode 100644 index 0000000000000000000000000000000000000000..a8550f009f7a217c7f74320ce3e27755704072da GIT binary patch literal 398 zcmeAS@N?(olHy`uVBq!ia0vp^qChOd!3HFgyvvM%6kC$Fy9>jA5L~c#`DCC7XMsm# zF#`j)FbFd;%$g$s6l5>)^mS#w%P7ewuD9@ zLV0FMhJw4NZ$Nk>pEyv_H%}MG5R21Gr^X648wj+R8;dqfvB*#fV4v8~V&TXnbbxVf z(>2Fe3BNB~*twI_g!6Za@PpaEZ!?&5EK!yG8LE<5=*IQKhF9$+Yk^OCvato@(mH{! zXSOrc>REsE%VE3~b5mva+T&XfJX|n8yX(1ff`I&&S3XVZm2R7EGoRv#Ib|?m&eaWS zdwEqIw7sTDv8>@+;WaP#%~Zy&Mm@%qlZua5Y%I~3mNH-SrnWop|FHD4KBZ?EPRA;5 zviVdhdZF{{2FVXs9=%qmUUHz=RNw&X0n?+hp6mx0E0|xn)EFPrF%7>p@6okMx2nG@ nJ+f|KJ-~b*si$)5KUuqEtIy)|a;9DZh5&=7tDnm{r-UW|Y4(-8 literal 0 HcmV?d00001 diff --git a/edumed/static/img/icons/announce_dark.png b/edumed/static/img/icons/announce_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..485c3585ef178067c2b46fbba4eab26c54ee24bd GIT binary patch literal 530 zcmV+t0`2{YP)P000sQ1^@s6t}b<;00006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-2oX677-4!EZYD802y>e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00DYQL_t(I%e|B_Zo)tiMc*bI zz$qikvguM%QBWW_L0qPbasxO4$qB*{$PLU1>};{cR@?w1gp|@{x}=$vHWoNGK^e)F zcmMx0^Y<$*Si{jc0aD-|m;jYE`bJ#cVGZ4fQf1e zJP^P~x$IW~tbxKBy{UDW14XX^*jMY1q4Lyb*68X4gda=F@m*3p>4ehFf U-{k=`(EtDd07*qoM6N<$f^FH{j{pDw literal 0 HcmV?d00001 diff --git a/edumed/static/img/icons/announce.png b/edumed/static/img/icons/announce_orange.png similarity index 100% rename from edumed/static/img/icons/announce.png rename to edumed/static/img/icons/announce_orange.png diff --git a/edumed/static/img/icons/announce_white.png b/edumed/static/img/icons/announce_white.png new file mode 100644 index 0000000000000000000000000000000000000000..0142525068f347dddd597d8fb377ecc70f8829f3 GIT binary patch literal 432 zcmV;h0Z;ykP)P000sQ1^@s6t}b<;00006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-2oX67c^X~$=v_|02y>e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{009_DL_t(I%e|FdafCn+gqu_Z z;2=mq0uBxdNWejGfCMCPQLu>uBoGHk`0{W=)rRbH%N><@+@EHi3wD4rOK$^VG+Hac7DPMACg@S=aHb%b+I@3+&x zlF;x!<9Psk2FQSRW2lu)9WdIbq>n7iuBil4BO^BAqj{y+$+3Mi2BvK=>BfkxoiD4I z8DL0db93%*H?N7XL=s_rOnaz-b~*RfTMxXCWLt40AeT)j`kB^jdeIn@{*fQj80bZP a@9qy-;cjG%w&J`10000FdgVmr;^WO#JzU&UZi|$r9Iy66gHf+|;}h2Ir#G#FEq$ zh4Rdj31Cb;ZmC%>s6<2dsCLiozTG zYBz08lRG>|{OKWPg*SEq%(v(5F~4Au9k;MWz*N}Nxr~qVvR}Z-+Jb9utRGY-Tz8%Q zaq(Y9hg*;DpPJ)*d9kQP_Phh0&tgma#Qs-rU`qF8HrXgNWzPW}r+s{k`zjk3`|fee zdF))Z@e9M+&1u3LJMEUwWwi|mR#B-8v{S3ms9QP9Wk&yjDlb-fWfO}_E6pEz1O3Y2 M>FVdQ&MBb@0CJUyq5uE@ literal 0 HcmV?d00001 diff --git a/edumed/static/img/icons/knowledge.png b/edumed/static/img/icons/knowledge_orange.png similarity index 100% rename from edumed/static/img/icons/knowledge.png rename to edumed/static/img/icons/knowledge_orange.png diff --git a/edumed/static/img/icons/knowledge_white.png b/edumed/static/img/icons/knowledge_white.png new file mode 100644 index 0000000000000000000000000000000000000000..62d9b8bbef6cc1d1dac28fc4f44b7f2bd210a3b0 GIT binary patch literal 356 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRn!3HE-lJ=GZDYhhUcNd2LAh=-f^2tCE&H|6f zVg?3oVGw3ym^DWND9B#o>FdgVmr;^W-1?006(69GWQl7;iF1B#Zfaf$gL6@8Vo7R> zLV0FMhJw4NZ$Nk>pEyv_8BZ6-5R21yrvw%p-1!>+>jJT-1dp4LQfIM?uZ?xXvUn|vp}DT;MxOsMT$`_S_bbJI7snx*?h zH~!OebdkBDpD^>?o@dR)FEuWo^S9jS&3;bHqN*XFc527%uKN~C#JcTy`=a0eiaQhPzx6QP=RL59q|DZ*H&AJ)rF9uInKbLh*2~7ZkH-ymu literal 0 HcmV?d00001 diff --git a/edumed/static/img/icons/lesson-plan_dark.png b/edumed/static/img/icons/lesson-plan_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..07ce96b6cce05a82a73d671efe15a9e6fd8f83a7 GIT binary patch literal 457 zcmV;)0XF`LP)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00A*cL_t(I%dM2nO~fz|g};q* z-*iAqfQt`4n9xDC0zw6l4wedFE7(v0>44ya4?ekrT{;LIaG6LUQvO!^q$sk-elzcR z>Y%|BEwAlk$ zB(hpy2h>0=NiISx(q6r@wbG^qav&XKPk>M0AXCr1@V9q%-wmP_$y@p64`mMC+0K#< z_1M~oD`QcGN}CiojfDSo#Zt*I%vw!#N}DI30g3@>SfVD9stUPYcxNk_dz9CwS!nZ3S79msoRl^d@GE4g#8BE~ zKsG_P6-8kq8*+Jdx>Gy@hpttWHeWM@h)v}m*7Ihi9k~>X00000NkvXXu0mjf9;CH} literal 0 HcmV?d00001 diff --git a/edumed/static/img/icons/lesson-plan.png b/edumed/static/img/icons/lesson-plan_orange.png similarity index 100% rename from edumed/static/img/icons/lesson-plan.png rename to edumed/static/img/icons/lesson-plan_orange.png diff --git a/edumed/static/img/icons/lesson-plan_white.png b/edumed/static/img/icons/lesson-plan_white.png new file mode 100644 index 0000000000000000000000000000000000000000..63a516bb0afacd5d09ac1fab730ddceff4b2cc55 GIT binary patch literal 430 zcmV;f0a5;mP)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{0095O1uL=f&|b}~ zmec`zARBm3feQHWqnFUU>Hq)$07*qoM6N<$g1Wz`#Q*>R literal 0 HcmV?d00001 diff --git a/edumed/static/img/icons/reference_active.png b/edumed/static/img/icons/reference_active.png deleted file mode 100644 index fa7663a819fac619ef988e556594ab10fe801e18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRn!3HE-lJ=GZDYhhUcNd2LAh=-f^2tCE&H|6f zVg?3oVGw3ym^DWND9B#o>FdgVmywy*Lc+0Y%15A(WQl7;iF1B#Zfaf$gL6@8Vo7R> zLV0FMhJw4NZ$Nk>pEyv_KTj9O5R21GryT4(tRUbje}eVLnUfPW4rp^lq2@MJG! z)jX)0v#rUOeI>(M?gtNqpO-v{aoD8f>{O<*gwgPSecMbyuh~*R*tYFS6#c+ma)9NJ z$dPvq%eoHUyXnih`O-7tjFcPxo!-rt(oQg*3qMsV~#$GvUIgj1`*`nHI2`s;+ey&>^x9aIJ zYilO??316)#Wi?yEeN}n)3|NHENO;?TW0=j*PUOW_u`m#0rS3qTW7px??2=>XR6ut wr}|eCH;ByU@L0;MDi)&8^qJw!{lEhDvy&Vz`%1Z+0Yiep)78&qol`;+08$~DYybcN diff --git a/edumed/static/img/icons/reference_dark.png b/edumed/static/img/icons/reference_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..6df814cb769ff1c1b57c107ecf356cc4a56c2002 GIT binary patch literal 402 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRn!3HE-lJ=GZDYhhUcNd2LAh=-f^2tCE&H|6f zVg?3oVGw3ym^DWND9B#o>FdgVmr;^WOlf1X?^&RbWQl7;iF1B#Zfaf$gL6@8Vo7R> zLV0FMhJw4NZ$Nk>pEyv_FHaZ85R21uryT4(tRUbje}Z)fOFsL#R%Z4`Zxv+U>}uZ8 zq+2Bz&z zxAYfeCv7bMwzwrSvzWz7@{ws_X4tJWmI^ZyB^rzi`06AXK1}{_pPA*@jT@p8L0V7j zZ*0~|X_H;R-9CkDW}?*I&4;YD8w{5^?c4Bu_Rby0YCa_E|0?GaOSpB?zxwl~9On0L zm}I`qdOEk3pFdgVmr;^WO#L9|PA8y{WQl7;iF1B#Zfaf$gL6@8Vo7R> zLV0FMhJw4NZ$Nk>pEyv_O-~oc5R21Gr$iSXHV|>?w`EM=XiVVXYBqQ=!?9UGfN3FT zlS6^z4xS{A)Pi4&Q$qSpx6S!`Df`{syOFV1-1hDkoO+9yQKC`$^+(1xovm^rPH#hB z?~pg{*L#(^a#G;2FE%PchlQFg=NP}PUtzq)Dd`PIi>262rkQ=uL*;z7_zPaE`0(aR zsG!62)QLs`w`26KxbMlHF7bz9`OMFkbK;6DBW53oy<`4LFoQem4Wm}*y#soY@!WOE z{C}9*m$N%B{5L(n^pWG{&_m^C{w|otGi5=Yko&Fc*Cu{rpZzl6;mVg2g@B%9@O1Ta JS?83{1OQTsi;e&Q literal 0 HcmV?d00001 diff --git a/edumed/static/img/icons/time_dark.png b/edumed/static/img/icons/time_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..157b7593bd1eda962b16917cf3b2e1395e5c3576 GIT binary patch literal 478 zcmV<40U`d0P)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00BlxL_t(I%cYdhQNlnN#ed0A zKuW+4;$;sx?1T!G4x|F50lS|xv6<249-QVi6yBi z3gww484B*6z5(HleBwYwUp!qLLo80O4Y|#G$biQtoacgILh~j^vjxfqPVO%_axMsR zNpEnxx!~@CyAOUGn0BYbp=-mG{yFFS=d9)MeB^$caR<{1MxUyEH{;HWsxZf2dlsU6 zQ_Eh2LF}mi%)3(gf@jULw7>T}U`P;}*t|8Uc=pwg(N@oG-1lw%T&ig(<<8Z`+HQLP z$`+Qr_kOQ&n4Ylh>BR#dW!HNgv0wCi%HFb_Q~!TY+g^3$ruoEMxmpFL>H81MKYugF z_@vjyOKEGrpV|_kD|qsvew*@k74P=esSRFAClwWAL?1RkWMw#A^I1i3CxbcF1T literal 0 HcmV?d00001 diff --git a/edumed/static/img/menu/katalog.png b/edumed/static/img/menu/katalog.png index c4de4a7701d345463a40730ee9140365acd8ccac..429c03f347a7e759275c5ff1a3a210fc760f542e 100644 GIT binary patch delta 719 zcmV;=0x0Q3~Aw84d{`k~boMky|K#ph-kQR7l6oSHYFqFcAIbxd3kmq=GdS zEL4D9L6)lydT`L0<*Wl69dw0Mu-*!Q3Zf1|3GN`djGW0l8GH9_-exX*P?fBuX! zj4FKFM1e5Zj0=#fquyt5U6sR(f@>{IV-MY&y&j}ANuOgZg9l{PCD zo(Dmk6q&%+Ds5W2eFsh$e}IX-YZhLANr=emv&>Zl0dN*;qitB&*Mx;U!OT^{d6!@B zY+q?z#oF#r-q{s^9}KI`NF09h5EBvR6t=l^Ho~Hqgcv37?18cUOXi(jlSss{Jg~C) zC~E**I8IJ77;T@})G~>z>37Ns056F>po{R!Ec2c)9w}63BHfnq)eJ~%{Q3=lz%!+3 zDFg)o%3PeR0kGjB&zyykxh)yf8vu=Wc1O{Sw=QyiORBp*YexVl*U&|3POu3+$@q;Q zsf;!~{j?b2uej0Ad8m;K237zn?<^-5Qo_(}jCUe?&P+JLhz>`3(W# z4qis4uow`K*NNyX_ez@@z#ZLxZa1=wQf0LxA9v*Qo*yKmeDHA3<002ovPDHLkV1jYb BPd@+v delta 716 zcmV;-0yF)%2DJu|Q3~7)2M!)G=Lg^!ky|K#ok>JNR7l6om)~*PKoG`%VpM=UYJgN= zT?K&(EGmfUz`WfX=1p%n72s5WTmiU(Qz{4z+zcHgFMDKta{`%}4A~ciblUIk+i(9U zV}N;U#y|}`02NR~OO8MXya8?5xWgr%*#*D~SOXJ2XDzTQ8`pgr*juv(p3XR5$?x)i z%$k?7af?B~-kJi~38leah2A=VmW_Ls_0I~t71|%wyB#ns8+X(=qYI!NV9LhL)xARi z1(53y(@NGFc^7$aC%)6b5$LPzwDZ=~z&N5fMf=!WQ%h{8;^PFK1eTbdK+DF>6+K@g z;iSZbURyTqD5pPx3&vkyQSXzYHx@*HQ1w2JRR96@(b`}OMf;OrktdWnPdGot*IUz< zT8C)uX;a>sIp7r5ER*8!OH(XDmD}Zg{os{kK9vWYTs=bJADe-DAl-O|j9e9y{13g3q z1)$2KowdM17kTBZ8yMS4DZK?+Z_P?-eh6Wa>r+bJoumAcCD+J7W?En)Ze;qzkCH}< zo_<;k@K>Da=bCErNP#s_duz0~NEL=NX`~xYpSX@UO{X^nypU>D_t3W;7{VgaMBasN zfVWZ9S?O-D+SOrP6ADB|h%N=e^!YCh^d8n|N08*8En5erwm`JYwg!$JWZGQlD5j*4Wv5MOO0000OA0 diff --git a/edumed/static/img/menu/katalog_active.png b/edumed/static/img/menu/katalog_active.png index 5768b3c495cb4ad86a82d30e2125e11a184cb5de..c4de4a7701d345463a40730ee9140365acd8ccac 100644 GIT binary patch delta 725 zcmV;`0xJEt2DJu|DhdAp{{a7>y{D6rGa?2aGUo^28IfBkf1OE0K~zY`&6nSC+CUJ- ze_~XCJZgYcU|j`)3M?v!>A<|*8|F=KI2GVjfLsB%f>SC84crVJBrkhpeRBetnGD$% zgml{P?%QwwC}V(mYsNqgJOC9?L`#l92fP7o*|@_cpVGWmi5mHycOCX)w>-qEgN^#IHL=o z9bn4F&DFg_00ofi5YtN58hICaZzsOfz!B)H?6mXN)WA5RI7R!|TT@GHr{d!To&=Vd zoFqDJy_&;+>T3^Bx*sg{r-XZYl9F1hi@<@R-PtQ(L~;bZh*H@)LHJ!#?62`Io)bt8l}=|enbeniq^49!Th2=*N z*tZbNvT<2rb_-3SEgLt>6~*Df##Ga?2h3iG$OzmZ!gf1gQ2K~zY`&6mxQ+CUJ6 zKPUyDz0L_&&3#2p0EP%wMBpU@h=3)6T}J?p01*KYfXeb+Rpz8K8Q7N|+&eV_Emd2% zF9>PWZ|3#uANA;9#<~HJ15ZE(q`{ICPyt(@XzKEK&1dflUPdRq&xQqHN_%?kUrKX*6prTrjsg>6Zs#r6xc-GiP=7Bp>Zu#?L~A8iC1x@ z#QMwcf54j@=qV^D09g|3tN`Y^$SY@6$Jk~{=>y}dUeF)P;pHlMf66Mz{x<(E% z(E{spC(|c>mNc5T^wYG1zw|;s*Hn`P3e17rSf|BBtT0?iBi(S?#C5uBI&Bs3T&h*x zLf@ui2-8RtISAbV+kVhl9-F$H01tAyWyds%f2Gw@d_0KHN4=4r#6#0P3}+={-5*t0 zezbsn^RaB|vKN`%e3K}ex|}46V*g-etP4jKUl;~WUG7_yyNDGU5!osn8v3%sN=lqp z=4&Vh-)qAWCQvXzCLq2tHT+fY3W!XDmCEUr0(sY2A_vy@4t_I1E3EXy8CI^b2A3f% zIg{payfDr#)F4<$Om`YoeBXb({eK4fNE$3|m`HB_g!$}`w!di8H&4jMM8E(5002ov JPDHLkV1k_xRGa_+ diff --git a/edumed/static/img/menu/kontakt.png b/edumed/static/img/menu/kontakt.png index 6e9fcef4b491d01767b1ac1968974f01c6509cb3..193b815363cf8e62ddc6aa8659e524e7b1575089 100644 GIT binary patch delta 331 zcmV-R0krz-GIv>^cU6xBy|Z-MJv{<+S;K z0H8S7#DWDbfWZQS8un zt*;GJ3oOUHRMJ#(AXHL32STOAQz7&=AL1zxio`!lzlNqDfREe%s_)vQ3~7)2M!=6ycjPTky|K#97#k$R7l6gmcfm}Fc3vwzES`y8lVKy z0WKk(?A~(QD>pRW)?YFTiqptn4~^gSY@;xjnidZsoLj51=@I z*u;VbE`Z(=6cZnBNaIDNAm*N?ZY}mgq+F$@lH@|9){*WdONGcOVm;c?T!`Eb(wsYe z1mS64%`L1c2(Ne44v+aalgK@jha9bSJ&EymQp?I=ry&v!xxP_5`}$)P8=}~L=o()e zrWRO^d8wqSE^98R9835Q@YHT?&zl~l0A~TMJ&|87 a4zz#DiRWCuv|cj+0000DhdAp{{a7>y{D6rGa?2cCcGFg8IfBke;i3fK~zY`#g@U1!Y~j; zU%pZRD;l5#(g7|Zo$TIn+bcIjC6tg7po67>NOZ7!8CF(AAodvW$x+7hpY541S3}pV zfdjDOwc`x5dXqS&d8i}tFW?(kMBk@EVryV$^9!&ytyML2%`d=md#vm_dV{zCVYxlJ zAa3Qfc@LmCf7rx=1ulTz5)>03Z%E@sr6A^>rfx0vLZn=!rjq1Bq}Gw{B};|KDPld^ z(Oih!4$_=EeFWiYU(GG7DG0B3)DDmNHSXmj(Mr1spLSYq<9X5N{gpL=o#WEGZ2czKTE%crXYaL^?x;V&Ci=2 jr2uCEtv!)nE)KMR%8BP(zqDR600000NkvXXu0mjfHl3QS delta 334 zcmV-U0kQtH1F-{;DhV0@Bmgs0hr4!>Ga?2i3^DmZNs(J9e;G+cK~zY`#g?%R!Y~j; zUrreyw5cdE08$pfBV-epfDsUrFhVAX!~jT8rDg+Y4rE0HVxI}F9OZof*}nU7R#x>2 zI08%N9ao^q%BsHnLHq@gd*WMQ2Nd4-DUr|$*z5cT98_zWl~sKQ=+9lI*U>7(4RHOr zGeNw|sq+>$){wY5HUq8 z-*z+=BDRBM%AJ0Lu(YpCEvzvJt9RrEk9nDi=bphs46XG%iQ#up%ZkBHohR&KeIqya z^3clh@#!5s zLu7ST<^YxeasXcd3;-g2$`{@WVRa61O3L zF28_l0Q?NNSzVO|z!AVoI1K;tZ~&VNk?CKDymTCqS5 zpkNRvxIDrcp$Eli#@6}1uF6}!%ku0f5Wy#pa9siy^r0UOtN}00Pr#|X$P%>QkRV0~ z!&#F)1@|oyl(VJ_8oB<6fH6@X0o)|W^_;@hRrx(8rADq`CyG2M`YW+Hja-I*88!lU zCkQr~T)k2aW1S!Bs)RzW1%M$w3RYv7Lash)b%S-j=Yqosx%&6aX9@LL%WlOC-?X)l zTBbDf-wEFpiL$sx;CVFenOOs13t+)#8|G7``%uO_$9u)^#OG=@$0ymR1S^Xzyme97`b7dx&A&5{2m*k24b#J>JxX@2Ki$NmqJ*K zqVFemqDJ|1u#T^}GUE=w_EO)a$Q(skTjKf)xFwIrguo9R98$eDL83i?*QvKmfqMjS Z{s*6(CMKb{M^pd+002ovPDHLkV1iMuCUyV- delta 638 zcmV-^0)hSM1?UBkQ3~7)2M!(^rL}lSADo+r5g2ZonGy2B2xD(i&pz;LK22>`fGJpVW(7yZxE(9qnje#5>z@+){c*kFN z$`II4n*zWZKmp(mzzEcY2v1oH;D@%ZCATGi zS6ty506#sK4Yg4KP5>&gXavylQQUML*+>QRbGW0nZl4XcaR5qAc0AQNkGl^I5C35$kYqfRXl8&iFDYRB>Pyi_D z1QD(XI3?;qIT^9Gt{-Y+_*ahC>K2X{!MJB+4S*eh6`!4-Po?ft5%V55k#%Q2H?sx4$iB>RK2iS4IW_lx zIr-_cVTE~!wK4fk#`oE)e+l4ei8Z>M_`(^b diff --git a/edumed/static/img/menu/lekcje_active.png b/edumed/static/img/menu/lekcje_active.png index c8ddd1db2ec56eefc1360edcb4880387f3304b3f..3a8865ae94b378671b8f7305e498505c79dcb309 100644 GIT binary patch delta 647 zcmV;20(kxE1?UBkDhdAp{{a7>y{D6rGa?2a8>O{)b&*>re^5z8K~zY`#g@@++b|G@ ze;FEp1{aVgh&Vyq2`WzzdxFGodNcaQx40A7ouKjr(FRl|s4{>6ZP32_1TF+AD~*91 zAi$*g@p#8ycghghP@4k48bATy4!{WD4L}c|)z!q32skC`K{*+*wyqy)WB6O9XU_uR*AxNQB{*Ln`bozz@Y?(gE~<+> zA^R-_qC{c1#7bX;`yLdOORO%$#Pvrw42ALxV3`n?OL0SO9z#*a#O3YGA`ce*N*pdG zF2x8Nf5F`gfz1|IAIXN&){R4L5E0i3z!+WyvoX#QS0A*xQCrt@!*N1f{YU2WMD=-) z-HH*uYipmiJkrd6C)QRJ%IX%57s0q^WDS5FfEAyepHHRkQxWqXH<5K`J~y)kzR14J zaXwN0$~iUne>wT-vtfmKh_x~KO~&`xtA7dLX^AzuocO}LaQ{Q-_#-w34Mg4Ij?avK zsjbVjbs3}D@Z@1lSCaD#IsYoQQ>pF%?5_1)7MYVsYfG-b!mW8d$~%7I;F#*Q2@xFt hyv_Z}6x=g_%RexWBfr@!2~z+7002ovPDHLkV1nZQGl2jA delta 649 zcmV;40(SlA1?mNmDhV0@Bmgs0hr4!>Ga?2gJG*j*#F1Mle^NBV`*ZIfm~L~ zNJwD(Jf4~7H%<^(rpp{a1t14-4PXNB24DoxJ8MP=mg%w}oDy)Yvu5J+69%jR90@#U zJ%FFinx1fbf5PPpxE8=Kk4rLLDgb8yHJda680b;7XeBJ9g7G!Dle6ZKWV(C?P|)B& zyJ{loj78TIt`#tfg5tP7$#nUb?*uC>)8!e!o<0xGn$rr*yUbp(e;wA_Z~wB!Db1Sz zy!h`lvb&nne@k_HAx8HLQAxPgSu=!lQz0EstmfWoe*ni!mxHtBCUOLygxY&t@2vS2 zbxcg;MC;iCIe>zkK)~ezPBA?wW+QgijF~QP=$)tMKmy_CW`#ljvF=6N==@W3@13~E|U69E2${dD7c?7VDkn1^y%XIl8B&9?yZw-k&Nc3yA zIf-0~eELIn}58wb` z4`9WPdI0YLG9lG47sIgt1OP5taNT+UJ0VqfH%MLND*&GWd@b`9z*b{60N4nr`l(od z-b{ui12_q(j_j-jaIA~`2;hzGl>lBBGa(jV^w|ihb~B7G07Cj)PqA?gz9IXaSl&ir z@Uw!9W$H|I9*xdB&2JG1SVNcC>^&F%U^b9oVVvMEAY&i=y2!Vdf!%7ev>2pebxuiI zOp=qbzBG$LNQ=&_6gQm_ecxEA&L$0ivuRfeAYy-Yl(Db%p%PNXrZ}Eq+E>IVu8Vvi z6*e_E6H+CNX|KRpWp)T4qKii95K?6mtPia5 zQ??UQHO_>jpXinBS((P{Vj)#eKBdMwqg4=+GXJaqM{8~@q^h(RRBC&pp+J0iHew-F z%lvp{Dwio|#Q~`CEr1QxeiXon0aUcCTFtLwKB31Pt}`hi{{>{|L)7PTJu$FrYnEn%G>qqh zq{SyW1?x*Q8-%pz#HhI1718?2s5<$7G;B({DgX)l)l$Zh)rVRro%-U0o@rlFMQNW) zLn`cRa4D3|Sf!mkTY;sx1&JTeJf-Xt055Fs13=AmE4H*P8=;c$cBxRhBcIBux}>LIL(2T~1O!%dQ=xQi-Jr^PHyR3b#AhQF zO5d0tXQmGNTz-**^MczT}Eam?Q?ly51FCtn~{E82qap}RZRUcI*Nvo=KN^GF#>wA}G3iX_cQ500000 LNkvXXu0mjfyL|1? diff --git a/edumed/static/img/menu/o-nas_active.png b/edumed/static/img/menu/o-nas_active.png index 2d8d30fd61b680d5a7e80c540db56dab15208127..ae004c18023b14005124483c6d2f80e00c57648d 100644 GIT binary patch delta 516 zcmV+f0{i{<1oQ-uRs{m9Hkb>MTPT0rNklFHOJ3tl0>A*a29w ztq#CDfKn)J#$p5$05O2G72LKCz*Z>T-VM^{atS~Kh^)+S0M=Gz27nYwcdma};YfxR z12_t$4{YxS;Lzvt0N{ko7&x{lQ1!U+$)aPq|2mgtX|ysJPk{(fZ1$I{AMzY)ZQ-015lmQpS%ECpvrnT8VYp8XCoC#-QVO`D_hU5y z@GD+;kD5|d<)c;jU!?va#_5XtTs|^(>;fsCNtbytTjm=gD7t)Um7fs+0000;kZ0Nw!9N(wy{BbWh50i2ECrVRjcB}IQTNStI#0G|LNBl9bOwNaS{@T7mF7;Lc? z6B#xP;Gm?~v%M>TeVk-_0Izhe0r28o303h$%T7s=PgHycu%YG3R!!*e-LUU!=5ACD zzgduxrryQ#XtduOeqJD84fV0fb0Pl0=0H-w5=MIIUs<74mzbnNl{y>-m%8p zELT!=fkn~}bW663rZKxxNimR5V^m$!Q?Mar{(S-hqq(J$qBU+%W4w189R=dEQ7S2} z%#SnE262*olY{k!uvsW9bhJdJp17GhWEs7?W`@9XHlUjLE+^jiFtFcAKBp9>%z;0l5( z2vp#81InVCP7W2=TLJb-HwCML?O;g-Y&xKWP(m)Fyoq9AB-YO_bKxPRnUDGTX0*Wy zu|^L73IKOPs$+_dE!Igv&#$Qp)&g*neKde`>cOj(hARp~m#SdnCDk_oEr6a9Yr2Gg zd#up~fD^sm2&u-92X5(E(t(?RvK@fWUhIDWI0~uG0po6O4j>4iVVetUbSb3jnWC1! zy(T4q2WxZ>;NZ>?*o@`MIhcfmz9NLZ+iZ>A0~ltE`#??t#SJeCRNe+cMW48Udll+x*_3`bAbzf^3E zK5=7=sq(cvPiJ$-15_;o)R=mfoTms7 zEvurQb;jt4sAgqT02r*%7B;c#98~{}Mov_-z#c9?$z&nSJ+xGwEf>5{$R)zh*GT z3PM(3xdMw7*t+3n>xLVh3QTvP4g^;Kr2{sA2}|&0k=Y;yO@PXHvKI_NVE1u9ZhFc25kgK2wlIk8n55Q1jO_y+g zk5jS+aH2;kv>js}xTdwC3o@c?3*cK2`&R%*q3tvC;o2$L2yG2h)DyV( zqyg~Ylr#Vi{vLrXS+1O;Nl55hLTLP9r{oTRoiQE)IZ-%4dL~-iFs#Lb`0W5Zv#k-p z4|4ZNXDaUja!lrpTYAsV9(|Xz!OWhX-#8!N4^Ko1MU5PX2xQ{ zv;zQNavGCU@)sE!g|=T)lh6dNOEu2jZE~vMg_DU>vP>{u1_bny41gMwVaa()0MWB5 zGORNuPedInn;L+1N{$QWL!Q+8>}C`hC{m;o+77FRQVK=)FN~)QrMv{&SWKOg4V(SO zC5kurWce=v)S2&A0pRhxn>lw>7rB#PhAhE&+x}xVWX!i?|FYM00000NkvXXu0mjf D%Vrm1 diff --git a/edumed/static/img/menu/szkolenia_active.png b/edumed/static/img/menu/szkolenia_active.png index 8d7999273a9277b48f34908ea6b9ad8b0c140575..da0a1d57d9ebcdffb1f1890d19aa87905bfc0c29 100644 GIT binary patch delta 626 zcmV-&0*(ET2Ga$QDhdAp{{a7>y{D6rGa?2bBnrr636WbUe>+J;K~z}7)mO`L+b|G) z)VKg<&;V0GhzdehV7UT|71+ArX6uFR)|y50;mDp2yKr!IyP7*HLbU~3f2PfQhqjobMD2fm4;gi!;q_>2$Jd^ zKo7uBVojHDe~(kL25_QBDYPA99=N8pp$jsiYzyF95c^jEN1^RGV%(pt07L=o+2PtL z*$8b7Q`8f<_oM;v;FL4~4*nj2Em^Ldqe)2UTS933VW;E{fSoZO0y$AQL3$=y+c2!f zg81zKJhQD4zz=fwNM|bV0dldIgV6SIaS}%2ZQ0fUe_%hCoKDF{0^((sB|qW;{^f(v zw)?0u=!^GktIr}Lr{tDV?OABsEiF5t?Gwcu04fS&vInktEHldg5Ye?5fY10Tr_)gx zj)AVfsn{ub;>H+LRcm>k?pB@$s9G%J1+xjzl|&qulApozHek=@3cwRfwrNdcc}Knn z&jaoKe`dyF!L$PaUve6gQ}P!X8-=!CQGa?2hC$?zo%8^?re|JelK~z}7)mJ@_(?Ae? z$)&i)l5x3}k+z^C(f$COlIn6L6_=9g$S>gX3&K^DHbkS;h2Q_?it>u#|=l znprejosHK%6fu%zd9yq7c0S%rfF2^G+6t+D38`jXbqvu@#`J!DEC5d8V*@C<9vt;F zJf$$KyDAuXe@XQgzzRSP;M^KrJ%)RPRAT@e`kYv!%Q_F7(L199lNx0+0MEVH-vPL_ zMi({4-QE;HEr12vJQh-A*65rmS`oO1Bm?kHNRXI2P9Emu<`Lu-|=+5|L3j z;wTaKhyAVy^}rdAWry-#*63;tz-4^Z6vKv4LHBg=mYVBGPy zUI2JJFB|q<)|?5Sh`b4>@+O=#O2pk^zx(N!FG|D*)>(6F^mXt*qrd^RVoaHNJTYk^ zpI{G=7rsY{xF=($^gN^Il!1C{8J0b^F@ V5rMeWoqqrT002ovPDHLkV1jKlMuz|Z diff --git a/edumed/static/img/menu/wesprzyj.png b/edumed/static/img/menu/wesprzyj.png index 1c3b4c8cf5641e391bb73f6d613c54b997516cd6..28e203751f69e10cbdbbb8ee4e2deb1be778eec4 100644 GIT binary patch delta 633 zcmV-<0*3wM1>*&fQ3~Aw84e5;x$_bkky|K#OG!jQR9M5!m(7vdKoEsLC<0IhW;0L* z78$G)7+`L50wTa0f#IZ^z)HZI0c-?T2FMvG1YcUNE?GY#n8NNV6;d(NdV2l(XD0Mm zo~1GHlYVp;Ej`J+Nc>4H% z0M5p`atz2kOXt8hpqvHx=mPUk&TDO{{p;Z@SN5{%o{7!Ot?qm6OS3;(l%a7t=-%?57%9BJv!+g zAZ#<@q|vmoCyrp9uC5HeI=t&lcQ4?jNTfMs6+M&KKRq?C_z!IA5pDvk31+_my6oBG TQyJhh00000NkvXXu0mjfP{JwK delta 634 zcmV-=0)_qK1>^;gQ3~7)2M!XA+ zR}j;|rUIY>;LUGj-{vh)0i=R#2e1{4JHRQxl1s?Tb#&$UXAC2tl>)ZTAz%LbzH)CBf1zvzf$F=hWn*ulBCaerr z9CaUefW4^ya%0_hfSIwb071Z7#`P`L^aEc4J^Gk5xlLnx*5w2j6792773N4Z-k#N!{;i z=MvVmsXtG92aa7OboKzdTgAw=uBQ!60}M5XLUQOs{1l;PiMCMIQqZ7uV>r~B9+*+Q zBk+iZuSyDqN}iQs?k)JVCL!#~;<%>)v<>Z*T#?rFfaRkAONIs+!i{xRnI$hkG@!+0 zL&Kv02R$(etJOd${3{y|jsF8>c;Pv%g_t*1s+n+)#wQ*#!liAzlv=yFa~`g{;(Bz_ zJwVuI#7U!RV^18xI$d2Ee06x&neJY|OOZ%(%F25tvHyB%UhxTR>Je@NtO;g+051dC UqLASRg#Z8m07*qoM6N<$f-fd7+W-In diff --git a/edumed/static/img/menu/wesprzyj_active.png b/edumed/static/img/menu/wesprzyj_active.png index b4f2706c7bfa682fa784309f8efcc4b6c0aeee6b..1c3b4c8cf5641e391bb73f6d613c54b997516cd6 100644 GIT binary patch delta 643 zcmV-}0(|}I1>^;gDhdAp{{a7>y{D6rGa?2c0T~jSa*-VI%XM_+_-70wvRAUO z#mx2bx##}OgdQuiBnBM)_HL~E#*=J1@PFjtBjSlR8?p8b{8rCPV9t|m4B(%}x~r1Q zR{oC#5*>?>sW@Hb{zRp zv3lN?SrQrR)}H%U@>@*GEJ=G9`l1#uv?T7aGD}tx+B#9!#=7&so~`TwILv^{vl7Nw zcP_IeSEX_<$=s*iy^iV>s6v1#vt(XoN#p@KS0Lw7f9u=)MZhl=jW=UmF$G?LMaQ-C z1e*dk;3ljLRvdL7cYwX9|8is9cYv9(t^%$dKzzVPz)2-n)X?k+xEkvg9WLe#f3LEq z_LB>FJX$4CI;>xMmXPb(*~(&zR#PcodTlPrUir4>A$DV6E00w}LYk%Hzz5%Cy#{+| zf(^m&e@Wf%YUdKxw5dN&dk2nPC3N-xyIaM`wXUZPO#=)yheC4bL;Mt>W{I{?)>6=* zbYnQwnjV-@yd&_4hObHrg-V{4V(u;Yv?d|!%Hp`E0kjS6m0Xe5^nm4~0854j8N!Wq zRhcC(Ks2DmWkbWG00%uW2&>gVDf}xN4~_o=Wq9E^t%aC3R;rnBkH#k+Gs2~9yp&qI zxpN+_yW)Cu(mg=fX2eOOX=6_u!8%=C8GLnk*O~5Kz)O)xbIQtlCb9o|YF_aPZ0Zqi d0;~yUe*iB7*`ko)2893s002ovPDHLkV1kj0H9Y_T delta 649 zcmV;40(Sl61?mNmDhV0@Bmgs0hr4!>Ga?2hHAT^yf{|M&e^N zAPVree=bNa0LcYh=wPn`vK0Uo>}>@L6~I++=>RCe+7w`k+>gK0!QIb98d(Xp!Q%Ew zQ4+$t1(9SX}S^y{`$Cd!zq|!TQ%{Jj5YXC2)9`>zoL6PlS-F2JoIhMg0rRuP$!1AqRqxw;5Q@t?yPC2 z0OkOeBiA;PYzg2B;7VQzRvh-c7$JLN-x_DlPXL%XYdQeu5h5{U1%LxfF5zkR0O0Jb zS&o<}JbN!Rr?=CP^YCbu=<&vWdZdu^+BxXO0j-u)zWCUNa;J;knqv}ZL$94DA?~Gp zV8K@!f6vM8e6l$_d|=Pp-Z+J|^z|2s8o++6BF!G~?uL2f+}Bf2(*O|K99qhu3)yLN z^%6s&?4`g-eK0BPdQAsLd%k;VxD`?-mOsx$Fg{FV*?m!+B>=g*K`0) z5@E{FEKRtxrjts~0f>MWSDuEG2xmPpkXO4vYbmT)FOlrwWuRNDaxI2+Ydw-RK8ffN zPD9-q)!Ox){cyi4z9uK#0}fj!oHTr-o;b4YbbV!r)!|)dx_b$)NFsih)!gXB{_Cl^ j!WY0aBHYL@CL8_%#8fHh^xx2))StTsO3C;Lz#()Iwa@hgPAN7U?(SY2{H?T6zv*+n98yXjH9y150ZZ;rOjQ7TkPkyg7spnX3mhBR=vdD)~fkN{J z$l9xgKI|e;J9WC#3E2Ff78)>=>;B1G|Di2c&}F3IaFZ zAUEBB3V;eiD!^1AcK|8CGnA0aDx)X{gy9hO0k0ZX78@XZx4R@xi`0TW;b3Z9O+RV=!-O@>m zBhWtuE09}(v4Huh)TxVXB$2n)SK5@39Le4h$}UAn1gF5{9Bc#RyV7PFpq&E7Ikha7 zoJpKWRv|ejAIxQ$09!ekQ;>NGq-a-vz*v@DU>Ma!W+eX(N}Hz^x7g2Z3%_j2wJWvv z0$RmRiP*F$Hv*75kCyj<^qA7vdHB^*tO@oWkiVE>9>iSGPFsu;mI0}aw?OulHY=sg2I$`cD}~>7sdX$j%XW!LU1Wn%K%r>^ zWaZUDA9fa~ojTp=0IVLTg$4{IJAvuR;Ly9%P*Taj6F!u*9P{SVyRRAZCcx;XF|Xm0 c{HwwF8-Y&tV+{&{#{d8T07*qoM6N<$f|JnW5C8xG diff --git a/edumed/static/img/menu/wspolpraca_active.png b/edumed/static/img/menu/wspolpraca_active.png index e7b3740b22b124682e81beefcf1709d131aff76a..830bcc1f857c8e92a2c00a85f20e54b3d32f7942 100644 GIT binary patch delta 505 zcmVy{D6rGa?2b2dJ+Vdy!ixf5S;cK~zY`)t13=!Y~j; zpIw1xQ~;y{yMjOmq=MiI0yp0vH{E~=fC@q?z*Hc204cyTl#t6RqbLT1;Slx$vew^k zR;%5O@T@Mf1Q-CXK+oH*fD%|JZ4R`sy2!e~n`o!rb_uMNHY@+V$P?)SOQ0L@%@r_K z+8hG`6JQ1me*@ePK(4eY|A5v-HWWzLc>{dPIt893+OE%w(x$oqnF1eP07_sdzlo#m z`s6mckrT%w?GXe_J`3Q;>NGq-a;bSe9L27}Z5) zB>xUdo2M4H*w1YXzii62E4B9mTE$L@*t97(0+2h8miK`4n9|sJ_|;OZ3HBb4znEek z#9Yu$Taku5{YeAaYik`B)ZX&J9UzaA0x$CaR#?ka#lXUr0jZ6*K=ze3E2Yf_=-&b> zh2M6mTXifq%XW!LU1Wnmp=kqT<<&wTb{43eI^F32tRAO@1`H)Tf$7QM(7V%6Qpvy* vK9sZ^^XAgKuNm_u!04tiui=vXtHJpjfll^g4GMwB00000NkvXXu0mjf(9-Rq delta 528 zcmV+r0`L9X1o8xsDhV0@Bmgs0hr4!>Ga?2h7yu5&_mNvDf7(ezK~zY`)s`_*!ax*; zzhGm-3`4n%IFkd!$pM7UQaU?HXQ!M%J%Mln@C4!sjHSg6Il#_<&8m%q;{|M9oHYiC z3x&QWWcTgQH}Ac?eE|hiVcY-?fn%Uu*v^0y7+Ry}c$f;~7H}%sQDHj;uC3AI;<=z8 z(gsFAtHOVde}TR=dQlOu0bBvS3hr|tu|}ugKvfv`1k!b$0JriU0s9hd*QaZZ&Q?H1 zz)c|lDR3{(hNJEJBzbfLCz5xLL*E)b_#t&8rz{pgXBn(O-U&<&m@F$D6~<>0`P@3z z=roX&%p9S;RS^=w3*h`G*b>M~YxG40?Fg7US=-yHe>c^Mlg_?1dQzq4-d~^6dQ&~h z*=^vc-c%3ouTS$Okjb(vm1sZLo9YcXkn=Br3gfBN-`pC#>+uyAYdewWsI1n0sXddL z&1z1InE13C0Z5#s(Iy}ZOi|5QeDoA6gWUw=7p5Bj#9YuFUy+hJ{VW67^R*opG;b+~ z8-QF$atUMVAv^it1;Kd?sk zeH#A%xk4)pCHDf;mcgODp`j#`fv5UV;yLCGn0F4Gtu^MAd?bHraQ*;n#rer6 Sv?Fi;0000