From e82bf1a8b0c874e6cc9cbe9526b6a30f5dbcc4e6 Mon Sep 17 00:00:00 2001 From: Saman Bemel-Benrud Date: Fri, 7 Dec 2012 17:39:33 -0500 Subject: [PATCH] basic style overhaul complete. --- css/app.css | 395 +++++++++++++++----------- css/reset.css | 17 +- img/source/design.svg | 579 +++++++++++++++++++++++++++++++++----- img/source/sprite.png | Bin 5310 -> 7277 bytes img/source/sprite.svg | 431 +++++++++++++++++++++------- img/sprite.png | Bin 10104 -> 8650 bytes js/id/id.js | 28 +- js/id/modes/add_area.js | 2 +- js/id/modes/add_place.js | 2 +- js/id/modes/add_road.js | 2 +- js/id/renderer/map.js | 8 +- js/id/ui/inspector.js | 16 +- js/id/ui/layerswitcher.js | 2 +- 13 files changed, 1111 insertions(+), 371 deletions(-) diff --git a/css/app.css b/css/app.css index 493726b1d..a448b212b 100644 --- a/css/app.css +++ b/css/app.css @@ -5,7 +5,7 @@ body { font:normal 12px/20px 'Helvetica Neue', Arial, sans-serif; margin:0; padding:0; - color:#444; + color:#222; } #iD * { @@ -63,7 +63,10 @@ input[type=text]:focus { .fillL { background-color: white;} .fillL2 { background: #f7f7f7 url(/img/background-pattern-1.png) repeat;} - +.fillD { + background-color: #222222; + color: white; +} div.hide { display:none; } @@ -87,8 +90,8 @@ button { font-size:14px; display: inline-block; height:40px; - margin:10px; } +.fillD button { border: 1px solid black; } button:hover { background-color: #ececec; @@ -104,14 +107,17 @@ button.narrow { border-radius:4px; } -button.wide, +button.wide { + margin: 10px; + width: 100px; +} + button.add-button { width: 80px; } - button.narrow, -button.add-button:first-child { +button.Browse { width:40px; } @@ -145,12 +151,14 @@ button.save { color:#6dc643; } -button.cancel { - background:#aaa; +button.delete { + color:#ff7070; } -button.delete { - background:#DD5757; +button.close { + position: absolute; + top: 10px; + right: 10px; } input[type=text] { @@ -169,6 +177,15 @@ button small { vertical-align: top; } +button .label { + margin-right: 3px; + text-shadow: 0 1px 0 white; +} + +.active .label { + text-shadow: 0 -1px 0 rgba(0,0,0,.25); +} + /* Icons */ .icon { @@ -176,18 +193,208 @@ button small { vertical-align:top; width:20px; height:20px; - background:transparent url(/img/background-pattern-1.png) no-repeat 0px 0px; + background:transparent url(/img/sprite.png) no-repeat 0px 0px; text-indent:-9999px; overflow:hidden; } -.icon.browse { background-position: 0px 0px;} -.icon.place { background-position: -20px 0px;} -.icon.road { background-position: -40px 0px;} -.icon.area { background-position: -60px 0px;} -.icon.undo { background-position: -80px 0px;} -.icon.redo { background-position: -100px 0px;} -.icon.save { background-position: -120px 0px;} +.icon.icon-pre-text { + margin-right: 3px; +} + +.icon.browse { background-position: 0px 0px;} +.icon.add-place { background-position: -20px 0px;} +.icon.add-road { background-position: -40px 0px;} +.icon.add-area { background-position: -60px 0px;} +.icon.undo { background-position: -80px 0px;} +.icon.redo { background-position: -100px 0px;} +.apply.icon { background-position: -120px 0px;} +.save.icon { background-position: -140px 0px;} +.close.icon { background-position: -160px 0px;} +.delete.icon { background-position: -180px 0px;} + +.active .icon.browse { background-position: 0px -20px;} +.active .icon.add-place { background-position: -20px -20px;} +.active .icon.add-road { background-position: -40px -20px;} +.active .icon.add-area { background-position: -60px -20px;} +.active .icon.undo { background-position: -80px -20px;} +.active .icon.redo { background-position: -100px -20px;} +.active .apply.icon { background-position: -120px -20px;} +.active .save.icon { background-position: -140px -20px;} +.active .close.icon { background-position: -160px -20px;} +.active .delete.icon { background-position: -180px -20px;} + + +button[disabled] .icon.browse { background-position: 0px -40px;} +button[disabled] .icon.add-place { background-position: -20px -40px;} +button[disabled] .icon.add-road { background-position: -40px -40px;} +button[disabled] .icon.add-area { background-position: -60px -40px;} +button[disabled] .icon.undo { background-position: -80px -40px;} +button[disabled] .icon.redo { background-position: -100px -40px;} +button[disabled] .apply.icon { background-position: -120px -40px;} +button[disabled] .save.icon { background-position: -140px -40px;} +button[disabled] .close.icon { background-position: -160px -40px;} +button[disabled] .delete.icon { background-position: -180px -40px;} + +/* ToolBar / Persistent UI Elements +------------------------------------------------------- */ + +#bar { + border-bottom:1px solid #ccc; + position:absolute; + left:0px; + top:0px; + right:0; + height:60px; +} + +/* Special rules for toolbar icons */ + +button.Browse .label { + display: none; + } + +/* Status box */ + +.messages { + display:none; +} + +/* Inspector */ + +.inspector-wrap { + border:1px solid #ccc; + position:absolute; + right: 0; + left: 530px; + min-height: 60px; + opacity:0; + display:none; +} + +.inspector-inner { + padding: 10px; +} + +.inspector-wrap a.permalink { + text-decoration:none; + margin-right:1em; +} + +.inspector tbody td { + border: 1px solid #ccc; + width:150px; +} + +.inspector input { + margin:0; + padding:4px; + border:0; + background:#fff; + width:150px; +} + +.inspector-wrap table { + border-collapse: collapse; + width:100%; + border-spacing:0; +} + +.inspector-wrap .tag-table-wrap { + max-height:350px; + overflow:auto; +} + +.inspector-wrap table td { + padding:0; + border-spacing:0; +} + +.inspector-wrap .buttons { + margin-top: 10px; + border-top: 1px solid #ccc; +} + +/* Map Controls */ + +.map-control { + left:10px; + position:absolute; +} + +.map-control button { + text-indent: -9999px; + overflow: hidden; + background-image: url(/img/sprite.png); +} + +/* Zoomer */ + +.zoombuttons { + top:70px; + width: 40px; +} + +.zoombuttons button.zoom-in { + background-position: 10px -90px; + border-bottom:0; + border-radius:4px 4px 0 0; +} + +.zoombuttons button.zoom-out { + background-position: -30px -90px; + border-radius:0 0 4px 4px; +} + +/* Layer Switcher */ + +.layerswitcher-control { + top:210px; +} + +.layerswitcher-control button { + background-position: -110px -90px; +} + +.layerswitcher-control .content { + background:#fff; + padding:5px; + position:absolute; + left:40px; + width:100px; + top:0; +} + +.layerswitcher-control .opacity-options { + border:1px solid #000; + height:15px; + width:45px; +} + +.layerswitcher-control a.layer { + display:block; +} + +.layerswitcher-control a.opacity { + background:#000; + display:inline-block; + width:15px; + height:15px; +} + +/* Geocoder */ + +.geocode-control { + top:160px; +} + +.geocode-control button { + background-position: -70px -90px; +} + +.geocode-control input { + display:none; +} /* Map ------------------------------------------------------- */ @@ -228,155 +435,6 @@ img.tile { padding:2px 5px; } -/* ToolBar / Persistent UI Elements -------------------------------------------------------- */ - -#bar { - border-bottom:1px solid #ccc; - position:absolute; - left:0px; - top:0px; - right:0; - height:60px; -} - -/* Status box */ - -.messages { - display:none; -} - -/* Inspector */ - -.inspector-wrap { - border:1px solid #ccc; - position:absolute; - right: 0; - left: 510px; - padding:10px; - height: 60px; - opacity:0; - display:none; -} - -.inspector-wrap a.permalink { - text-decoration:none; - margin-right:1em; -} - -.inspector tbody td { - border: 1px solid #ccc; - width:150px; -} - -.inspector input { - margin:0; - padding:4px; - border:0; - background:#fff; - width:150px; -} - -.inspector-wrap table { - border-collapse: collapse; - width:347px; - border-spacing:0; -} - -.inspector-wrap .tag-table-wrap { - max-height:350px; - overflow:auto; -} - -.inspector-wrap table td { - padding:0; - border-spacing:0; -} - -.inspector-wrap .close { - border: 0; - position: absolute; - top: 0; - right: 0; - cursor: pointer; -} - -/* Map Controls */ - -#bar .zoombuttons { - position:absolute; - left:10px; - top:50px; - width:40px; -} - -#bar .zoombuttons button { - width:40px; - border:1px solid #ccc; -} - -#bar .zoombuttons button.zoom-in { - border-bottom:0; - border-radius:5px 5px 0 0; -} - -#bar .zoombuttons button.zoom-out { - border-radius:0 0 5px 5px; -} - -/* Layer Switcher */ - -div.layerswitcher-control { - position:absolute; - top:170px; - left:10px; - color:#222; -} - -div.layerswitcher-control .content { - background:#fff; - padding:5px; - position:absolute; - left:40px; - width:100px; - top:0; -} - -div.layerswitcher-control div.opacity-options { - border:1px solid #000; - height:15px; - width:45px; -} - -div.layerswitcher-control a.layer { - display:block; -} - -div.layerswitcher-control a.opacity { - background:#000; - display:inline-block; - width:15px; - height:15px; -} - -/* Geocoder */ - -div.geocode-control { - position:absolute; - top:130px; - left:10px; - color:#222; -} - -#bar div.geocode-control button, -div.layerswitcher-control button { - width:40px; -} - -div.geocode-control input { - display:none; -} - /* Account Information ------------------------------------------------------- */ @@ -476,15 +534,16 @@ div.typeahead a { .tooltip { position: absolute; z-index: 1030; - display: block; padding: 5px; font-size: 11px; opacity: 0; + display: none; filter: alpha(opacity=0); visibility: visible; } .tooltip.in { + display: block; opacity: 0.8; filter: alpha(opacity=80); } diff --git a/css/reset.css b/css/reset.css index 7f9084c6f..6e0beba61 100644 --- a/css/reset.css +++ b/css/reset.css @@ -60,6 +60,7 @@ textarea { font-family: inherit; /* 1 */ font-size: 100%; /* 2 */ margin: 0; /* 3 */ + padding: 0; } /* @@ -139,4 +140,18 @@ button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; -} \ No newline at end of file +} + +/* +** Markup free clearing +** Details: http://www.positioniseverything.net/easyclearing.html +*/ +.cf:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; + } + +.cf { display: inline-block; } \ No newline at end of file diff --git a/img/source/design.svg b/img/source/design.svg index e682c225c..c9f80174f 100644 --- a/img/source/design.svg +++ b/img/source/design.svg @@ -21,6 +21,11 @@ inkscape:export-ydpi="90"> + + y="-131.63782" /> Save + x="480.40121" + y="117.36218">Commit + style="fill:#cccccc;fill-opacity:1"> + style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> areas. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Show a menu for doing operations, positioned relativeto selected feature. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Delete + Did you know? + y="-115">Did you know? Add a point of interest to the map. + style="display:inline"> + transform="matrix(3.8187791,0,0,4.7029385,-2129.8919,348.44168)" /> Baselayers OpenStreetMap Bing Satellite + y="283">Bing Satellite + id="g7330" + transform="translate(0,-20)" /> Overlays + y="405">Overlays TIGER roads @@ -2011,7 +2449,7 @@ width="19" height="19" x="20.5" - y="330.5" + y="310.5" rx="9.5" ry="9.5" inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png" @@ -2020,7 +2458,7 @@ Standard @@ -2146,7 +2584,7 @@ Cycle Map + y="363">Cycle Map GPS Tracks + y="523">GPS Tracks + id="g8339" + transform="translate(0,-20)"> diff --git a/img/source/sprite.png b/img/source/sprite.png index efc5f6781b26019e146e171176f770c2bfd634fb..ff071a8d75a6e60970393abd290f2d7313dafe46 100644 GIT binary patch literal 7277 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 HMuGnYqW}sa literal 5310 zcmc(DhgVZiwDqMX6e&NXgY=@b2nq@q5JCi`3kV3INf8JjozQ{;(m{HWj#TMQnu!9^ zRFEFJO7Ef9_{I0V|KZ)WW}h|Z&fIlp&Y83KnkYS;N7tx1r~v@DrlAfqAlg}Cdk&@~ z;&vAzlW532RWuC2#3vB^Jd)U_a#uI?B#xi_*GN=Ev;Bxpb}uy(uP1KyUcS~Ic7U(1 zujC6?XHQ#ecRNWp4~Og>MGgSCuAl*XXz2HDJ14~J`f_V8X7`JViU(CjbO}MU7S*EX z>X?+qrAhrbIr=^S(k(72HVg2^L4)(qceEWev{C{L-o&@Ec_&cmB?0&oW z@r|0FvZ0 z3}Fik%4l`K*U12|5I(+XPsrqvUoAKGiZlHvk2iYYA%JMV!$t2F#5GT-coW5~swz|l z+WuHh3X`Cg{ z-Lw6bP9<4VC{RVQ}g4ii}(Y%^v!K zd`XCb4%$TFTW$GD>iap}Qk1VJ4cJ2#NaR(;NZH1Iob6&xwPi&2d>)BRgcw>~3`oy% zARi14zU&--)k2a_08d;Vu>~tQM+djAJn?HjyPg|&$3m^o&myfRQUWZaTxKLS7-wKe zDFSW+^UE@u!Xpy#ZS0uOej95a1S@;YDynrk9^5rckBu09@a~m|2D6W8LiaDfo%&vk zB4GwQ%k|g8`@!D2DON<_<@5iH$xNK22{#Pu`lW@7-;-hnKuJs_fY7gj?^&dm%RwPh z_nfKS9ej2Vvs61ryYQQ!(5LeNbac~}JUT|U;D@^I(?%*ffv21;u_P>i&85g9u;W;Sqm$UOJTn+PPlrUA0)>YfVB`|lRxO~&s{!d?(9Ph;hXJU|pY<$@a z(;I=`T|#;;k5_&dEx}?#L&%5NtG9A+Psz*0X{snR==;l_i=Wy-p|uMhb~9h?o@$9r zF?Q)sPpVorp4n@!Z|n91)9eif210JJ)5MPWTQ#jzN6q|au!2;M_};uRr(jthOXx>!YgPq(&!k#O$whT?a09ZgkT z^O^-|wP&{k7W9BqV-*hj`FkPUXx+H(ezu}rq4&x!_1SG?+hvX{-3d#pdxR@n6OzT@ zM<)1V>pLXMU)(?F9lW36%{<~Jt2+X*M$moU3iq|TP>RD|k-X5sE?OD7znf-$L|PC5zG;{%7H8uw zxbtz&HF+&T>M@naLd^$8QhX84P+SYV)2&*)7xrLz7gUEp}yF;2QD~l&A z`2b}PCD7m&T;^cPnA1QmlonPXaBFNk8Lq1a--zu6KH73XMxVLI$BLa8)-AQS{9ahS z1b?!6(e(j)<*Tfz150JJRI?+TVfe7=bqv|Z|H)4+HzH7MU~GlnCzOt>yyF2yc}S{3 zg0=m^zMe+@+VuRDbJL73-Y0)jxj*mwsa-7NX>pY8Xh@Oq`J4M9lzAm4pAMw_@Vi+z zUHQrNisT8i;R4BD ze_fzHK^4QhW(XfVF%E+6v zSl>VleVoJalkdft>y>cFSn0Xk`d+%{GFs|K3D~@3XRq}Cc*Cn()|ndeg3FlW}$qRpxas}iox%2M1m!N28I+D-T(84MD9~)`u(IWdwH(!O7`+M^<(RY#tF(hH??*c^HVG=jF!U z0dRmYz-Hapq5tH!06+g-<4&Ilrx*k(@lthUWTajv587!-#aDu)fyf7)9}*fH8^r-t zn{`e?%Y;M5SrCqPYf_IY>otp4ICKyNYFq&|?#_2!;3g&}R4ptla#*Dhm%Zzwr6*Dr zZHK{tt<3~4RukrRd5S;lP2kC^i889m8Jn8=s45@{0^Vrg=?1@jyTr3v2I51Nfr^YaEZf?#EwwbJb5D=ju zSeQFlRy$}d21Fn}x)-Q@Upqo^Mmkb6YU`&(MXq&6G0pJ1!q8LCO`&kuB&Yc9SYsFa z!?ua9ef3-XWLvYX2l@i|n`d778*v*WT*_a5b-l41KlNhzdFmKgPqFm}&0WpS22t&! zHZwDWGrs*`f4SF1?@;k#K$?-!+sEe}T)%E<9G(TTj>Trn zxk&<$|FC`Ev*lRJW~2}ury`@Dd*LpSVLE~Bv8>ccpKwuIFARIXuI2;dqPm-}dH+S% zSq;Ry+%N>KG!om`*@0@q^cS8s95v@FRsRg2yk;%-vVE?7Ja&6~`_beF(}w5Yv+h2g zo|#FgnCV39J}4ng$eBV-bE}~sOt412Sg9hym*s{0F(!>?0a30q&Bz3bG4H2g7fBMa zM`r6A8x^H}!(w3|B!h@g-k6?FZ^{@jSCa$hK9VU?yeaeaDhw7Ws9~XwjJY810 z-$#^yrqzJ)lVjLb7H@m#wvjp7GG93Ym8dLx*LRa4E%@pG-kW)r?Jzr@Hf zrR~IDe=#JZ3tcreH9Su(EtL?aapw(w(U_NSOF&7fsYi)AY5%c>Y_`+M=Q+#iSwh~0 z1_wbcV|r{%Swp41irW7O=7R*lxl~|(AHwKierdyBSz;RMaxv-~G);du`uv7i9O>Q% zLjF~?(bHd{Nx`y&Zqlx9#{ZAOB&pWF!8GyzC(x(YNh_QEo$9a1&|^Ujk7HkDcrDJQ z9LS|eB*W4z+5$&Fu$YEH!1Z9vH7g3V&_IaVA`eGuyWi?f;ew$%f-;xSS3l2i2Mo)ob}=fb!JuLn)Hs{3wN@=8(+((!v0pS zBSF_AZ=;2Y4rBwaq^H^FTT^%bf94(@`(`zh0Xh85Ee#C~4x|h?98MD)b=b!|~gD$WEG=nLtHzm%Pl zvZR1IEZaddpkDyFQ2+gtG~+FWuH)jkLHBwU^eg@=c8 zCUD*NAoRTzSf!z%k^7OSgz0u|8S-j1-z0f1YR4wbPg+Xx4*c=50q62yFiDUiO>RHE zD=2V-VPrK^#-VvOV7D{eGU$jI=(vWxsbP>a(r};T8-OMf-z0M3Q&350+p(OS+$wUe zjoIzfnecPd2!`Lz{3vE1jDeo5zU-jOCI~I|U#pC^#H+GAF_!h1hC8 zTgm=gSzEg|97+b7PZuobgKt|`-=@r71bA0BYcPaAE8nwwiISl3{dk3P&LRqv3C|@{EB7u2OEj>2lABUIM*GnVk6AL|C%@0Q&OZ_4eBriXh&+JjcjVl9h z?4XIrt z8=brM<6o9?;IMHKop*^(YY^H#?G_VhoJzrpxNRT*qm6N|-`!N1krk=ZWOMN5hfZ+m z`~3-?`LFL<>m-XrQ^6XmnwpxN=i0nea&vWv$^!}pc+ln%|p zFF!YgXHx-Nhbxu51>nF(@7K*Enh>pZz&PImh34&?c;;^jDHE%mRG7P-(i$+?FjvVOToflMVQgEsHe!jrW_r z3BHj~8Z=s>{TML0cK(!Pt%f})BYkJ?pwWaoF_CjlNa&hPT#4tPEegk#+BaxbL^G!n z!45g@{G?4h%x5lUuz@T4&xNK~LA}B2GI#IZWdc4JZ_0cgN!@O8f|4x(ejHe?wU|ht zEYHL$qi@*9m&n8lnace<%`|cEb@PUN-(EVP_5Y0@o141|fw%br>p*=)MMX(}eMelR z;zO1FzWR=;iV7zVv^cO14{WHTXh0ODWM*c@e2W}cCzzZc`YGm-Vx4O`eRONRyxV*K zoMF{1R)6HojNovs*^&0|i;E3EShV|8h!1Z5%CosAHMoD?_uo+(a?9i)YFc6=%c`ojA?SX+e>xD*a&>lA(1LmGFZHip%YAuV znTlxhT0fYco;GNoBQOE7fGp7_6Z<2N(#SH5h8MzgFT;$MoZE+y@4Mo4HmGzQTiE!h2fap!<{`5(=zw^4=9Fu_+NISRgnX{RQg z^0KlF{y~rXj22@bTSW&w{MFQYu2+uB+YxsMgTMqo(50zWbAe00VBbSCKNc!9;CB)% zq~o7{1gnf(qd?YD!XCk3tdi!A<>lr6d=e7K^Lo2M;egJ05u$2K9!!(SewUUe+gVbw z5>CS^*=Qbq5sFOAe5++fsc1#EGDi79CP_Z-GEX}(DstA<_nE3{S6XarERLO>y@8X1 zqxs|9j%*Keh)t-3lZ-TeJM2uZ6vQEd3ZZ%87LO!F8v!=}h&XQ*4OSB11ojq;ZtLT< zga6D>5rvCqDqfp~tIOPbkEV>4>5+*$5ePgP3u~2MW6Z^fca4CCnhva5#p>1n0}3=D Ap#T5? diff --git a/img/source/sprite.svg b/img/source/sprite.svg index c000ca96d..3a092d2d8 100644 --- a/img/source/sprite.svg +++ b/img/source/sprite.svg @@ -10,14 +10,14 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="220" - height="100" + height="160" id="svg12393" version="1.1" inkscape:version="0.48.2 r9819" sodipodi:docname="sprite.svg" - inkscape:export-filename="/Users/saman/work_repos/iD/img/source/sprite@2x.png" - inkscape:export-xdpi="180" - inkscape:export-ydpi="180"> + inkscape:export-filename="/Users/saman/work_repos/iD/img/sprite.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + transform="translate(-25,-62.362183)" + style="display:none"> + + + transform="translate(-25,1.1484375e-6)"> + + + + + + + + + + + - - - - + + transform="translate(125,-153.36218)"> @@ -263,7 +337,7 @@ + transform="translate(-896,174.63782)"> - - - - + - + d="M 134.5,4 129.5625,12.5625 126,9 l -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 -1.5,0 z" + transform="translate(346,101.36218)" + id="path4961-2" + inkscape:connector-curvature="0" /> @@ -438,7 +495,7 @@ d="m 136,2.01282 5,4.5 -5,4.5 0,-3 -3,0 L 132,9 l 0,3.01282 1,0.98718 5,0.0128 1,1.00002 0,1 -1,0.99998 -5,0 -2,-0.99998 -1,-1 -1,-2.00002 0,-3 1,-1.99998 1,-1 2,-1.00002 3,0 z" style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + transform="translate(125,-192.36218)"> - - - - + + transform="translate(-896,213.63782)"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/sprite.png b/img/sprite.png index e0cfac5104a3848e1d04256d1f6767f8e6e2ca81..53d2e0e3b5c7c7f2966bb99420df67eeff5b8c9b 100644 GIT binary patch literal 8650 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 diff --git a/js/id/id.js b/js/id/id.js index a0534863a..d75692706 100644 --- a/js/id/id.js +++ b/js/id/id.js @@ -31,12 +31,18 @@ window.iD = function(container) { var buttons = buttons_joined.selectAll('button.add-button') .data([iD.modes.Browse(), iD.modes.AddPlace(), iD.modes.AddRoad(), iD.modes.AddArea()]) .enter().append('button') - .attr('class', 'add-button') - .text(function (mode) { return mode.title; }) + .attr('class', function (mode) { return mode.title + ' add-button'; }) .attr('data-original-title', function (mode) { return mode.description; }) .call(bootstrap.tooltip().placement('bottom')) .on('click', function (mode) { controller.enter(mode); }); + buttons.append('span') + .attr('class', function(d) { + return d.id + ' icon icon-pre-text'; + }); + + buttons.append('span').attr('class', 'label').text(function (mode) { return mode.title; }); + controller.on('enter', function (entered) { buttons.classed('active', function (mode) { return entered.button === mode.button; }); }); @@ -47,7 +53,7 @@ window.iD = function(container) { undo_buttons.append('button') .attr({ id: 'undo', 'class': 'narrow' }) .property('disabled', true) - .html('←') + .html("") .on('click', history.undo) .call(bootstrap.tooltip() .placement('bottom')); @@ -55,7 +61,7 @@ window.iD = function(container) { undo_buttons.append('button') .attr({ id: 'redo', 'class': 'narrow' }) .property('disabled', true) - .html('→') + .html("") .on('click', history.redo) .call(bootstrap.tooltip() .placement('bottom')); @@ -67,7 +73,7 @@ window.iD = function(container) { bar.append('button') .attr('class', 'save wide') - .html("Upload") + .html("Save") .attr('title', 'Save changes to OpenStreetMap, making them visible to other users') .call(bootstrap.tooltip() .placement('bottom')) @@ -107,16 +113,16 @@ window.iD = function(container) { bar.append('div') .attr('class', 'messages'); - var zoom = bar.append('div') - .attr('class', 'zoombuttons') + var zoom = this.append('div') + .attr('class', 'zoombuttons map-control') .selectAll('button') .data([['zoom-in', '+', map.zoomIn], ['zoom-out', '-', map.zoomOut]]) - .enter().append('button').attr('class', function(d) { return d[0] + ' wide'; }) + .enter().append('button').attr('class', function(d) { return d[0] + ' narrow'; }) .text(function(d) { return d[1]; }) .on('click', function(d) { return d[2](); }); - var gc = bar.append('div').attr('class', 'geocode-control'); - gc.append('button').text('?').attr('class','wide'); + var gc = this.append('div').attr('class', 'geocode-control map-control'); + gc.append('button').text('geocode').attr('class','narrow'); gc .on('mouseover', function() { d3.select('.geocode-control input').style('display', 'inline-block'); @@ -138,7 +144,7 @@ window.iD = function(container) { }); }); - this.append('div').attr('class', 'layerswitcher-control') + this.append('div').attr('class', 'map-control layerswitcher-control') .call(iD.layerswitcher(map)); this.append('div') diff --git a/js/id/modes/add_area.js b/js/id/modes/add_area.js index 06857ba32..cf5360112 100644 --- a/js/id/modes/add_area.js +++ b/js/id/modes/add_area.js @@ -2,7 +2,7 @@ iD.modes.AddArea = function() { var mode = { id: 'add-area', button: 'area', - title: '+ Area', + title: 'Area', description: 'Add parks, buildings, lakes, or other areas to the map.' }; diff --git a/js/id/modes/add_place.js b/js/id/modes/add_place.js index 780023e76..576c5fc6f 100644 --- a/js/id/modes/add_place.js +++ b/js/id/modes/add_place.js @@ -1,7 +1,7 @@ iD.modes.AddPlace = function() { var mode = { id: 'add-place', - title: '+ Place', + title: 'Place', description: 'Restaurants, monuments, and postal boxes are points.' }; diff --git a/js/id/modes/add_road.js b/js/id/modes/add_road.js index efb3db113..e1d4b6c59 100644 --- a/js/id/modes/add_road.js +++ b/js/id/modes/add_road.js @@ -2,7 +2,7 @@ iD.modes.AddRoad = function() { var mode = { id: 'add-road', button: 'road', - title: '+ Road', + title: 'Road', description: 'Roads can be highways, streets, pedestrian paths, or even canals' }; diff --git a/js/id/renderer/map.js b/js/id/renderer/map.js index 4e678aefa..11fff6390 100644 --- a/js/id/renderer/map.js +++ b/js/id/renderer/map.js @@ -458,10 +458,14 @@ iD.Map = function() { .style('display', 'none'); } else { d3.select('div.inspector-wrap') + .html('') .style('display', 'block') .transition() - .style('opacity', 1) - .text(_); + .style('opacity', 1); + d3.select('div.inspector-wrap') + .append('div') + .attr('class','inspector-inner') + .text(_) } }; diff --git a/js/id/ui/inspector.js b/js/id/ui/inspector.js index 60a84819a..ab3e08433 100644 --- a/js/id/ui/inspector.js +++ b/js/id/ui/inspector.js @@ -42,16 +42,17 @@ iD.Inspector = function() { function inspector(selection) { selection.each(function(entity) { selection.html("").append('button') - .text('x').attr({ title: 'close', 'class': 'close' }) + .attr('class', 'narrow close') + .html("") .on('click', function() { event.close(entity); }); selection.append('div') - .attr('class', 'head').call(drawhead); + .attr('class', 'head inspector-inner').call(drawhead); var table = selection - .append('div').attr('class', 'tag-table-wrap') + .append('div').attr('class', 'inspector-inner tag-table-wrap') .append('table').attr('class', 'inspector'); table.append('thead').append('tr').selectAll('th') @@ -128,16 +129,15 @@ iD.Inspector = function() { function drawbuttons(selection) { selection.append('button') - .attr('class', 'save').text('Save') + .attr('class', 'save wide') + .html("Apply") .on('click', function(entity) { event.changeTags(entity, clean(grabtags())); event.close(entity); }); selection.append('button') - .attr('class', 'cancel').text('Cancel') - .on('click', function(entity) { event.close(entity); }); - selection.append('button') - .attr('class', 'delete').text('Delete') + .attr('class', 'delete wide') + .html("Delete") .on('click', function(entity) { event.remove(entity); }); } }); diff --git a/js/id/ui/layerswitcher.js b/js/id/ui/layerswitcher.js index f91d80e36..942538987 100644 --- a/js/id/ui/layerswitcher.js +++ b/js/id/ui/layerswitcher.js @@ -15,7 +15,7 @@ iD.layerswitcher = function(map) { function layerswitcher(selection) { selection .append('button') - .attr('class', 'wide') + .attr('class', 'narrow') .text('L') .on('click', function() { content.classed('hide', function() {