From da135c705b740b742c5c1e6a14bc29af69399185 Mon Sep 17 00:00:00 2001 From: Franziska Schmidt Date: Tue, 4 Jun 2019 21:59:22 +0200 Subject: [PATCH 1/4] Use Mapbox maps --- .gitignore | 2 + _includes/head.html | 4 ++ _layouts/post.html | 100 +++++++++++++++++++++++++++++---------- assets/images/marker.png | Bin 0 -> 8906 bytes 4 files changed, 80 insertions(+), 26 deletions(-) create mode 100644 assets/images/marker.png diff --git a/.gitignore b/.gitignore index dd5493a..eb0f790 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /node_modules/ .jekyll-metadata _site +.bundle +vendor/ diff --git a/_includes/head.html b/_includes/head.html index 2d40de2..7635b1b 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -7,6 +7,10 @@ {% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %} + + + + diff --git a/_layouts/post.html b/_layouts/post.html index 9f948d4..70db2e4 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -17,65 +17,113 @@

ClojureBridge {{ event.city }}

- {% if event.latitude and event.longitude %} + {% if event.latitude and event.longitude %} {% assign latitude=event.latitude %} {% assign longitude=event.longitude %} {% assign zoom=16 %} - - {{ event.city }} map - - {% endif %} +
+ + +
+ + + + {% endif %}

Location

{% if event.street %}{{ event.street }}, {% endif %}{{ event.city }}, {{ event.country }}

- {% if event.registration-url and event.date > site.time %} + {% if event.registration-url and event.date > site.time %}

Register Free

- {% endif %} + {% endif %}

Organizer{% if event.organizers.size > 1 %}s{% endif %}

- We are grateful for the involvement of - {{ event.organizers | map: 'name' | join: ' and ' }}, - who will host this workshop, and will answer any - questions you might have before or during the workshop. + We are grateful for the involvement of + {{ event.organizers | map: 'name' | join: ' and ' }}, + who will host this workshop, and will answer any + questions you might have before or during the workshop.

- {% for organizer in event.organizers %} - {% if organizer.name %} - {% if organizer.github or organizer.twitter %} + {% for organizer in event.organizers %} + {% if organizer.name %} + {% if organizer.github or organizer.twitter %} - {% endif %} - {% endif %} - {% endfor %} + {% endif %} + {% endif %} + {% endfor %}
- {% if event.sponsors.size > 0 %} + {% if event.sponsors.size > 0 %}

A huge thank you to our sponsor{% if event.sponsors.size > 1 %}s{% endif %}:

    - {% for sponsor in event.sponsors %} + {% for sponsor in event.sponsors %}
  • {{ sponsor.name }}
    • - {% endfor %} + {% endfor %}
- {% endif %} + {% endif %}
diff --git a/assets/images/marker.png b/assets/images/marker.png new file mode 100644 index 0000000000000000000000000000000000000000..2b502da1485cc63abe87eba383e954b9a3bbcb0f GIT binary patch literal 8906 zcmWk!1yoyG5DZXUi(8?%dke)W7F>!u6!+k+#a(`&6f5rTF2$ihDZ$;{UCMtXC&@W4 z$<52&-PxJh7pbBI#zZ4U1A#!8vNDoifLBl8@gE8j@T|RY%mTb1eU%4Gf?i(lKRb$& zfg`98866i82p#YB0SEe#K@1#3c9m6>Lf%ArgU8A-S$I$Y0=);xN`6-NTsY43(pJBI z=oaNcppJ;3lKB=wO?2(dmBjR`x%sDbA=I$SIxHzMiYcYg>o@mk%m;aSmT7(NsfZ6t z8#WFhr2G>3_bx5@xsfQ%f#tPhr}1h0SvSb=lkjca3rAQCa+wWYDKWj14$vqb64yE4RT z{Boi*q_d2)_?ZPc+_O08%;w!Jq@yY{Z!zo}DX~BBG>x=tqQKHq!id_GMM}sk@JH77 zwQs*ys4`eIdUpRS{n^=V*}dA*L`(D?*|$=aA*JaPaP+;Uamfl#XDS^5%4{*-M@1)2 zDZC!cH~#SOH4!X0h3ek;hT}4#Q%B(HF6KS9jtUL!xgSHkYoP-%+2*k*Gb9n8Q@_;9 zz?|WTfgj=>vC{m2t8cUhnjGz|lD0+;VTMxdr}9k2rwJQ(bUbqu{&gWN$@&E;nA)_E zSTvVH_~nNdflSUic0d=;0;RwLKI)O4iFu=i7z$_0IH2MwroQ z{_s8I0C{Attupu8hJS$DnM~goDi?nPd=c-2)Hpz6lBOH$XG17BZzxZ$06e@MbCpkz zT#g<3ugv3;ZOW5drR3_9-YSlqrgHNwT$k$025%x2y4VB zW@q-!L9Cpg+jM)VEeeAJHs}JGUbnJBr{sVHGdK5I+90;_c9439=3Z>#$3vkFPcQ@T zhb37&qxa`)@sd(()yAb=a|qchi9{71<^CW$vV(GJYC~EfU!j?q8BcHboyi=dq4DvW zwbE=)AYuojB>OLArzrji%~d@ZU@hg|fkS$kkx@5jo?O!-+xHU%!fAP_$Fkt1z=$xR zNgl%Rx zJQb^6z~c9KP-<~|BHVp_$OmfnzW#yuCv%i+&pXwYFZf!xr2#A2*UwM8>mPb&^mCMD zmVZ)I6q>j=67IWaR87rRAFH`ZhLGdrq`0+%g|~sxL>xM2OD%66%7T%m&EF{JrwB{r zg}5SX7!=O?H@sBr-<*r`N4VzdxY)-*kPn0%oQe1L2)v-u#l9R z3YL~G~iQmz!b{ww?~Vc}&2pTpAF`6h!xqZ0)3p63!RCMkR1h5f9!{iqott#ykpj;roIfn03rM6KR7ZHb#wd<(apiub~NnT z2*tm_lQilX<` z8KH=v&xz3U!%Omi|E(fox3SlHsgVESn#d+XZO zq1;Ua#A1ywoY#=8Sp~G8P#%#+BG@jknol>zVD<>fCt6FeTDo4fnW(>|Va~`D{NA4JMHjtJGcZ-PibGvAu`>{>FC?_2bK`_BD|$-!9)4)s zd8b`Of*9)V-sp`~O~M?CNN&PxdbpGjp$^ zR~IB`WOQ_Ys(>dhF79aAM+KhxgX;&qroL)hOY-5aBh&4Xf~V#~A7HQKY(xh{!BZ1$ z^K}eaKyJVr+nXyI8-ptJ7CAl7K)_#s+xxSu2RQ+mxRQ#I(SB;Cf-LsirG#~$=&^RJ~-Y1L@xBbFW4g&021q@sCMsb(%1a* zxuy77Tr5)^PASRuQ#pI3um8DwgKl)bfhP{@U50Dc!*pbRL1zELLexr!MhwZN;~$h! z+$WGJGPCe=t}N+QUt}_L;e2X}JC6Jw>UC*>erms(_(6}$78sEs{2TvRbvY#8h(L;i^mZ-amT;; zmwSJ;|2I7&qm1=s3!RynS-Z`hhR0G#B1gs8-v0LpRDO730;nV1+Nx=F1GEOYZzfqo{8(gk7=byZi()IRt0N%S7(=2Bl3eU|bHJ?j*wBKjHtEhReb ze1tn+bVtor{*EK(?+<4?YyTnoJMmroIf_5p@|PerIQWM*yB@~}vbJPot)A{PMPw4R zyi898*6P5`hgMLpq~p~Eb63?)v;Q-dsbv0{k1Vp5H=tl4cA zCX5Ko%2XK$b@stk;#E!kHsk-MOLzn{inS#CzER-KueOt}lL~%dP|lLB_@^j(uyBE$ zO@Vvb$~`>6QGE4je!fZTpPQ3=rK@Nd*AspOVhRf7XD|7(cze$gav(uhE0oniKSifu zww+EBcNkNAghsuieWxmWt!!gsL%J-!k=VJ%0?E80S-K`PUtn?L{krd7a?QS1F12|$_sRnZ9dV{+{lXQuvsx?qm#fB^{+pYt2p(iri#bz8y`g6qK+eX(uL!qFmM!r9rm zr`xsJP(n|6)W0`AkG#G&_dn!rStuIPv}*74>oa3xF)w#Ik7Zhrn>rb#zGL;*RGCyGR5D z1?A-By*$>x0<~c}xdw+pF`W%?TdT8?82+j*Ih9FMN$GJyZr?Wdf%T2t=-E}hD-*T( zOIdEeRn<&67T~nbKTiwdlIiQ~_qMp~p5NSv=crVhkMa_7=qTyv%)iSv2k;0Lo021q zq*NA*Qi-l(V{+ zJbn+;G8`BmkINK%vBmX{9R23{wi{L`z^2#I(t}AcsTJr0gx8tF?n!MMjDo90b-`7kerFn(E zijn@e*Z=8h?orfv&-M=#68s7i?&*&XIA6&vkY@S=4xN>i1>1~K#6HdbeS>_9w=q5< zUVKgVm6TNyx6GKx(lVKNMdc^*WNQOvI$u>8Ohhz7x4TO^Y{q7#qxG#F;jy1T_D#N@ z4_L&oamp+t3jH}L$-l(8zLVGG2TpowN{aIxg!}#;vAL}cRVpY9rxf5|vAFR_NFp|0 zI%z3-kN}3WyU{OiW^S(b#TnhhgU`<1p01{|&4&S~(vYcqZ<#^@V?u1Ho6F0B=H`$N zA8eVG+w1GMYxxDwI@ZTpR(n>3k|Ao^+I@wJtBD!qJ3tL{L-zqW!t{0>gUnsh zLQ2|mE_3tqY18pA)k+=f>BxIPoco?!;0*z1_Q~y_e)#F)YG`rzUNL8W8dla@K!kt6SJqk zKMl}YU)193{3T*)yoNr6$P%4&Vm9W?6_;B8ZRhTOpM7cn?~CapmUaAPZ>S?KE_Xr` zQM>XqGG(%nN+2Lh%5qcxHaWh3endVWDO00ejf^v7D496eI?+63T^u7(i_G9n`)fI+ z@KA>VdHLk@h1=A^F1vpN21`C!?noTn*4EQoKR)hX;LyUQEe)+}XxP4-5ZU=fhra(O zk8F6@#{1?889-~3%R;xLag4PLlS+=*wx{Bj@*{F2Y|=o#bY4K%;ozL1I3A$?xxBng ztIDqDl<~atL_z}O(E*KnL^m>$2(wdVjJ-P$OcIjR&~}JMgE1@;sEpjaRP>xbLy5{f zu5*l7^b{K=8XWot2F-V~bYHGQJ$(We*lRilaDmn9EENZrJCaXy&CJzwb;Hs-Ax3t; zUeov&_92BuozhqI0-Y_y@Fq3yi3S$#L|2U`R3>zn+ZoRQ6^n`Mg38Jx_6h}H#`=Gn8fox*;! zOzLE0WK(dMQ#}7Q`vzAkdU4}I2A9_-(U(ZR6tG5 z55biE2>|h-tK$wq64t)M3P5N=(KPg)YjhiGJ0W+I%G*c;ezWM&N|^$`E|f(E0R{ng z0tnoYxOA%|34i;-O1JAx^K6ZcOgWA<05a%aSfG`?iYnULGQ9x-rI#&PLSDKTFaHok z(Mvsmbm{9Wr=m5(IXQ6vDpAYJzp=4#Ec=CW-9o3}1Ai?X)1 zO8$zsBs4V#mk8j zY5Ax8_um=-3N@zSKYV*!Jp&}Y&{s0}A}G+fIj>4nI-ZDpn>_cB%%Gf{D+^U%Rrqli z4C1C*XP`ni--B{f^nBfAy1v~Ej#t&WE@^8^?_(t%@$-O_4K$@GeA0C>x-1y_O~n_6Wd~|%@+pfbUe_sqZF}3gHXxz#kvK^NNsyyc^|ed+%(yx` zS8`iVx#q++*e^EncYlVfHjMj#-0kr2)%}n;>bWm(bzmT@!M5w`-@?m&fST?Vx57Z>Y!>;kxl?Q&Az16i<{xQ&Z8g60(hyhf(lu zbtBsZN3N>2om*&?2-DGsQWul)!XyVZ@|dJ2*fZy=|Dh{oE14c$uH!POdj$+uVPL~> z5msi&L1e8oNZ6IGI*hVAg9{5kVqz3h{Og0IPC3l`M>J^ZDZc7%u_l7;2LTwPP92qf zykrH0cYD*GL~n0CEWYTfPO=BVp(+7#F-`JE-0@aEkW_%AqP$!|$cNKDkOeohiRuQK z5jMeSZe}JIg(obuqU9!zLf7GDO%a;6jn{Rnj{znC-OxV+PzDPRnr& z!|cl$FG&r70fKjAzu%o9J zMapim|Cp!1ydWu&S@RL#{5SRsoK};d;UOMcT6zT(DC_1Y&SuKR4Zh7SS4#fe0Rbm< z6-~{7=~T<4gz9jB*DW-8m@PGP#gN})=;-h(WZ(}wcD+;ELuT3F9DctTs6TdRZDDim z==-)KCAD`@KH~?_;;4p*x;QB4zA*GlYRQG9Y0Y^V3_5TfrheGYM}$joU6TOjJHSr9dXSN>&hpJ@iQo8W%gZTZ$Gtk>@HtP` z{N%#~gsXzLLLpot#8bhM%92aTVKLokkVpq`jWa{5A>vq_(n z=%h2%lbD_wuFqZs=%iNzhCS{n7#=`JnjqW1r5Y(zLZvou$fmENcO0W9)EDNh+6@O| z4-2DnC6&@yV=n6JMRmHU!jh8oFua`23f46bXL!ZSjtYM}g@j=At*m4@EdLwe0N-2; zMkY)8oxKI5!mBX+hK#ue7<9g5ZBl22e2#IO-Tx%F&{|{}LQPuG#2{A~7yY}V%+Jr; z+uP*)7c4BA<+$ScQ?<3Pb0#mvz~o6qO5RcMUc{(rRJ42u)D0sUUyZsq6z34I!O|`t z^q@DNqGxwOA)517SJCZH7Yc^nOc;YVamDe4)!x6oO(Y zX;lc2k7vkAUaOEd92Ub9)ycT@AKcUo9=e zrISbUhyR}LeHtHsr%lkIpENiQQ0S5(u$Cazm(*1g?QLw=!?^jmIg}q3qbc^R-T~Io z)!Q@3?zdt@Nu_}2YryvIYMvr1{;|pNxrx)0#RWmgQzc+M*Jz|U=9`2bK+VJ?B|o{l zyPH`UnyjRsuADmoj+&=~-6v%%k{F;9he}BS($Nm5IS|AL1Q(r%ogSE%*ge@mC8O0} z{betc-v4@Yb2pfyM@scZ&Vsv`t)TpI8_uc}9?QD>`7Zz)AM?3fM)H{htEwi-!ek_d ziUY8V0BJxjc!OML(KQS!n@t$qPJ(*HqN6h>Z)_x?le%p*3LwnLtL}`e#7FJm@x}vE%sDA@}+n{ocx$Jy+!qu^kg$sZbM^2 zEQEQs|KOdplrA($M0(4?p}f%GVx0OX>K3pQLg*Wxo_wjybz@mS`uEEDfjJ+F6dmi= zT3op5ld^a(60#{D%M(Omqob>=5qmzYW$IeT2xKg>h!p~}ut+K$D)!CuGl=Dtl>vni z3rjl3tfpYfND$KoQx6hcIWP%EkT#XZ-2APIAq5{+kOoZJ-akZd0|O@sV1!X;@w=?# zg5sSIYjEozMVSLl!4Xh#%P;e!RKj$>OrH>PD;3 zY}2AozHazgnmyNK{cE}e@BDoKGcYE5#C{r^k;@V_r=8!U*f(V0VJe$I1qN;z4Z6pu zX$m`bJ+Ql6*znxymn2>oKWo_p+{c4HyEFyDa+r;yE_;Al1nY@~;ZBNo|MInPzI3Li zK7F!q9?V9b4Mgg4RSTB>tgWl7E8F1^D<}*Hj9npXf@6@+4TPZEgqYwS(%8c4&c|j` zMqogy%mk$X&SAhTG3=X=%s!2}o6)QqH^o zc&c;@Gq%ydzJFg`%nJg+%fDU=@KUdP3`tY4P@VP2Pl*mDgLn8gwVg0-C-Xa`*~LAe8Kvmz4lT245{W$N(u>WEowC1LY|U488>DValFsg>#Q zSi9$Zztp|3b4w~ld*ZO!E#neKeQj}J;9`CtT&4c~p#_*|dt!*7!u$;9R=XY80*)Lg z8{k_gVrjp*_t=Wkis5@(mdMOIKc&DIWl(>#cmVdyuiLmj*wRzf=2k_GaegSbN+ zB%N-p4X&l7*B)2^*V!d(u^f&Macc*wX&%8rVTcXRAsVzqoS=ucM2OH#Mb$*x%!US$ z5Oc7G=#j4p1})*PH_CKh2Q7VBZ`AH~3tCEA7sqoaT2Tb9z^HgrsD6H~9xLEvF8_Rd z+ZXl8yr79t!>VEQj}3Z1jh0>yixv7z!`7<5vg<8LnJt@HgIR;`1YC-kv?{ek`uk*p zO8b4tsqFq-oh8{>Q=>j=w00jgVNHY->(uv)mz!=i=HkSQT;Qq`kgSxFWTm)q@c+uG Br&<62 literal 0 HcmV?d00001 From cc68f41a6c36282a5b68ed399fe0dcd5b5934d11 Mon Sep 17 00:00:00 2001 From: Franziska Schmidt Date: Mon, 24 Jun 2019 21:27:19 +0200 Subject: [PATCH 2/4] Add mbx token --- _layouts/post.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/post.html b/_layouts/post.html index 70db2e4..fa3b46c 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -32,7 +32,7 @@

ClojureBridge {{ event.city }}

- {% endif %} + {% endif %}

Location

{% if event.street %}{{ event.street }}, {% endif %}{{ event.city }}, {{ event.country }}

- {% if event.registration-url and event.date > site.time %} + {% if event.registration-url and event.date > site.time %}

Register Free

- {% endif %} + {% endif %}

Organizer{% if event.organizers.size > 1 %}s{% endif %}

- We are grateful for the involvement of - {{ event.organizers | map: 'name' | join: ' and ' }}, - who will host this workshop, and will answer any - questions you might have before or during the workshop. + We are grateful for the involvement of + {{ event.organizers | map: 'name' | join: ' and ' }}, + who will host this workshop, and will answer any + questions you might have before or during the workshop.

- {% for organizer in event.organizers %} - {% if organizer.name %} - {% if organizer.github or organizer.twitter %} + {% for organizer in event.organizers %} + {% if organizer.name %} + {% if organizer.github or organizer.twitter %} - {% endif %} {% endif %} - {% endfor %} + + {% endif %} + {% endif %} + {% endfor %}
- {% if event.sponsors.size > 0 %} + {% if event.sponsors.size > 0 %}

A huge thank you to our sponsor{% if event.sponsors.size > 1 %}s{% endif %}:

    - {% for sponsor in event.sponsors %} + {% for sponsor in event.sponsors %}
  • {{ sponsor.name }}
    • - {% endfor %} + {% endfor %}
- {% endif %} + {% endif %} From f8109ccf8e5e1d871d99a168181ba4dde2138833 Mon Sep 17 00:00:00 2001 From: Franziska Schmidt Date: Tue, 25 Jun 2019 21:38:35 +0200 Subject: [PATCH 4/4] update styling --- _layouts/post.html | 65 +++++++++++++++++++++------------------------- css/main.css | 11 ++++++++ 2 files changed, 40 insertions(+), 36 deletions(-) diff --git a/_layouts/post.html b/_layouts/post.html index c0435c1..eeed485 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -21,17 +21,10 @@

ClojureBridge {{ event.city }}

{% assign latitude=event.latitude %} {% assign longitude=event.longitude %} {% assign zoom=16 %} -
- - -
+
{% endif %} diff --git a/css/main.css b/css/main.css index 8ca0283..821b9ed 100644 --- a/css/main.css +++ b/css/main.css @@ -25,6 +25,17 @@ body { overflow: auto; } +.map { + width: 100%; + height: 300px; + margin-bottom: 2em; +} + +.marker { + background-size: cover; + margin-top: -37px; +} + @media screen and (min-width: 800px) { .logo { float: left;