CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-04-01 09:40:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1490 from systemed/design-cleanup

Browse Source 
Design cleanup
This commit is contained in:
Saman Bemel-Benrud
2013-05-15 20:43:51 -07:00
parent 4de0eada5f c27da981e0
commit 8a83aca9f8
8 changed files with 218 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

199
css/app.css
View File

@@ -160,9 +160,11 @@ input[type=email] {
height:30px;
width: 100%;
border-radius:4px;
text-overflow: ellipsis;
overflow: hidden;
-webkit-transition: all 100ms;
-moz-transition: all 100ms;
-o-transition: all 100ms;
-o-transition: all 100ms;
transition: all 100ms;
}
@@ -411,7 +413,7 @@ button.minor {
top: 0;
right: 0;
height: 100%;
width: 20px;
width: 10%;
opacity: .5;
border-radius: 0;
}
@@ -521,8 +523,6 @@ button.save.has-count .count::before {
.icon.delete { background-position: -180px 0;}
.icon.remove { background-position: -200px 0;}
.icon.inspect { background-position: -220px 0;}
.icon.zoom-in { background-position: -240px 0;}
.icon.zoom-out { background-position: -260px 0;}
.icon.plus { background-position: -240px 0;}
.icon.search { background-position: -280px 0;}
.icon.geocode { background-position: -280px 0;}
@@ -531,10 +531,15 @@ button.save.has-count .count::before {
.icon.nearby { background-position: -340px 0;}
.icon.geolocate { background-position: -360px 0;}
.icon.warning { background-position: -380px 0;}
.icon.bug { background-position: -400px 0;}
.icon.back { background-position: -420px 0;}
.icon.forward { background-position: -440px 0;}
.icon.help { background-position: -460px 0;}
.icon.translate { background-position: -520px 0;}
.icon.plus.light,
.icon.zoom-in { background-position: -240px -20px;}
.icon.zoom-out { background-position: -260px -20px;}
.icon.inspect.light { background-position: -220px -20px;}
.icon.geocode.light { background-position: -280px -20px;}
.icon.help.light { background-position: -460px -20px;}
@@ -603,6 +608,7 @@ a:hover .icon.out-link { background-position: -500px -14px;}
}
.header h3 {
text-align: center;
margin-right: 40px;
margin-bottom: 0;
white-space: nowrap;
@@ -614,7 +620,6 @@ a:hover .icon.out-link { background-position: -500px -14px;}
.header button {
height: 100%;
border-radius: 0;
border-left: 1px solid #CCC;
width: 40px;
text-align: center;
overflow: hidden;
@@ -658,7 +663,6 @@ a:hover .icon.out-link { background-position: -500px -14px;}
}
.inspector-wrap .header button.preset-reset {
border-right: 1px solid #CCC;
position: relative;
}
@@ -929,7 +933,7 @@ a:hover .icon.out-link { background-position: -500px -14px;}
.form-label .modified-icon {
border-right: 0;
opacity: 0;
right: 20px;
right: 10%;
}
.modified .form-label .modified-icon {
@@ -952,12 +956,6 @@ a:hover .icon.out-link { background-position: -500px -14px;}
height: 65px;
}
.form-field-name input.localized-main {
height: 35px;
font-size: 18px;
font-weight: bold;
}
/* adding additional preset fields */
.more-buttons {
@@ -1005,11 +1003,11 @@ button.preset-add-field:nth-last-child(8) ~ button.preset-add-field {
width: 12.5%;
}
.preset-add-field .tooltip.top .tooltip-arrow {
.tag-wrap .tooltip.top .tooltip-arrow {
border-top-color: #000;
}
.preset-add-field .tooltip-inner {
.tag-wrap .tooltip-inner {
background: #000;
color: #ccc;
}
@@ -1048,15 +1046,15 @@ button.preset-add-field:nth-last-child(8) ~ button.preset-add-field {
input[type=number] {
position: relative;
padding-right: 65px;
padding-right: 20%;
}
.spin-control {
width: 41px;
width: 20%;
height: 29px;
border-left: 1px solid #CCC;
display: inline-block;
margin-left: -41px;
margin-left: -20%;
margin-bottom: -11px;
position: relative;
}
@@ -1182,75 +1180,23 @@ input[type=number] {
content: none;
}
.form-field .localized-main {
width: 90%;
border-radius: 0 0 0 4px;
}
.form-field .localized-add {
width: 10%;
height: 35px;
border-radius: 0 0 4px 0;
border-bottom: 1px solid #ccc;
border-right: 1px solid #ccc;
vertical-align: top;
}
.form-field .localized-wrap .entry .localized-lang {
border-top: none;
border-right: none;
border-radius: 0;
width: 30%;
}
.form-field .localized-wrap .entry .localized-value {
border-top: none;
border-radius: 0;
width: 60%;
}
.form-field .localized-wrap .entry .localized-remove {
height: 30px;
border-radius: 0;
border-bottom: 1px solid #ccc;
border-right: 1px solid #ccc;
vertical-align: top;
width: 10%;
}
.form-field .localized-wrap .entry:last-child .localized-lang {
border-radius: 0 0 0 4px;
}
.form-field .localized-wrap .entry:last-child .localized-remove {
border-radius: 0 0 4px 0;
}
.form-field .wiki-lang {
width: 30%;
border-right: none;
border-radius: 0 0 0 4px;
border-radius: 0;
}
.form-field .wiki-title {
width: 60%;
border-right: none;
border-radius: 0;
padding-right: 10%;
}
.form-field .wiki-title ~ .combobox-carat {
margin-left: -20%;
margin-right: 10%;
}
.form-field .wiki-link {
border-radius: 0 0 4px 0;
border: 1px solid #ccc;
border-top: none;
height: 30px;
width: 10%;
float: right;
padding: 5px;
text-align: center;
-webkit-transition: all 100ms;
-moz-transition: all 100ms;
-o-transition: all 100ms;
transition: all 100ms;
}
.form-field .wiki-link:hover {
@@ -1276,14 +1222,72 @@ input[type=number] {
font-weight: bold;
}
/* Name + translate form */
.form-field-name input.localized-main {
font-weight: bold;
}
.form-field .localized-main {
padding-right: 10%;
}
.form-field .button-input-action {
position: relative;
right: 1px;
width: 10%;
margin-left: -10%;
border: 1px solid #CCC;
border-top-width: 0;
border-right-width: 0;
border-radius: 0 0 4px 0;
height: 30px;
vertical-align: top;
}
.form-field .localized-wrap .entry {
padding: 0;
padding-top: 10px;
position: relative;
}
.form-field .localized-wrap .entry::before {
content: "";
display: block;
position: absolute;
background:#ccc;
height: 10px;
width: 1px;
left: 0;
right: 0;
top: 0;
margin: auto;
}
.form-field .localized-wrap .entry .localized-lang {
border-radius: 0;
border-top-width: 0;
}
.form-field .localized-wrap .entry .localized-value {
padding-right: 10%;
border-top-width: 0;
border-radius: 0 0 4px 4px;
}
.form-field .localized-wrap .entry .localized-remove {
border-radius: 0 0 4px 0;
}
/* Preset form address */
.form-field .addr-housename {
border: 0;
border-radius: 0;
}
.form-field .addr-number {
width: 33%;
width: 33.3333%;
border-left: 0;
border-right: 0;
border-bottom: 0;
@@ -1291,14 +1295,14 @@ input[type=number] {
}
.form-field .addr-street {
width: 66%;
width: 66.6666%;
border-right: 0;
border-bottom: 0;
border-radius: 0;
}
.form-field .addr-city {
width: 66%;
width: 66.6666%;
border-left: 0;
border-right: 0;
border-bottom: 0;
@@ -1306,7 +1310,7 @@ input[type=number] {
}
.form-field .addr-postcode {
width: 33%;
width: 33.3333%;
border-right: 0;
border-bottom: 0;
border-radius: 0 0 4px 0;
@@ -1359,10 +1363,6 @@ div.combobox {
border-top: 1px solid #ccc;
}
.tag-list {
margin-right: 40px;
}
.tag-row {
width: 100%;
position: relative;
@@ -1376,6 +1376,12 @@ div.combobox {
border-left: 1px solid #CCC;
}
.tag-row .key-wrap,
.tag-row .input-wrap-position {
width: 40%;
float: left;
}
.tag-row input.key {
background-color: #f6f6f6;
}
@@ -1396,7 +1402,7 @@ div.combobox {
.tag-row button {
position: absolute;
height: 30px;
right: -20px;
right: 10%;
border: 1px solid #CCC;
border-top-width: 0; border-left-width: 0;
border-radius: 0;
@@ -1425,7 +1431,7 @@ div.combobox {
}
.tag-row button.tag-help-button {
right: -40px;
right: 0;
}
/* Adding form fields to tag editor */
@@ -1478,8 +1484,6 @@ div.combobox {
.additional-tags div.tag-help {
float: left;
width: 100%;
width: -webkit-calc(100% + 40px);
width: calc(100% + 40px);
}
img.wiki-image {
@@ -1855,7 +1859,6 @@ img.wiki-image {
position: absolute;
right:0px;
bottom:0px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
border-radius: 0;
@@ -2148,7 +2151,8 @@ img.wiki-image {
------------------------------------------------------- */
.tooltip {
width: 200px;
max-width: 200px;
min-width: 120px;
position: absolute;
display: none;
color:#333;
@@ -2182,7 +2186,6 @@ img.wiki-image {
}
.tooltip-inner {
display: inline-block;
padding: 10px;
font-weight: normal;
background-color: white;
@@ -2287,11 +2290,15 @@ img.wiki-image {
}
.tooltip .keyhint-wrap {
padding: 5px 0 5px 0;
background: #f6f6f6;
padding: 10px;
left: 0;
right: 0;
bottom: -42px;
position: absolute;
}
.tooltip-inner .keyhint {
color: #222;
font-size: 10px;
padding: 0 7px;
font-weight: bold;
@@ -2304,10 +2311,6 @@ img.wiki-image {
clear: both;
}
.tooltip .keyhint .keyhint-label {
display: inline-block;
}
.tooltip-inner .keyhint::after {
content: "";
position: absolute;

6
data/core.yaml
View File

@@ -122,9 +122,15 @@ en:
multiple_ways: There are too many lines here to split.
nothing_to_undo: Nothing to undo.
nothing_to_redo: Nothing to redo.
tooltip_keyhint: "Shortcut:"
just_edited: "You just edited OpenStreetMap!"
browser_notice: "This editor is supported in Firefox, Chrome, Safari, Opera, and Internet Explorer 9 and above. Please upgrade your browser or use Potlatch 2 to edit the map."
view_on_osm: "View on OSM"
translate:
translate: Translate
localized_translation_label: Translation
localized_translation_language: Choose language
localized_translation_name: Name
zoom_in_edit: zoom in to edit the map
logout: logout
loading_auth: "Connecting to OpenStreetMap..."

75
dist/img/sprite.svg vendored
View File

@@ -38,6 +38,23 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
<<<<<<< HEAD
inkscape:zoom="2.8284271"
inkscape:cx="388.17355"
inkscape:cy="526.44457"
=======
<<<<<<< HEAD
inkscape:zoom="9.3884297"
inkscape:cx="235.04931"
inkscape:cy="525.74069"
>>>>>>> master
inkscape:document-units="px"
inkscape:current-layer="layer12"
showgrid="false"
inkscape:window-width="1280"
inkscape:window-height="756"
inkscape:window-x="35"
=======
inkscape:zoom="16"
inkscape:cx="471.57386"
inkscape:cy="545.41375"
@@ -47,6 +64,7 @@
inkscape:window-width="1280"
inkscape:window-height="756"
inkscape:window-x="56"
>>>>>>> 4de0eada5fb19a83c198473774bbda001c6166f6
inkscape:window-y="0"
inkscape:window-maximized="0"
fit-margin-top="0"
@@ -377,6 +395,16 @@
id="path3769"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccccc" />
<<<<<<< HEAD
<path
style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 89,2 -5,4.5 5,4.5 0,-3 3,0 1,1 0,3 -1,1 -5,0 -1,1 0,1 1,1 5,0 2,-1 1,-1 1,-2 L 96,9 95,7 94,6 92,5 89,5 z m 22,0 0,3 -3,0 -2,1 -1,1 -1,2 0,3 1,2 1,1 2,1 5,0 1,-1 0,-1 -1,-1 -5,0 -1,-1 0,-3 1,-1 3,0 0,3 5,-4.5 z M 54,3 53,4 53,5.59375 46.59375,12 45,12 l -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 L 54.40625,7 56,7 57,6 57,4 56,3 z m 96,0 -6,6 1,1 3,0 0,6 1,1 2,0 1,-1 0,-6 3,0 1,-1 z M 32,4 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 23,0 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 C 54.74848,6 54.51948,5.9033 54.34375,5.75 54.30935,5.71998 54.28,5.69066 54.25,5.65625 54.09665,5.480519 54,5.251521 54,5 54,4.44772 54.44772,4 55,4 z m 10,0 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 z m 69.5,0 -4.9375,8.5625 L 126,9 l -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 z m 30.5,0 -1,1 0,1 4,4 -4,4 0,1 1,1 1,0 4,-4 4,4 1,0 1,-1 0,-1 -4,-4 4,-4 0,-1 -1,-1 -1,0 -4,4 -4,-4 z m 21,0 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 z M 66,5 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 C 73.44772,7 73,6.552285 73,6 73,5.447715 73.44772,5 74,5 z M 32.15625,7 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 z M 68,7 l 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 z m 118,1 0,7 1,1 6,0 1,-1 0,-7 z m 2,2 1,0 0,4 -1,0 0,-1 z m 3,0 1,0 0,3 0,1 -1,0 z M 46,13 c 0.25152,0 0.48052,0.0967 0.65625,0.25 L 46.75,13.34375 C 46.90335,13.519481 47,13.748484 47,14 c 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 20,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
transform="translate(25,-3.0624999e-6)"
id="path2997"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsscsssssccssccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsssssssssssssssccccccccccccccccccccccccccccsccssssssssssssss" />
=======
>>>>>>> 4de0eada5fb19a83c198473774bbda001c6166f6
<g
style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
transform="translate(-511.00001,-44)"
@@ -401,7 +429,7 @@
id="g9588-4"
style="fill:#ffffff;fill-opacity:1;display:inline">
<path
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 174,3 -1,1 0,4 -4,0 -1,1 0,1 1,1 4,0 0,4 1,1 1,0 1,-1 0,-4 4,0 1,-1 0,-1 -1,-1 -4,0 0,-4 -1,-1 -1,0 z"
transform="translate(756,-73.637817)"
id="path9584-2"
@@ -2115,9 +2143,10 @@
style="color:#000000;fill:#597be7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
id="path4657"
d="m 114,21.999997 -5,4.5 5,4.5 0,-3 3,0 1,1 0,3 -1,1 -5,0 -1,1 0,1 1,1 5,0 2,-1 1,-1 1,-2 0,-3 -1,-2 -1,-1 -2,-1 -3,0 0,-3 z m 22,0 0,3 -3,0 -2,1 -1,1 -1,2 0,3 1,2 1,1 2,1 5,0 1,-1 0,-1 -1,-1 -5,0 -1,-1 0,-3 1,-1 3,0 0,3 5,-4.5 -5,-4.5 z m -100.15625,1 c -0.28125,0.04687 -0.84375,0.25 -0.84375,1 l 0,4 c 0,0 0,0.5 -0.5,0.5 -0.5,0 -0.429283,-0.27516 -0.5,-0.5 -0.304688,-0.96875 -0.867187,-2.36459 -1,-3 -0.204595,-0.97885 -0.666667,-1 -1,-1 -1,0 -1,1 -1,1 l 1,4 0,3 -1.5,-1.5 c -0.554688,-0.55469 -1.242341,-0.75701 -1.6875,-0.5 -0.435451,0.25141 -0.661558,0.89541 -0.3125,1.5 0.353553,0.61237 3.5,4.5 3.5,4.5 1,1 2,1 4,1 l 3,0 c 2,0 2.288488,-2.86546 3,-5 1,-3 1.5,-5 1.5,-5 0.113427,-0.42332 -0.04289,-0.846 -0.5,-1 -0.880461,-0.29662 -1.36006,0.35278 -1.5,1 -0.25,1.15625 -0.5,2 -0.5,2 -0.09375,0.31383 0.0013,0.5 -0.5,0.5 -0.50914,0 -0.5,-0.5 -0.5,-0.5 l 0,-4 c 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 l 0,3 c 0,0 0.01305,0.5 -0.5,0.5 -0.501327,0 -0.5,-0.5 -0.5,-0.5 l 0,-4 c 0,-1 -1,-1 -1,-1 0,0 -0.0625,-0.01563 -0.15625,0 z m 43.15625,0 -1,1 0,1.59375 -6.40625,6.40625 -1.59375,0 -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 6.40625,-6.40625 1.59375,0 1,-1 0,-2 -1,-1 -2,0 z m 96,0 -6,6 1,1 3,0 0,6 1,1 2,0 1,-1 0,-6 3,0 1,-1 -6,-6 z m -118,1 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 23,0 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 C 79.30935,25.719977 79.28,25.690657 79.25,25.656247 79.09665,25.480516 79,25.251518 79,24.999997 c 0,-0.55228 0.44772,-1 1,-1 z m 10,0 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 -2,0 z m 69.5,0 -4.9375,8.5625 -3.5625,-3.5625 -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 -1.5,0 z m 30.5,0 -1,1 0,1 4,4 -4,4 0,1 1,1 1,0 4,-4 4,4 1,0 1,-1 0,-1 -4,-4 4,-4 0,-1 -1,-1 -1,0 -4,4 -4,-4 -1,0 z m 21,0 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 -8,0 z m 40.125,0 -1.125,1 0,10 1.125,1 3.375,-2.875 3.375,2.875 1.125,-1 0,-10 -1.125,-1 -6.75,0 z m -160.125,1 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 132,0 -1,1 0,1 3,3 -3,3 0,1 1,1 1,0 3,-3 3,3 1,0 1,-1 0,-1 -3,-3 3,-3 0,-1 -1,-1 -1,0 -3,3 -3,-3 -1,0 z m -173.84375,2 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 z m 35.84375,0 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 1,-1 z m 118,1 0,7 1,1 6,0 1,-1 0,-7 -8,0 z m 2,2 1,0 0,4 -1,0 0,-1 0,-3 z m 3,0 1,0 0,3 0,1 -1,0 0,-4 z m -145,3 c 0.25152,0 0.48052,0.0967 0.65625,0.25 l 0.09375,0.09375 c 0.15335,0.175731 0.25,0.404734 0.25,0.65625 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 20,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
d="m 114,21.999997 -5,4.5 5,4.5 0,-3 3,0 1,1 0,3 -1,1 -5,0 -1,1 0,1 1,1 5,0 2,-1 1,-1 1,-2 0,-3 -1,-2 -1,-1 -2,-1 -3,0 z m 22,0 0,3 -3,0 -2,1 -1,1 -1,2 0,3 1,2 1,1 2,1 5,0 1,-1 0,-1 -1,-1 -5,0 -1,-1 0,-3 1,-1 3,0 0,3 5,-4.5 z m -57,1 -1,1 0,1.59375 -6.40625,6.40625 -1.59375,0 -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 6.40625,-6.40625 1.59375,0 1,-1 0,-2 -1,-1 z m 96,0 -6,6 1,1 3,0 0,6 1,1 2,0 1,-1 0,-6 3,0 1,-1 z m -118,1 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 23,0 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 C 79.30935,25.719977 79.28,25.690657 79.25,25.656247 79.09665,25.480516 79,25.251518 79,24.999997 c 0,-0.55228 0.44772,-1 1,-1 z m 10,0 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 z m 69.5,0 -4.9375,8.5625 -3.5625,-3.5625 -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 z m 30.5,0 -1,1 0,1 4,4 -4,4 0,1 1,1 1,0 4,-4 4,4 1,0 1,-1 0,-1 -4,-4 4,-4 0,-1 -1,-1 -1,0 -4,4 -4,-4 z m 21,0 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 z m -120,1 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 132,0 -1,1 0,1 3,3 -3,3 0,1 1,1 1,0 3,-3 3,3 1,0 1,-1 0,-1 -3,-3 3,-3 0,-1 -1,-1 -1,0 -3,3 -3,-3 z m -173.84375,2 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 z m 35.84375,0 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 z m 118,1 0,7 1,1 6,0 1,-1 0,-7 z m 2,2 1,0 0,4 -1,0 0,-1 z m 3,0 1,0 0,3 0,1 -1,0 z m -145,3 c 0.25152,0 0.48052,0.0967 0.65625,0.25 l 0.09375,0.09375 c 0.15335,0.175731 0.25,0.404734 0.25,0.65625 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 20,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
inkscape:connector-curvature="0" />
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsscsssssccssccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsssssssssscccccccccccccccccccccsssssccccccccccccccccccccccccccccsccssssssssssssss" />
<g
style="fill:#ffffff;fill-opacity:1;display:inline"
id="g4659"
@@ -2196,15 +2225,15 @@
id="path4863-8" />
<path
inkscape:connector-curvature="0"
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"
style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.50000000000000000"
d="m 231,4.9999969 -1,1 0,1 3,3 -3,3.0000001 0,1 1,1 1,0 3,-3 3,3 1,0 1,-1 0,-1 -3,-3.0000001 3,-3 0,-1 -1,-1 -1,0 -3,3 -3,-3 -1,0 z"
id="path3848" />
<path
style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 114,41.999997 -5,4.5 5,4.5 0,-3 3,0 1,1 0,3 -1,1 -5,0 -1,1 0,1 1,1 5,0 2,-1 1,-1 1,-2 0,-3 -1,-2 -1,-1 -2,-1 -3,0 z m 22,0 0,3 -3,0 -2,1 -1,1 -1,2 0,3 1,2 1,1 2,1 5,0 1,-1 0,-1 -1,-1 -5,0 -1,-1 0,-3 1,-1 3,0 0,3 5,-4.5 z m -100.15625,1 c -0.28125,0.04687 -0.84375,0.25 -0.84375,1 l 0,4 c 0,0 0,0.5 -0.5,0.5 -0.5,0 -0.429283,-0.27516 -0.5,-0.5 -0.304688,-0.96875 -0.867187,-2.36459 -1,-3 -0.204595,-0.97885 -0.666667,-1 -1,-1 -1,0 -1,1 -1,1 l 1,4 0,3 -1.5,-1.5 c -0.554688,-0.55469 -1.242341,-0.75701 -1.6875,-0.5 -0.435451,0.25141 -0.661558,0.89541 -0.3125,1.5 0.353553,0.61237 3.5,4.5 3.5,4.5 1,1 2,1 4,1 l 3,0 c 2,0 2.288488,-2.86546 3,-5 1,-3 1.5,-5 1.5,-5 0.113427,-0.42332 -0.04289,-0.846 -0.5,-1 -0.880461,-0.29662 -1.36006,0.35278 -1.5,1 -0.25,1.15625 -0.5,2 -0.5,2 -0.09375,0.31383 0.0013,0.5 -0.5,0.5 -0.50914,0 -0.5,-0.5 -0.5,-0.5 l 0,-4 c 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 l 0,3 c 0,0 0.01305,0.5 -0.5,0.5 -0.501327,0 -0.5,-0.5 -0.5,-0.5 l 0,-4 c 0,-1 -1,-1 -1,-1 0,0 -0.0625,-0.01563 -0.15625,0 z m 43.15625,0 -1,1 0,1.59375 -6.40625,6.40625 -1.59375,0 -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 6.40625,-6.40625 1.59375,0 1,-1 0,-2 -1,-1 z m 96,0 -6,6 1,1 3,0 0,6 1,1 2,0 1,-1 0,-6 3,0 1,-1 z m -118,1 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 23,0 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 C 79.30935,45.719977 79.28,45.690657 79.25,45.656247 79.09665,45.480516 79,45.251518 79,44.999997 c 0,-0.55228 0.44772,-1 1,-1 z m 10,0 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 z m 69.5,0 -4.9375,8.5625 -3.5625,-3.5625 -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 z m 30.5,0 -1,1 0,1 4,4 -4,4 0,1 1,1 1,0 4,-4 4,4 1,0 1,-1 0,-1 -4,-4 4,-4 0,-1 -1,-1 -1,0 -4,4 -4,-4 z m 21,0 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 z m 40.125,0 -1.125,1 0,10 1.125,1 3.375,-2.875 3.375,2.875 1.125,-1 0,-10 -1.125,-1 z m -160.125,1 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m -41.84375,2 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 z m 35.84375,0 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 z m 118,1 0,7 1,1 6,0 1,-1 0,-7 z m 2,2 1,0 0,4 -1,0 0,-1 z m 3,0 1,0 0,3 0,1 -1,0 z m -145,3 c 0.25152,0 0.48052,0.0967 0.65625,0.25 l 0.09375,0.09375 c 0.15335,0.175731 0.25,0.404734 0.25,0.65625 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 20,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
d="m 114,41.999997 -5,4.5 5,4.5 0,-3 3,0 1,1 0,3 -1,1 -5,0 -1,1 0,1 1,1 5,0 2,-1 1,-1 1,-2 0,-3 -1,-2 -1,-1 -2,-1 -3,0 z m 22,0 0,3 -3,0 -2,1 -1,1 -1,2 0,3 1,2 1,1 2,1 5,0 1,-1 0,-1 -1,-1 -5,0 -1,-1 0,-3 1,-1 3,0 0,3 5,-4.5 z m -57,1 -1,1 0,1.59375 -6.40625,6.40625 -1.59375,0 -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 6.40625,-6.40625 1.59375,0 1,-1 0,-2 -1,-1 z m 96,0 -6,6 1,1 3,0 0,6 1,1 2,0 1,-1 0,-6 3,0 1,-1 z m -118,1 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 23,0 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 C 79.30935,45.719977 79.28,45.690657 79.25,45.656247 79.09665,45.480516 79,45.251518 79,44.999997 c 0,-0.55228 0.44772,-1 1,-1 z m 10,0 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 z m 69.5,0 -4.9375,8.5625 -3.5625,-3.5625 -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 z m 30.5,0 -1,1 0,1 4,4 -4,4 0,1 1,1 1,0 4,-4 4,4 1,0 1,-1 0,-1 -4,-4 4,-4 0,-1 -1,-1 -1,0 -4,4 -4,-4 z m 21,0 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 z m -120,1 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m -41.84375,2 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 z m 35.84375,0 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 z m 118,1 0,7 1,1 6,0 1,-1 0,-7 z m 2,2 1,0 0,4 -1,0 0,-1 z m 3,0 1,0 0,3 0,1 -1,0 z m -145,3 c 0.25152,0 0.48052,0.0967 0.65625,0.25 l 0.09375,0.09375 c 0.15335,0.175731 0.25,0.404734 0.25,0.65625 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 20,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
id="path2997-6"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccsscsssscccssscssscsscscscscscscscccccccccccccccccccccccccccccsscsssssccssccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsssssssssssssssccccccccccccccccccccccccccccsccssssssssssssss" />
sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsscsssssccssccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsssssssssssssssccccccccccccccccccccccccccccsccssssssssssssss" />
<path
inkscape:connector-curvature="0"
style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
@@ -2272,13 +2301,45 @@
style="font-size:17.49651146px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:120.00000477%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#e4a4be;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Avenir;-inkscape-font-specification:Avenir"
id="text3863" />
<path
<<<<<<< HEAD
inkscape:connector-curvature="0"
style="font-size:16.71258354px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#222222;fill-rule:nonzero;enable-background:accumulate;font-family:Helvetica Neue"
id="path10613"
d="m 253.78571,5.0714269 -1,1 v 1 l 1,1 h 1 l 1,-1 v -1 l -1,-1 h -1 z m 0,4 -1,1.0000001 v 5 l 1,1 h 1 l 1,-1 v -5 l -1,-1.0000001 h -1 z" />
<path
inkscape:connector-curvature="0"
id="path10620"
style="font-size:16.71258354px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#000000;fill-rule:nonzero;enable-background:accumulate;font-family:Helvetica Neue"
d="m 253.78571,45.071427 -1,1 0,1 1,1 1,0 1,-1 0,-1 -1,-1 -1,0 z m 0,4 -1,1 0,5 1,1 1,0 1,-1 0,-5 -1,-1 -1,0 z" />
<path
d="m 253.78571,25.071427 -1,1 0,1 1,1 1,0 1,-1 0,-1 -1,-1 -1,0 z m 0,4 -1,1 0,5 1,1 1,0 1,-1 0,-5 -1,-1 -1,0 z"
style="font-size:16.71258354000000068px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:1;color:#000000;fill:#ffffff;fill-rule:nonzero;enable-background:accumulate;font-family:Helvetica Neue"
id="path5293"
inkscape:connector-curvature="0" />
<<<<<<< HEAD
<path
inkscape:connector-curvature="0"
style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 431,2.9999969 0,1 2,2.40625 0,1.59375 4,0 0,-1.59375 2,-2.40625 0,-1 -1,0 -2,2 -2,0 -2,-2 -1,0 z m 1,6 -1,1 -3,0 -1,1.0000001 1,1 3,0 0,1 -2,1 -1,1 0,1 1,0 2,-1 2,2 4,0 2,-2 2,1 1,0 0,-1 -1,-1 -2,-1 0,-1 3,0 1,-1 -1,-1.0000001 -3,0 -1,-1 -6,0 z"
=======
=======
style="color:#000000;fill:#1c1c1c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="M 406 3 L 406 4 L 408 6.40625 L 408 8 L 412 8 L 412 6.40625 L 414 4 L 414 3 L 413 3 L 411 5 L 409 5 L 407 3 L 406 3 z M 407 9 L 406 10 L 403 10 L 402 11 L 403 12 L 406 12 L 406 13 L 404 14 L 403 15 L 403 16 L 404 16 L 406 15 L 408 17 L 412 17 L 414 15 L 416 16 L 417 16 L 417 15 L 416 14 L 414 13 L 414 12 L 417 12 L 418 11 L 417 10 L 414 10 L 413 9 L 407 9 z "
transform="translate(25,-3.0624999e-6)"
>>>>>>> master
id="rect14284" />
<path
id="path14358"
d="m 431,22.999997 0,1 2,2.40625 0,1.59375 4,0 0,-1.59375 2,-2.40625 0,-1 -1,0 -2,2 -2,0 -2,-2 -1,0 z m 1,6 -1,1 -3,0 -1,1 1,1 3,0 0,1 -2,1 -1,1 0,1 1,0 2,-1 2,2 4,0 2,-2 2,1 1,0 0,-1 -1,-1 -2,-1 0,-1 3,0 1,-1 -1,-1 -3,0 -1,-1 -6,0 z"
<<<<<<< HEAD
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 431,42.999997 0,1 2,2.40625 0,1.59375 4,0 0,-1.59375 2,-2.40625 0,-1 -1,0 -2,2 -2,0 -2,-2 -1,0 z m 1,6 -1,1 -3,0 -1,1 1,1 3,0 0,1 -2,1 -1,1 0,1 1,0 2,-1 2,2 4,0 2,-2 2,1 1,0 0,-1 -1,-1 -2,-1 0,-1 3,0 1,-1 -1,-1 -3,0 -1,-1 -6,0 z"
id="path14360" />
=======
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
inkscape:connector-curvature="0" />
<path
@@ -2304,5 +2365,7 @@
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"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccccccccc" />
>>>>>>> 4de0eada5fb19a83c198473774bbda001c6166f6
>>>>>>> master
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 165 KiB

After

Width:  |  Height:  |  Size: 170 KiB

8
dist/locales/en.json vendored
View File

@@ -156,9 +156,17 @@
},
"nothing_to_undo": "Nothing to undo.",
"nothing_to_redo": "Nothing to redo.",
"tooltip_keyhint": "Shortcut: ",
"just_edited": "You just edited OpenStreetMap!",
"browser_notice": "This editor is supported in Firefox, Chrome, Safari, Opera, and Internet Explorer 9 and above. Please upgrade your browser or use Potlatch 2 to edit the map.",
"view_on_osm": "View on OSM",
"translate": {
"translate": "Translate",
"localized_translation_label": "Translation",
"localized_translation_language": "Choose language",
"localized_translation_name": "Name"
},
"localized_translation_label": "Translation",
"zoom_in_edit": "zoom in to edit the map",
"logout": "logout",
"loading_auth": "Connecting to OpenStreetMap...",

15
js/id/ui.js
View File

@@ -102,12 +102,19 @@ iD.ui = function(context) {
.attr('href', 'http://github.com/systemed/iD')
.text(iD.version);
linkList.append('li')
var bugReport = linkList.append('li')
.append('a')
.attr('target', '_blank')
.attr('tabindex', -1)
.attr('href', 'https://github.com/systemed/iD/issues')
.text(t('report_a_bug'));
.attr('href', 'https://github.com/systemed/iD/issues');
bugReport.append('span')
.attr('class','icon bug light');
bugReport.call(bootstrap.tooltip()
.title(t('report_a_bug'))
.placement('top')
);
linkList.append('li')
.attr('class', 'user-list')
@@ -164,5 +171,5 @@ iD.ui = function(context) {
};
iD.ui.tooltipHtml = function(text, key) {
return '<span>' + text + '</span>' + '<div class="keyhint-wrap"><span class="keyhint"> ' + key + '</span></div>';
return '<span>' + text + '</span>' + '<div class="keyhint-wrap">' + '<span> ' + (t('tooltip_keyhint')) + ' </span>' + '<span class="keyhint"> ' + key + '</span></div>';
};

26
js/id/ui/preset/localized.js
View File

@@ -15,11 +15,16 @@ iD.ui.preset.localized = function(field, context) {
.on('change', change)
.call(iD.behavior.accept().on('accept', event.close));
selection.append('button')
.attr('class', 'localized-add')
.on('click', addBlank)
.append('span')
.attr('class', 'icon plus-dark');
var translateButton = selection.append('button')
.attr('class', 'button-input-action localized-add minor')
.on('click', addBlank);
translateButton.append('span')
.attr('class', 'icon plus');
translateButton.call(bootstrap.tooltip()
.title(t('translate.translate'))
.placement('top'));
localizedInputs = selection.append('div')
.attr('class', 'localized-wrap');
@@ -92,9 +97,15 @@ iD.ui.preset.localized = function(field, context) {
var wrap = d3.select(this);
var langcombo = d3.combobox().fetcher(fetcher);
wrap.append('label')
.attr('class','form-label')
.text(t('translate.localized_translation_label'))
.attr('for','localized-lang');
wrap.append('input')
.attr('class', 'localized-lang')
.attr('type', 'text')
.attr('placeholder',t('translate.localized_translation_language'))
.on('blur', changeLang)
.on('change', changeLang)
.call(langcombo);
@@ -103,17 +114,18 @@ iD.ui.preset.localized = function(field, context) {
.on('blur', changeValue)
.on('change', changeValue)
.attr('type', 'text')
.attr('placeholder', t('translate.localized_translation_name'))
.attr('class', 'localized-value');
wrap.append('button')
.attr('class', 'localized-remove')
.attr('class', 'minor button-input-action localized-remove')
.on('click', function(d) {
var t = {};
t[key(d.lang)] = '';
event.change(t);
d3.select(this.parentNode).remove();
})
.append('span').attr('class', 'icon remove');
.append('span').attr('class', 'icon delete');
});

2
js/id/ui/preset/wikipedia.js
View File

@@ -49,7 +49,7 @@ iD.ui.preset.wikipedia = function(field, context) {
.call(titlecombo);
link = selection.append('a')
.attr('class', 'wiki-link minor')
.attr('class', 'wiki-link button-input-action minor')
.attr('target', '_blank');
link.append('span')
.attr('class','icon out-link');

6
js/id/ui/taglist.js
View File

@@ -29,7 +29,7 @@ iD.ui.Taglist = function(context, entity) {
.on('click', addTag);
newTag.append('span')
.attr('class', 'icon plus');
.attr('class', 'icon plus light');
newTag.append('span')
.attr('class', 'label')
@@ -58,10 +58,10 @@ iD.ui.Taglist = function(context, entity) {
li.exit().remove();
var row = li.enter().append('li')
.attr('class', 'tag-row');
.attr('class', 'tag-row cf');
row.append('div')
.attr('class', 'key-wrap col6')
.attr('class', 'key-wrap')
.append('input')
.property('type', 'text')
.attr('class', 'key')