From b1bf598c869777b7d08ffd5edb7ec2c4ec16e00e Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Sat, 20 Aug 2016 22:45:59 -0600 Subject: [PATCH] Change player location dot to green (life color) --- .../2.13/taskArtifacts/cache.properties.lock | Bin 17 -> 17 bytes .../.gradle/2.13/taskArtifacts/fileHashes.bin | Bin 158605 -> 158605 bytes .../2.13/taskArtifacts/fileSnapshots.bin | Bin 3605964 -> 3605964 bytes .../2.13/taskArtifacts/taskArtifacts.bin | Bin 194400 -> 194400 bytes .../android/assets/www/css/MarkerCluster.css | 77 ++++++------------ platforms/android/assets/www/js/location.js | 2 +- www/js/location.js | 2 +- 7 files changed, 29 insertions(+), 52 deletions(-) diff --git a/platforms/android/.gradle/2.13/taskArtifacts/cache.properties.lock b/platforms/android/.gradle/2.13/taskArtifacts/cache.properties.lock index 35b526f2ef4c805104213eb2ab18298828bfa9dd..c4a19397d830accda071d201eb7fc8277d8c52f0 100644 GIT binary patch literal 17 VcmZQ>a$9jsqWiTJ0~n}O0RSa$9jsqWiTJ0~jd(001&81pNR2 diff --git a/platforms/android/.gradle/2.13/taskArtifacts/fileHashes.bin b/platforms/android/.gradle/2.13/taskArtifacts/fileHashes.bin index cae7260ee4220bd6591f60e703fb97c1f08fafdf..fa9edd1d7a6ceeb6833af4dfe023407587805e8a 100644 GIT binary patch delta 434 zcmeCZ&e?mNbA##h{AV!%Vp1$E2qr~=SQcP{)OqnLz^Ng6( z448rP)Blz;ny{<}vCbzk$to)eGVF=Gx7+oHj6iex(sQ|?#`_r<7{fpcz($$chfRO@ zhf#9+?Mg=B?bgXm-&vIu1q?T&-Z^#D=X+&j--qR|?nj|$aV}?`KEISvLP0{=$xtwS z^|!OL+?5xn@p_}GD%%S7$kI%vT%d_c*P?5M10xo#<(-z7{A+P6L~RnpI}A!UL2BjC z%)IbZF6+)m2maJKrP~VQ!HQC@AAqQ0oBVOD*#1n4sZE^8FLHaH5tEt$ zNaggu<%}jQt3j;uNldaziUPi=KidAz-z9N(hxt{%XYZ647#PDq@?eup?WcpSyH&|3 zvfVnF={u{kk|4t}{k&7To%fz=S$S%>)Wifqw8Y*3YjG}jp1#n4QBuBo-*a6NQJSvk$|R|< z^U-w%wi)V%LjTQK)@=9K2Ug@M<^l0DM>p8SyO~U4(`RQf$>TN_7D{-Hl`=pvRyUg| F0RW#xj9UNz diff --git a/platforms/android/.gradle/2.13/taskArtifacts/fileSnapshots.bin b/platforms/android/.gradle/2.13/taskArtifacts/fileSnapshots.bin index 3a315758af9f947323a5f14ab276da198fb378ec..5522e81aa7d12132ed8d19b9246faf2f3bd94cc1 100644 GIT binary patch delta 2147 zcmai!3s6*57{~8jo*8g27_i5?E|RvLLjA3ce^GrGl7?8S#*pMHUsx!&<{J z(d&2+#ds)U?yBn=2U8OiBWqQZG#U*=)6h`{ol>+hI^1<^CVJeN-<|*dzwdnK`_8$u zwsluX8>WI;rm5OT5QG>*5M0h${QgPM%+2o!g7mTL@ zXesc=`ZGZX3|XG(@S+gQs#afeCLb%-P+y*ZW3Bb{CLznO_As9zwpcabDjB5QdH>|O ziPb_t8=W@v^x4>=p40VuNQB_4P1kvrnM+MAkAG+IqO;(!e(U)R#-A$ss+>tGogsLP zkAW{{PFt5sib?CEv9n2Qs$U67eLAn%B7d^do^q?#+Qn9g=r7L4+zeM~Q|#`#eSE5H zE;Y8kL%MM0MZx2;7x9g<19bEK=CjIgq8AA!XdC3`jEmxH$2C$f?cbI1``k>yXW1jx z*Z_YAs#mr!29SsHQvcz1nGXf8q;@){V~#L4sxLt!!8vX)O%Tz^639n=I4o zjCvi35n&uKjut2+@3Jhg+AT_YDlQB1g(_$a>D(^XKo20E^8)wPzjPrm|g{1D9h~|iyNEm-$%eJ zolv?BWKww<{1Wqo0wG@;ISH-W2AWA)AuBv`!R3a%FKu)YR8|8Ezcn%yE!+WU5tUau z(0zTP$-WCNQ8O_EeO-eid`FBLO6$Q=DtuDHqOK`zLW+Mu9>4a*DA-;P#PDG~P|=CM z(F=e4qrfJFnLZJe?gWuAcPE&^XX*_|xeN4?C}=luC8@)StYLOt-P6n-zBx7u85%*2 zi1Hb~I_9Ua*Mx|ldph#i3pz-8`3Yv(ebd^9g3aX>!%HTR0T-CT9_q}t>qkG2h_f%K zcjhbOqxf6#VrbY02KYS*zHrrk-1*N-3tCR))Y`M0T44WvPy&qyKn3O6XDeHO?*}2G zy*3|uSn$PcumC-ur;FmJ>nL=?0+`XLq?`#Q(Pkf+FKL|G4lrZT)OKd4KWt;!RWK=s zqtVJ+Oj9RH_m)i+8S{@zFk?~vacNQlQXG>ci0Grq-ACdFC3IQ(uCqDw!;ZsVvt~KE zdtB1(2sch4CB`y$KUC(W-*qhD0ON(WbHJ%IiJ~&e~O;-P=`>f&Qc-Y;?j2iB+$SCDlj6afcTwek_ z8K8YIvi{XNzsVw8@Q*fdgFaX>?b79f)gMlomHy;_+xQFcgM2O&;<>!wn&n(KymFJd zCe|ECyYlU+#D|5+pAPK4-DCeBA&AFlaSo>tJ)PTD-LS@%L^hy@zPmVmhID`BmJm=!4H=2B9 zm~qJD8=#7TuV-@)#D6~w;d%+u1D?MdsE3JPgF&b^$UTkf1p!FCATW4~YeOqRG_;CL zNTYQ#y1<@8;WXNvs`@yZwr%ZrB+a^VFP2K%{!Y^h11$MQvIg~E4(g*lY3@==(dfBJ zb!PW1xyv5czlK^*a?Js##w+*@1$hp7%4CuFN5rcns)!AK&%qc{8H5SOjK|0^As7WF z6r)5Tl`4_rzi)Y)rY*hFk{Iu$J8iZtPFMyF?I?D!IlZ3?4NWQ8_xp3|=cVfq!RfV4vM56AmolX#j% x4z@6YxO)t9Xc%&+&0mPlZX^YTn$9Hv$|78bLIqO&W!Ne{wH+uCxQR~ delta 2105 zcmZvce^e7!7RNKgPm4H15RzxokW5Gnksp&tAu0k^320pmbwR60Kr4$P_zSC6rB>|* zN)cq#hk^(KR*GOlJo`kkh()wgc5T&`T8l($3m)o^?yiF9VIPxrPtUS{e9pV)e(#%m z-@W(Dmj$%>j`RG%w}oQrB`{UpUVZCJWNKAvah-5a9>jP03V{=QQ?-TZ~{YOoG{K9 z7mO>$4dad(hj|6#ffiQYtD|Dizo3-;fF;rKgP@e4eQvAo-!Oep z>kzA&VOS~n0*MX*6G8d0o0bnQOXekJ%@UY$7<>Vv%0MbYW#AM6bB};Js(M>&>K^xC zJ_xiAa>a&K$Wj4llB=6;MiZ*AMaMR78cvN#UdsnbKHSP(i7>$UYLEsmR|A&Xygj(( zK>7Q;s=u2EA6Da{-BWH|D2e*Pk$i0ibgcmfm{bE;`cM7V(?y-bUA&}Pcpc`}fCMV( z=`EM(cYbxG@HKO(kr^ns7T5{OXK%-W;=+1fQTmvX>&L*0;M$^DWIh2ZNor?zQNgE+ zvK=@3NHn1yTqEGqlOUB|b8pUtAG2TF;5FUhMi}1!tWeYlLg;malbs3&OP27GW=|*A z8>4{cM(~)*e_fZ;bF7XRLU&BzDvffOehQ>fFQiQog;g&ciGF^-iDMP;*(p4=vmM_& zbln=r3rxmK82>3a#Mxub^n3Noj}5)+Kb2RsDef@I3SzmV;p4cta0=bG0*N<#b2W1> z@QmigfGM=Ovo>$wvpExwv-|~tV0fWh@<*|=yZaV=rc*h51O@GSl7*GaC{N4$4uF}2 z=66WS8Q3nD=c4p}Nyl~6Jfbp^Fej6tExTH!m{-xRR+-TVv$C0;^p(}Ou3mb_ZTW%B z=&W;{ed&;8sqBkxF?h8f!{AwJ%zXxG|I?g14cVD z(Tmpfu2NeMt~Xwl)_J&Ppc#L7KUr}U?Q04Y`oaYj&O$V>V0=p=GNn%5;0kvvnM5P) z$?+?l(8B@dT@4C4FP%+V>P1S7KdKk0*a%lQ{GWC!My(^NND{JUt(S#OQXw`;tvLuU zs`Ssq|2wv^3jy&$JRdv0-)Ge046S!$Z$i2(jDhPO=(oU;t_ebTBu(3lav7OUj2?z5 zYt=$8!Nr^v_C~iW7l(%?EqW07&wrzRQf&}{-k8f~dcoGoS{r(_PC3_P(UwleXfOd7 zEoKTP5EFz6M%vO4Cuj6Yu0Gd`J~8W+l*DZd?wPc6rp^3wixstf&YV%9N}*M)4(rN}xQ$(rmxNl# zuQQ6Dt`8@W`&%KZ*`o!XUV-c*Ay5ZBYC>uB|MMcO9s6S%;&ViZ!+O;gEMQ*40by-v F{{cHR`pp0U diff --git a/platforms/android/.gradle/2.13/taskArtifacts/taskArtifacts.bin b/platforms/android/.gradle/2.13/taskArtifacts/taskArtifacts.bin index 781abc94fbc6c6253431d5231af3353bc7912410..466971dd03a62f92b1ff77bde3f79172cf14fa8f 100644 GIT binary patch delta 474 zcmaFxj{Cto?hTsh5{vn(m)ulh_T}w=7O|)IwEN1tuXMMzCgp8*O!sG$n0WA!U&n*| zpN?$-jq^7rl+QUce@S)s)sJA=&6?@yjFTIJ*fytRn;J>%ST`-n>ubnHl?K&W__gLBT)5)6CEMWS}d)uCQtS%`L&EHD*&Xb45;1t>EL+TKFaD z<-J`2Y_h0|*@PAfRXDV%%`=!6&_0BZsU#kSB&eokeTXo@%&5r5*j1sx` zuB_;aSo4&rZ(`xpDOY@Yp0oJ=SytWzmYv)X#I`vl+tg?>@BCd7>1K!foa>HPZ_4;} zLU-{r$D8IVk7TXZ-cgv;pk3>C z_=f#0|CZ;dirECZvv=J4+dh98n4XAlH$263omJx6wa>v_K`+AAJHeR z{QckA8UJ^6OgG%i=(fH86jLRugxr}PCx*t^0y*kigN3%3P0`;kH*dvqV-L8R39Q>0 zZ!vvjkyx*BuGi!F!tl5^vjoa2T>e}*o|iCr&dcJ-itin^N8VzZ$s#em@zzs;m1S&w YCw>JV?O0Qs5&yn_d12o^m=bnb0GR^T?EnA( diff --git a/platforms/android/assets/www/css/MarkerCluster.css b/platforms/android/assets/www/css/MarkerCluster.css index 8068a42..4e36242 100644 --- a/platforms/android/assets/www/css/MarkerCluster.css +++ b/platforms/android/assets/www/css/MarkerCluster.css @@ -13,63 +13,40 @@ transition: stroke-dashoffset 0.3s ease-out, stroke-opacity 0.3s ease-in; } -.marker-cluster-small { - background-color: rgba(181, 226, 140, 0.6); - } -.marker-cluster-small div { - background-color: rgba(110, 204, 57, 0.6); - } - +.marker-cluster-small, .marker-cluster-medium, .marker-cluster-large { + background-color: rgba(181, 226, 140, 0.6); +} +.marker-cluster-small div, .marker-cluster-medium div, .marker-cluster-large div { + background-color: rgba(110, 204, 57, 0.6); +} +/* .marker-cluster-medium { - background-color: rgba(241, 211, 87, 0.6); - } + background-color: rgba(241, 211, 87, 0.6); +} .marker-cluster-medium div { - background-color: rgba(240, 194, 12, 0.6); - } + background-color: rgba(240, 194, 12, 0.6); +} .marker-cluster-large { - background-color: rgba(253, 156, 115, 0.6); - } -.marker-cluster-large div { - background-color: rgba(241, 128, 23, 0.6); - } - - /* IE 6-8 fallback colors */ -.leaflet-oldie .marker-cluster-small { - background-color: rgb(181, 226, 140); - } -.leaflet-oldie .marker-cluster-small div { - background-color: rgb(110, 204, 57); - } - -.leaflet-oldie .marker-cluster-medium { - background-color: rgb(241, 211, 87); - } -.leaflet-oldie .marker-cluster-medium div { - background-color: rgb(240, 194, 12); - } - -.leaflet-oldie .marker-cluster-large { - background-color: rgb(253, 156, 115); - } -.leaflet-oldie .marker-cluster-large div { - background-color: rgb(241, 128, 23); + background-color: rgba(253, 156, 115, 0.6); } +.marker-cluster-large div { + background-color: rgba(241, 128, 23, 0.6); +}*/ .marker-cluster { - background-clip: padding-box; - border-radius: 20px; - } + background-clip: padding-box; + border-radius: 20px; +} .marker-cluster div { - width: 30px; - height: 30px; - margin-left: 5px; - margin-top: 5px; + width: 30px; + height: 30px; + margin-left: 5px; + margin-top: 5px; - text-align: center; - border-radius: 15px; - font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif; - } + text-align: center; + border-radius: 15px; +} .marker-cluster span { - line-height: 30px; - } \ No newline at end of file + line-height: 30px; +} \ No newline at end of file diff --git a/platforms/android/assets/www/js/location.js b/platforms/android/assets/www/js/location.js index 36a2665..35f8e35 100644 --- a/platforms/android/assets/www/js/location.js +++ b/platforms/android/assets/www/js/location.js @@ -73,7 +73,7 @@ var lc = L.control.locate({ remainActive: true, // if true locate control remains active on click even if the user's location is in view. markerClass: L.circleMarker, // L.circleMarker or L.marker circleStyle: {}, // change the style of the circle around the user's location - markerStyle: {}, + markerStyle: {color: '#008000', fillColor: '#32CD32'}, followCircleStyle: {}, // set difference for the style of the circle around the user's location while following followMarkerStyle: {}, icon: 'fa fa-map-marker', // class for icon, fa-location-arrow or fa-map-marker diff --git a/www/js/location.js b/www/js/location.js index 36a2665..35f8e35 100644 --- a/www/js/location.js +++ b/www/js/location.js @@ -73,7 +73,7 @@ var lc = L.control.locate({ remainActive: true, // if true locate control remains active on click even if the user's location is in view. markerClass: L.circleMarker, // L.circleMarker or L.marker circleStyle: {}, // change the style of the circle around the user's location - markerStyle: {}, + markerStyle: {color: '#008000', fillColor: '#32CD32'}, followCircleStyle: {}, // set difference for the style of the circle around the user's location while following followMarkerStyle: {}, icon: 'fa fa-map-marker', // class for icon, fa-location-arrow or fa-map-marker