From 047cf1b1cd63384492d4a7742ebaa5327d75c759 Mon Sep 17 00:00:00 2001 From: Julien Veyssier Date: Thu, 8 Dec 2016 10:23:36 +0100 Subject: [PATCH] refs #6 add a few symbols --- css/gpxedit.css | 22 +++++ css/gpxvcomp.css | 125 -------------------------- css/images/symbols/dot.png | Bin 0 -> 293 bytes css/images/symbols/drinking-water.png | Bin 0 -> 1311 bytes css/images/symbols/residence.png | Bin 0 -> 770 bytes js/gpxedit.js | 10 +++ 6 files changed, 32 insertions(+), 125 deletions(-) delete mode 100644 css/gpxvcomp.css create mode 100644 css/images/symbols/dot.png create mode 100644 css/images/symbols/drinking-water.png create mode 100644 css/images/symbols/residence.png diff --git a/css/gpxedit.css b/css/gpxedit.css index 2b54175..2424ef4 100644 --- a/css/gpxedit.css +++ b/css/gpxedit.css @@ -605,6 +605,28 @@ input[type=checkbox] background: url('images/symbols/medical.png') no-repeat right 8px center rgba(240, 240, 240, 0.90); background-size: 24px 20px; } +.residence{ + background-image: url('images/symbols/residence.png') !important; + background-size: 24px 24px !important; + background-repeat: no-repeat !important; + width: 24px !important; + height: 24px !important; +} +.residence-select{ + background: url('images/symbols/residence.png') no-repeat right 8px center rgba(240, 240, 240, 0.90); + background-size: 20px 20px; +} +.drinking-water{ + background-image: url('images/symbols/drinking-water.png') !important; + background-size: 24px 24px !important; + background-repeat: no-repeat !important; + width: 24px !important; + height: 24px !important; +} +.drinking-water-select{ + background: url('images/symbols/drinking-water.png') no-repeat right 8px center rgba(240, 240, 240, 0.90); + background-size: 20px 20px; +} .campground{ background-image: url('images/symbols/campground.png') !important; background-size: 24px 24px !important; diff --git a/css/gpxvcomp.css b/css/gpxvcomp.css deleted file mode 100644 index 9d3e982..0000000 --- a/css/gpxvcomp.css +++ /dev/null @@ -1,125 +0,0 @@ -html { - min-height: 100%; - position: relative; -} - -body { - margin: 0; - width: 100%; - height: 100%; -} - -div#map { - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - width: 100%; -} - -div#parameters { - font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif; - color: black; - font-size: 75%; - background-color: white; - position: absolute; - top: 0px; - right: 0px; - width: 300px; - height: 100%; - padding: 10px; - z-index: 5; -} - -#gpxselect { - width:100%; -} - -div#logo, div#logo img { - height:100px; -} -div#logo { - background-image: url('images/gpxvcomp.png'); - width: 125px; - background-size: 125px 100px; - background-repeat: no-repeat; - margin: auto; -} -h1.sectiontitle{ - font-size: 18px; - font-weight: bold; -} -h3.sectiontitle{ - font-size: 16px; - font-weight: bold; -} - -ul,hr { - margin-top : 3px; - margin-bottom : 3px; -} -h3 { - margin-top : 5px; - margin-bottom : 5px; -} - -.uibutton { - font-size: 13px; - height : 28px; -} -#help ul, .trackpairlist{ - list-style-type:disc; -} -.activeArea{ - position: absolute; - top: 10px; - left: 450px; - right: 10px; - bottom: 10px; -} - -#stattable{ - word-wrap: break-word; - white-space: normal; - border-radius: 7px; -} -#stattable tr:first-child th:first-child -{ - border-top-left-radius: 7px; -} -#stattable tr:first-child th:last-child -{ - border-top-right-radius: 7px; -} -#stattable tr:last-child td:first-child -{ - border-bottom-left-radius: 7px; -} -#stattable tr:last-child td:last-child -{ - border-bottom-right-radius: 7px; -} - -#stattable th, #stattable td { - border: 1px solid grey; - max-width: 100px; -} - -div#statdiv{ - overflow:scroll; -} -#stattable td.normal{ - background-color: white; -} -td.selectedColumn{ - background-color: #FFE464; -} -#stattable td.statnamecol { - background-color: #E6EEEE; -} - -/* adapt right leaflet controls when sidebar pushes them */ -@media screen and (max-width: 767px) { - .leaflet-right { right:40px; } -} diff --git a/css/images/symbols/dot.png b/css/images/symbols/dot.png new file mode 100644 index 0000000000000000000000000000000000000000..f453b5afb3a093ef29c2714651775999578f7f4c GIT binary patch literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPN54)fubJx+AEkGgJ%#er@=ltB<)VvZPmw~~#C^fMp zHASI3vm`^o-P1Q9MK6^dDBkJm;uvCadg)|GzC#8A%;|SMT&Gqr{I8eMe-IFKHO8z% zxM_{5e9?!LwK<2(>{l_STOHfU=yJsTlx?l|{?uyD+b%8tXSD1Qxh=H8NS||u7{lxp znW7&w82A{g885I-$tIpTVa9tCq4fQ4X1Csm27=Gv7|1z;VJXIO=;&( cSr_!2;pXSp&|M~a?-azopr0N1x*wg3PC literal 0 HcmV?d00001 diff --git a/css/images/symbols/drinking-water.png b/css/images/symbols/drinking-water.png new file mode 100644 index 0000000000000000000000000000000000000000..c05a7ee5213ef8d8af4d3f656e9ab332c69dd1c3 GIT binary patch literal 1311 zcmV+)1>pLLP)WTrr#S!s03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00e_cL_t(Y$EB9vYaCS+ z$3N%JWG1s|vPs&lCRLMS8yhUKSfT+%q0m+WDO!q`y3_-Km%fC&Xle}MYxLmvt) z7Ag^;5iFIW6fyKcEheNv5=d>D$!43~ot~3uFJl(nXoO{0Kd%yS0mHGL3 z0JPR@W+GDZ(^?}U6?64`i)NapS#x9CwvRiG^Py!~H-KjWH;!Yp*3Sc5fk;IDR7%YN zw${2QpU-Er+3Xpu^+FZUhYuf?K8gsGQakhc{N2;1PuojNONa=Ii;EFA7-QCR1&2jMHL57EiKh0z^XEr9PS&nI%+oz_cF1fCIa&T~vWHLzQT29utg*Se64k>X__g^vhLZo9RVR=0QS+N zNAD*R3BoYs^5x4NTI=*WVDUW9%;)pVHCYmoXB@|Q*S75+MI-I8McxSBN2vHw# zRmR81EACBsq96!JCX$;4Nj;5k0qEILxB3Y%>8^8cC36waOOeRyJV`DR{MZuOWTZY3h z+^MymiK6K6@sH+??RkGIf8WUP^;pMQ!!TYI5i5@4Yo6zw7ZI;+3);+l-+yyxXy~n? zI{!((%<8oS?!5v>j{G`O^qZKN_|EgZuu63zQdc#_d0>y$`UN00F>xJ$cRrYA&)aJi zT{=6u#_gfQ0J}vbEV81Wu%KOOD}yJ# zA#QA-t^H}B1z(mp{?!bzUtr1H3lNp>XV%-iPQo_RP%i?sr}h)H8-z*0%|Nn$Hw`F*@EP?lCFb^i5I7M?{4f2`i?WFU8GbZ8()Nlj2>E@cM*00L%7L_t(Y$HiCMjl&=i z99!4Xx~8QjsL4|k_rdbUvEoFEbrR5t4fDjP?1Zd+~JG4JTDg`mgWd{hB|N8L(=LNB- zA+^zvt0)M7$C0!k(v=kXfb)dp8Zn79=5oBk`v&p}apqdBFb%mTXaY?oC6!juW)*x7 z`ONXf=iq{CdB%D1ap5>~Yg5^M;hZSfICMEyul@FF7AoPu>eIxGg%jMHPjJ zB*X+nwMaHJw#o%XGD4|cCZPZX0YL=rt~lEXR|v2v(SR~_yov_k zoAPyGUR%z2%{dy5YbQn@_nnwrz_Ei3@|5AN%@Q&icW}K+}Cn6hOdKoizYW{uQQQRc-W%UGqV0E^`50qb1C0Z+%)h z#`1(R?p?Ukz~apJH@5QhaRUHH#MYOpe#spV*KZ}~*=0U#m-CwD&F6ywIW9Qm%dCHW z@|k->EPQ@-#qks?V=jE-jU`W+Rh(_3(jO+1 zCQ#1jt$RLrW9gF$n0LDp#l!bse`ERPwd04^KQ&|=pP<99Q2+n{07*qoM6N<$f|iR_ A0ssI2 literal 0 HcmV?d00001 diff --git a/js/gpxedit.js b/js/gpxedit.js index a67231a..f96763d 100644 --- a/js/gpxedit.js +++ b/js/gpxedit.js @@ -25,6 +25,8 @@ var symbolSelectClasses = { 'Blue Diamond': 'diamond-blue-select', 'Green Diamond': 'diamond-green-select', 'Red Diamond': 'diamond-red-select', + 'Residence': 'residence-select', + 'Drinking Water': 'drinking-water-select', 'Trail Head': 'hike-select', 'Bike Trail': 'bike-trail-select', 'Campground': 'campground-select', @@ -91,6 +93,14 @@ var symbolIcons = { className: 'diamond-red', iconAnchor: [9, 9] }), + 'Residence': L.divIcon({ + className: 'residence', + iconAnchor: [12, 12] + }), + 'Drinking Water': L.divIcon({ + className: 'drinking-water', + iconAnchor: [12, 12] + }), 'Trail Head': L.divIcon({ className: 'hike', iconAnchor: [12, 12]