From a78b10a7653e550a51b068da43b4fe81eac59cda Mon Sep 17 00:00:00 2001 From: Saman Bemel-Benrud Date: Fri, 14 Dec 2012 12:10:02 -0500 Subject: [PATCH] map marker style adjustments, more work to inspector. --- css/app.css | 15 +++++-- css/map.css | 11 +++-- icons/unknown.png | Bin 2701 -> 278 bytes img/source/design.svg | 96 ++++++++++++++++++++++++++++++++++++++---- js/id/renderer/map.js | 1 + js/id/ui/inspector.js | 7 ++- 6 files changed, 111 insertions(+), 19 deletions(-) diff --git a/css/app.css b/css/app.css index 359f3b25e..e297596bc 100644 --- a/css/app.css +++ b/css/app.css @@ -177,9 +177,17 @@ button.Browse { } button.minor { + border-radius:4px; height: 20px; width: 20px; margin: 5px; + border: 0; + box-shadow: none; + background-color: transparent; +} + +button.minor:hover { + background: white; } .buttons-joined { @@ -355,7 +363,6 @@ button.Browse .label { .inspector-wrap { position:absolute; right: 0; - left: 530px; border-left: 1px solid #ccc; border-bottom: 1px solid #ccc; min-height: 60px; @@ -378,7 +385,7 @@ button.Browse .label { } .inspector-inner button.tag-help { - right: 40px; + right: 30px; } .inspector-wrap a.permalink { @@ -393,7 +400,7 @@ button.Browse .label { .tag-row { width: 100%; - padding-right: 80px; + padding-right: 70px; position: relative; height: 30px; } @@ -591,6 +598,8 @@ div.typeahead { z-index: 9999; box-shadow: 0 5px 10px 0 rgba(0,0,0,.2); margin-top: -1px; + max-height: 120px; + overflow: auto; } div.typeahead a { diff --git a/css/map.css b/css/map.css index ca29e35e8..61da24c14 100644 --- a/css/map.css +++ b/css/map.css @@ -9,14 +9,13 @@ path, image.marker { g.marker circle { fill:#fff; - stroke:#888; - stroke-width:1; } +g.marker.hover circle, g.marker.active circle { - stroke-width:2; - stroke:#000; - fill:#FCFFAF; + fill:#ffff00; + stroke-width:4; + stroke:#fff } /* interactive elements */ @@ -33,7 +32,7 @@ circle.handle.hover { } circle.handle.active { - fill: #6bc641; + fill: #ffff00; } circle.accuracy-handle { diff --git a/icons/unknown.png b/icons/unknown.png index c7972f9447ac5cad348475ecc5d6d50bfc1c4e53..a47dd947dd41e3f45ba73b52034bd90abdd3c23d 100644 GIT binary patch delta 251 zcmeAboyIglxt@Wg*vT`50|;t3QaTtI7&r?&B8wRqc&~#nqm#z$3ZS55iEBhjaDG}z zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0wMJzX3_EPAg_UdY$%AmAeJyL!a|$EJvr z|LggRSUd|k0!&S_zj3j1N~lF{wl+53xmR1Iu!OBY_?0%#ylh|NYG%`bs%%C#&(C>G z#@P*gD;lPUvzFN1Hv2I7w$Gz$ma{ou^;ArqEH&kga)Dm_<01!PigldmzX5&2z~JfX=d#Wzp$PzX3SRsG literal 2701 zcmb_dX;@R&77Zv-f(i%(1gRlm5+4Z(0&)`)EwKi-_1RD?X}K6XYF(M6*<^h zZHB4CAP~rAiZ$6ud{>ZM8=>O=9g|CR2xPrB)6&v`VrhwR;Bx$!K@13FkK$R^UQU;b zGEu~Fx(O#C+^x<C-kPAb8R{M0F;jV$;(X2^lVTk{{7_y?cTC2$uO!4<&-tO}^!qyVUh^UR(BUq! z1&vvdu+25`!ML$q^`(&g~GkRm)Sln-m zb~C7o<1x>hMM(Qfwu+{3+w3OC`lo^SsLB-^=4P4qq0c9`Pqdn@m(G&@QJA<@&|ITu zVW&lsJ>O(7qLRI_6iO&<_ru($)7Gig#`n3hHHwjbarxO7=-kFWOzg4y*d=-NRsPhd z*LUu7iK#_Ch4P}FT{AA_B2rty)bx}$Vi`vu1_ura-Q#E4TZT4=v&v0CNtuyll{lx1Aar||*Hb6&dp9brhRI}<9o*3SS%wY%rb9CB;={6UObI%;+Q_rN)X}j>`R-yj%WT`#h1rFFbyqVuC)Q@s}(lM_7z9Dw;`-D8|t|^p#6L$BZF(t$Xr2xKJ z3o$J)kTkl5@EBS$`(&&Ng99Tc=YA#k0(N^ zWCbWq3s0$5oy{Yh7amQWPMx=Jr2hBa=_Zu!15z!qzNM(IDRVJpF@v2>OILl`i$5B< z4S!2pXdv9RpfA)DVipcWgC51m1#PcO<#A{k^OEthYdY=Wxiq>`ceGc)v%qU6dd_x_ z!(XZnT%0eRzeCW-Q!b)?6`%I9Y+_V)reV{9W|L zWEKeb=(-kv%gMC1x_t_j7UG#Wa5-84BuDF6i^gN@AJ+66OW#i}ojp9On|Ev7^kTe{ z5dgek{o{a6t#N-6aLjH06b!uD)Zldz+Pfu%k`?lA)5j_YJ90B~cgmi4T!`~}W_3=b zVYf=-fWB#HVOdqo4ej#pkmrZ@^~{y;59!{-`t1<;+)@>O#4X@Zx{`2AVY))S^ZN#AdOv0;~4oQR|5C{U- z*AH+afAc{uezHIYfM76y!Gwl}qC<_*9IihGYi@3iF~VVRI72bRkQc@V=>kJG54AGM z$9c#Mo)4E93^F-vgk)a2H-`^eAd!+ppMERr1et!HGqHIewk6&mMiRkb(MFh0bBm<} z2?{tdc$^@-J* zfDz5EP=hI0K z=5vFV&$+J;h7rUN?-=BXUBUkG2>SW}Jihl)h7b6$4l8GRxf);7{V}Ux0_IEh-&RiX z8~VP=h|A?-Ngfe6Nf%ksu4eqtI<0sh?l(l3SoyJc5n*lbS}Y(CDIE%VpUWP_ zRA)T9YOg|)m)_R2pZD6pv;hUxN|U=}8>(eo7DCFZQb%7V`b?3Oj*ViAwx^bjfyQJ{ zf5C)-HTJ8Ku_yKAVIvEa3)=lZpBJnzmFnF&Y+Q4D`x2q>(Tnv_r>WIgZmmgyTZG7D zf`)2~a+k`47hqxJ>lrb%@TR?r_=x9)`-~ynN3XRm95KE$U6Zdk`kX&--9*_wK6zUp zw0_pZfbXY&@*Pb3yq##k|43rZOgwcu!-=2Y$3{2H-x1-WPVILqIZO5NY*;8}1Ppkz zO~HU~7bqryy+iFA3;lA>{Mu^&%iHmA^bfC-!xf|nqWVHQthKznv7!ECw%)>^kp_uZ z)l%a=h?Z`P_A35_oAW|&` diff --git a/img/source/design.svg b/img/source/design.svg index 8206480f0..66c195cc0 100644 --- a/img/source/design.svg +++ b/img/source/design.svg @@ -391,18 +391,18 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="890.32523" - inkscape:cy="742.11499" + inkscape:cx="-471.6218" + inkscape:cy="713.3306" inkscape:document-units="px" - inkscape:current-layer="layer13" + inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1543" inkscape:window-height="834" - inkscape:window-x="349" - inkscape:window-y="5" + inkscape:window-x="340" + inkscape:window-y="0" inkscape:window-maximized="0" inkscape:snap-bbox="true" - inkscape:snap-nodes="false" + inkscape:snap-nodes="true" showguides="false" inkscape:guide-bbox="true" inkscape:object-paths="true" @@ -538,7 +538,7 @@ image/svg+xml - + @@ -3525,12 +3525,92 @@ d="m 35.000006,114.86219 -2.999997,-3.00001 2.999992,-3 z" style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" /> + + + + + + + + + + + + + + + + + style="display:none"> ") + .attr('class','remove minor') + .on('click', removeTag); row.append('button').attr('class', 'tag-help minor').append('a') - .text('?') + .html("") .attr('target', '_blank') .attr('tabindex', -1) .attr('href', function(d) {