CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-21 15:56:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1103 from systemed/commit-cleanup

Browse Source 
Commit cleanup
This commit is contained in:
Saman Bemel-Benrud
2013-03-21 16:26:24 -07:00
parent 0baaf1a3fd 094f283f05
commit 26d62515fa
16 changed files with 252 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/app.css
+96 -124
View File
@@ -70,12 +70,12 @@ h2:last-child,
h4:last-child { margin-bottom: 0;}
h3 {
font-size: 18px;
font-size: 16px;
line-height: 1.3333;
font-weight: bold;
margin-bottom: 10px;
text-overflow: ellipsis;
white-space: nowrap
white-space: nowrap;
}
h4 {
@@ -134,6 +134,7 @@ a:hover {
textarea {
resize: vertical;
font:normal 12px/20px 'Helvetica Neue', Arial, sans-serif;
}
textarea,
@@ -271,7 +272,9 @@ ul.link-list li:last-child {
.fr { float: right;}
div.hide,
form.hide {
form.hide,
button.hide,
a.hide {
display: none;
}
@@ -285,9 +288,6 @@ form.hide {
}
.pad1 {padding: 10px;}
.pad2 {padding: 20px;}
.margin1 {margin: 10px;}
.margin2 {margin: 20px;}
.loading {
background: url(../img/loader_bg.gif);
@@ -443,12 +443,6 @@ button.save.has-count .count::before {
border-right: 6px solid rgba(255,255,255,.5);
}
button.close {
position: absolute;
top: 10px;
right: 10px;
}
button[disabled] {
cursor:auto;
background: rgba(255,255,255,.5);
@@ -580,6 +574,37 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;}
border-radius: 0;
}
/* Header for modals / panes
------------------------------------------------------- */
.header {
border-bottom: 1px solid #ccc;
z-index: 2;
position: relative;
}
.header h3 {
margin-bottom: 0;
}
.modal > button,
.header button {
height: 100%;
border-radius: 0;
border-left: 1px solid #CCC;
width: 40px;
text-align: center;
overflow: hidden;
position: absolute;
right: 0;
}
.modal > button {
height: 61px;
z-index: 3;
}
/* Inspector
------------------------------------------------------- */
@@ -616,24 +641,13 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;}
position: relative;
}
.inspector-wrap .message {
height: 60px;
border-bottom: 1px solid #ccc;
z-index: 100;
position: relative;
}
.inspector-wrap .message button {
height: 100%;
border-radius: 0;
.inspector-wrap .header button.preset-reset {
border-right: 1px solid #CCC;
width: 60px;
text-align: center;
overflow: hidden;
position: relative;
width: 60px;
}
.inspector-wrap .message button > div {
.inspector-wrap .header button.preset-reset > div {
height: 100%;
padding: 20px 0;
-webkit-transition: opacity 200ms;
@@ -641,38 +655,26 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;}
transition: opacity 200ms;
}
.inspector-wrap .message button .col12:last-child {
.inspector-wrap .header button.preset-reset .col12:last-child {
position: absolute;
width: 100%;
padding: 20px 0;
opacity: 0;
}
.inspector-wrap .message button:hover .col12:first-child {
.inspector-wrap .header button:hover .col12:first-child {
opacity: 0;
}
.inspector-wrap .message button:hover .col12:last-child {
.inspector-wrap .header button:hover .col12:last-child {
opacity: 1;
}
.inspector-wrap .message button.line > div {
.inspector-wrap .header button.line > div {
padding: 0;
}
.inspector-wrap .message button.fr {
border-left: 1px solid #CCC;
width: 40px;
}
.inspector-wrap .message h3 {
display: block;
font-size: 16px;
line-height: 20px;
overflow: hidden;
}
.pane:last-child .message h3 {
.pane:last-child .header h3 {
position: absolute;
left: 60px;
right: 40px;
@@ -1637,12 +1639,10 @@ div.typeahead a:first-child {
.modal {
display: inline-block;
position:absolute;
width: 50%;
left: 0;
right: 0;
margin: auto;
max-width: 600px;
top: 80px;
top: 30px;
z-index: 3;
}
@@ -1650,27 +1650,10 @@ div.typeahead a:first-child {
margin-bottom: 10px;
}
.modal .content {
margin-bottom: 40px;
}
.modal .description {
text-align: center;
}
.modal button.close-modal {
float:right;
position: absolute;
right:5px;
top:5px;
opacity: .5;
}
.modal button.close-modal:hover {
background-color: transparent;
opacity: 1;
}
.shaded {
z-index: 2;
position: absolute;
@@ -1678,6 +1661,7 @@ div.typeahead a:first-child {
width: 100%;
overflow: auto;
}
.shaded:before {
content:'';
background:rgba(0,0,0,0.5);
@@ -1687,29 +1671,11 @@ div.typeahead a:first-child {
.modal-section {
padding: 20px;
}
.modal-section:first-child {
border-radius: 4px 4px 0 0;
border-bottom: 1px solid #CCC;
}
.modal-section:last-child {
border-radius: 0 0 4px 4px;
}
.modal-section:only-of-type {
border-radius: 4px;
}
.modal-section .buttons {
padding-top: 10px;
width: 100%;
}
.modal-section img.wiki-image {
max-width: 100%;
max-height: 300px;
display: block;
border-bottom: 0;
}
.modal-flash .content {
@@ -1750,6 +1716,7 @@ div.typeahead a:first-child {
.commit-modal .commit-info {
margin-top: 10px;
padding-bottom: 20px;
}
.commit-modal .user-info img {
@@ -1773,70 +1740,75 @@ div.typeahead a:first-child {
.commit-modal .changeset-list {
overflow: auto;
border:1px solid #ccc;
border-radius: 4px;
background:#fff;
max-height: 160px;
}
.commit-modal .warning-section .changeset-list {
border-radius: 4px 0 0 4px;
}
.commit-modal .warning-section .changeset-list button {
float: right;
position: absolute;
right: 0;
top: 0;
bottom: 0;
border-radius: 0;
height: 100%;
width: 30px;
}
.commit-section.modal-section {
padding-bottom: 0;
}
.commit-section.modal-section:last-child { padding-bottom: 20px;}
.commit-modal .changeset-list li {
position: relative;
border-top:1px solid #ccc;
padding:5px 10px;
}
.modal-section {
padding: 20px;
}
.modal-section img.wiki-image {
max-width: 100%;
max-height: 300px;
display: block;
}
.modal-flash .content {
box-shadow: none;
border-radius: 4px;
background: #111;
color: #eee;
}
.modal-flash .close-modal {
display:none;
}
.changeset-list li span.count {
font-size:10px;
color:#555;
}
.changeset-list li span.count:before { content: '('; }
.changeset-list li span.count:after { content: ')'; }
.changeset-list li:first-child { border-top: 0;}
.commit-modal .changeset-comment {
height: 60px;
width:100%;
/* firefox uses monospace in textareas */
font:normal 12px/20px 'Helvetica Neue', Arial, sans-serif;
}
/* Success
------------------------------------------------------- */
a.success-action {
display:inline-block;
padding:10px;
margin:10px;
.modal a.success-action {
height: 180px;
border-bottom: 1px solid #CCC;
text-align: center;
-webkit-transition: all 200ms;
-moz-transition: all 200ms;
transition: all 200ms;
}
.modal a.success-action:hover {
background-color: #ececec;
}
a.success-action.osm {
border-right: 1px solid #CCC;
}
a.success-action:before {
display: block;
content: '';
height: 100px;
width: 100px;
margin: auto;
margin-bottom: 20px;
background:transparent url(../img/sprite.png) no-repeat 0px -220px;
}
a.success-action.twitter:before {
background-position: -100px -220px;
}
/* Notices
@@ -2096,10 +2068,10 @@ a.success-action {
------------------------------------------------------- */
@media only screen and (max-width: 840px) {
span.label {display: none;}
#bar .label {display: none;}
#bar .icon.icon-pre-text { margin-right: 0px;}
/* override hide for save button */
.icon.icon-pre-text { margin-right: 0px;}
.save .label, .apply .label, .cancel .label { display: block;}
#bar .save .label { display: block;}
}
@media only screen and (max-height: 840px) {
data/core.yaml
+2 -1
View File
@@ -105,7 +105,7 @@ en:
annotation: Split a way.
nothing_to_undo: Nothing to undo.
nothing_to_redo: Nothing to redo.
just_edited: "You Just Edited OpenStreetMap!"
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
zoom_in_edit: zoom in to edit the map
@@ -114,6 +114,7 @@ en:
commit:
title: Save Changes
description_placeholder: Brief description of your contributions
message_label: Commit message
upload_explanation: "The changes you upload as {user} will be visible on all maps that use OpenStreetMap data."
save: Save
cancel: Cancel
data/locales.js
+2 -1
View File
@@ -137,7 +137,7 @@ locale.en = {
},
"nothing_to_undo": "Nothing to undo.",
"nothing_to_redo": "Nothing to redo.",
"just_edited": "You Just Edited OpenStreetMap!",
"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",
"zoom_in_edit": "zoom in to edit the map",
@@ -146,6 +146,7 @@ locale.en = {
"commit": {
"title": "Save Changes",
"description_placeholder": "Brief description of your contributions",
"message_label": "Commit message",
"upload_explanation": "The changes you upload as {user} will be visible on all maps that use OpenStreetMap data.",
"save": "Save",
"cancel": "Cancel",
img/source/sprite.svg
+87 -53
View File
@@ -10,7 +10,7 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="460"
height="220"
height="320"
id="svg12393"
version="1.1"
inkscape:version="0.48.2 r9819"
@@ -39,21 +39,21 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1"
inkscape:cx="251.84767"
inkscape:cy="109.87116"
inkscape:cx="105.09059"
inkscape:cy="203.92529"
inkscape:document-units="px"
inkscape:current-layer="layer12"
showgrid="false"
showgrid="true"
inkscape:window-width="1280"
inkscape:window-height="700"
inkscape:window-x="361"
inkscape:window-y="86"
inkscape:window-x="131"
inkscape:window-y="17"
inkscape:window-maximized="0"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
showguides="false"
showguides="true"
inkscape:guide-bbox="true"
inkscape:snap-bbox="true"
inkscape:snap-nodes="false">
@@ -66,131 +66,131 @@
snapvisiblegridlinesonly="true" />
<sodipodi:guide
orientation="1,0"
position="0,220"
position="0,320"
id="guide12508" />
<sodipodi:guide
orientation="1,0"
position="20,220"
position="20,320"
id="guide12512" />
<sodipodi:guide
orientation="1,0"
position="40,220"
position="40,320"
id="guide12514" />
<sodipodi:guide
orientation="1,0"
position="60,220"
position="60,320"
id="guide12516" />
<sodipodi:guide
orientation="1,0"
position="80,220"
position="80,320"
id="guide12518" />
<sodipodi:guide
orientation="0,1"
position="0,200"
position="0,300"
id="guide12520" />
<sodipodi:guide
orientation="1,0"
position="100,220"
position="100,320"
id="guide12522" />
<sodipodi:guide
orientation="1,0"
position="120,220"
position="120,320"
id="guide12590" />
<sodipodi:guide
orientation="1,0"
position="140,310"
position="140,410"
id="guide12592" />
<sodipodi:guide
orientation="1,0"
position="160,220"
position="160,320"
id="guide12647" />
<sodipodi:guide
orientation="1,0"
position="180,220"
position="180,320"
id="guide12649" />
<sodipodi:guide
orientation="1,0"
position="200,220"
position="200,320"
id="guide12672" />
<sodipodi:guide
orientation="1,0"
position="220,220"
position="220,320"
id="guide14109" />
<sodipodi:guide
orientation="0,1"
position="195,180"
position="195,280"
id="guide14199" />
<sodipodi:guide
orientation="0,1"
position="15,220"
position="15,320"
id="guide14589" />
<sodipodi:guide
orientation="0,1"
position="145,160"
position="145,260"
id="guide15519" />
<sodipodi:guide
orientation="0,1"
position="90,140"
position="90,240"
id="guide15521" />
<sodipodi:guide
orientation="0,1"
position="15,40"
position="15,140"
id="guide32247" />
<sodipodi:guide
orientation="0,1"
position="55,120"
position="55,220"
id="guide47490" />
<sodipodi:guide
orientation="0,1"
position="90,100"
position="90,200"
id="guide47492" />
<sodipodi:guide
orientation="0,1"
position="110,60"
position="110,160"
id="guide47494" />
<sodipodi:guide
orientation="0,1"
position="145,80"
position="145,180"
id="guide47496" />
<sodipodi:guide
orientation="1,0"
position="320,211"
position="320,311"
id="guide14115" />
<sodipodi:guide
orientation="1,0"
position="360,210"
position="360,310"
id="guide3406" />
<sodipodi:guide
orientation="1,0"
position="380,205"
position="380,305"
id="guide3408" />
<sodipodi:guide
orientation="1,0"
position="240,216"
position="240,316"
id="guide15954" />
<sodipodi:guide
orientation="1,0"
position="400,230"
position="400,330"
id="guide15997" />
<sodipodi:guide
orientation="1,0"
position="420,211"
position="420,311"
id="guide10219" />
<sodipodi:guide
orientation="1,0"
position="440,235"
position="440,335"
id="guide26209" />
<sodipodi:guide
orientation="0,1"
position="20,20"
position="20,120"
id="guide6774" />
<sodipodi:guide
orientation="0,1"
position="15,0"
position="15,100"
id="guide6776" />
<sodipodi:guide
orientation="1,0"
position="460,220"
position="460,320"
id="guide4067" />
</sodipodi:namedview>
<metadata
@@ -223,7 +223,7 @@
inkscape:groupmode="layer"
id="layer12"
inkscape:label="sprite"
transform="translate(-25,3.4453126e-6)"
transform="translate(-25,3.0624999e-6)"
style="display:inline">
<g
transform="translate(105.03464,-25.104239)"
@@ -1188,12 +1188,13 @@
inkscape:connector-curvature="0" />
</g>
<rect
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect10175"
width="40"
height="140"
x="-15"
y="-3.0624999e-06" />
width="460"
height="320"
x="-485"
y="-3.0624999e-06"
transform="scale(-1,1)" />
<path
id="path10245"
d="m 436,22.999997 -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"
@@ -1347,13 +1348,6 @@
id="path16625-6"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccccccccccccc" />
<rect
style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect6897"
width="460"
height="220"
x="25"
y="-3.4453126e-06" />
<path
style="color:#000000;fill:#a9a9a9;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 127.5,205 -1,1 5,10 1.21875,0 2.28125,-3.9375 2.28125,3.9375 1.21875,0 5,-10 -1,-1 -1,0 -3.5,7.5 -1.5,-2.5 2,-4 -0.5,-1 -1.5,0 -1.5,3.5 -1.5,-3.5 -1.5,0 -0.5,1 2,4 -1.5,2.5 -3.5,-7.5 z"
@@ -1905,7 +1899,7 @@
d="m 479,9.999997 -8,7 -1,-1 0,-12.0000001 1,-1 z"
style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<rect
style="color:#000000;fill:#000000;fill-opacity:0.15686275000000000;stroke:#000000;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;opacity:0.14999999999999999"
style="opacity:0.15;color:#000000;fill:#000000;fill-opacity:0.15686275;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect7068"
width="38.000004"
height="38.000004"
@@ -2025,5 +2019,45 @@
sodipodi:type="arc" />
</g>
</g>
<g
transform="matrix(0.390625,0,0,0.390625,867.1875,238.60852)"
id="g4611">
<rect
y="-47.637821"
x="-2156"
height="256"
width="256"
id="rect4565"
style="color:#000000;fill:none;stroke:none;stroke-width:34;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<g
id="g4494"
transform="translate(-781,47)">
<path
inkscape:connector-curvature="0"
id="rect4447-5-1"
transform="translate(531,-204.63782)"
d="m -1896,122 20,52.5 -20,52.5 20,52.5 -20,52.5 12.2812,4.6875 L -1817,270 l 11.9688,1.84375 14.5312,-14.53125 c -8.574,-9.9331 -14.9928,-21.78616 -18.5,-34.875 l 6.8125,-5.59375 C -1803.3588,211.40809 -1804,205.77939 -1804,200 c 0,-28.87174 15.3992,-54.24281 38.4062,-68.3125 L -1791,122 l -52.5,20 -52.5,-20 z m 172,13 c -1.0895,0 -2.174,0.0412 -3.25,0.0937 -1.0241,0.05 -2.0517,0.12216 -3.0625,0.21875 -0.8162,0.0781 -1.6306,0.17344 -2.4375,0.28125 -0.8457,0.113 -1.6651,0.22996 -2.5,0.375 -0.2618,0.0455 -0.5205,0.10765 -0.7812,0.15625 -0.5244,0.0976 -1.0427,0.20241 -1.5626,0.3125 -0.4145,0.0878 -0.8384,0.15436 -1.25,0.25 -0.4939,0.11477 -0.9792,0.24908 -1.4687,0.375 -0.8182,0.2105 -1.6323,0.44638 -2.4375,0.6875 -0.6076,0.18204 -1.2125,0.36336 -1.8125,0.5625 -0.6062,0.2012 -1.2143,0.40662 -1.8125,0.625 -0.031,0.0113 -0.063,0.0199 -0.094,0.0312 -23.8565,8.757 -41.0956,31.07715 -42.4374,57.6875 -0.056,1.11031 -0.094,2.21915 -0.094,3.34375 0,1.11405 0.031,2.21536 0.094,3.3125 3e-4,0.0104 -9e-4,0.0209 0,0.0312 0.047,0.81497 0.1169,1.62877 0.1874,2.4375 2.7487,31.3507 27.5866,56.18883 58.9376,58.9375 0.8087,0.0709 1.6204,0.14629 2.4374,0.1875 0.01,6e-4 0.021,-6e-4 0.031,0 1.0971,0.063 2.1985,0.0937 3.3125,0.0937 17.7144,0 33.7315,-7.0376 45.4375,-18.46875 0.6439,-0.62875 1.2889,-1.25136 1.9063,-1.90625 0.1061,-0.11264 0.2071,-0.23035 0.3124,-0.34375 0.035,-0.038 0.059,-0.0869 0.094,-0.125 0.4856,-0.52502 0.9693,-1.05284 1.4375,-1.59375 0.1881,-0.21733 0.3773,-0.4364 0.5625,-0.65625 0.1482,-0.17592 0.2911,-0.35374 0.4375,-0.53125 0.5246,-0.63613 1.0307,-1.28129 1.5313,-1.9375 0.6408,-0.84026 1.2749,-1.72188 1.875,-2.59375 1.2,-1.74375 2.3154,-3.54444 3.3437,-5.40625 0.3873,-0.70118 0.7319,-1.40817 1.0937,-2.125 0.1177,-0.2333 0.2601,-0.45259 0.375,-0.6875 0.065,-0.13274 0.1235,-0.273 0.1876,-0.40625 0.401,-0.83432 0.7901,-1.67744 1.1562,-2.53125 0.05,-0.11612 0.107,-0.22728 0.1562,-0.34375 0.3632,-0.86095 0.7045,-1.74541 1.0313,-2.625 0.042,-0.11384 0.083,-0.22961 0.125,-0.34375 0.3297,-0.90319 0.6471,-1.79713 0.9375,-2.71875 0.029,-0.0931 0.065,-0.18796 0.094,-0.28125 0.2934,-0.94658 0.5615,-1.91023 0.8124,-2.875 0.019,-0.0731 0.044,-0.1455 0.063,-0.21875 0.2508,-0.97873 0.4814,-1.97255 0.6874,-2.96875 0.013,-0.0619 0.019,-0.12552 0.031,-0.1875 0.048,-0.23652 0.079,-0.48129 0.125,-0.71875 0.1598,-0.83015 0.3095,-1.65875 0.4375,-2.5 0.1593,-1.04708 0.2973,-2.09312 0.4062,-3.15625 0,-0.031 0,-0.0628 0,-0.0937 0.1086,-1.07413 0.1941,-2.1608 0.25,-3.25 0,-0.0207 -10e-4,-0.0418 0,-0.0625 0.056,-1.11031 0.094,-2.21915 0.094,-3.34375 0,-35.98734 -29.0127,-65 -65,-65 z m 51.125,126.46875 C -1686.7523,273.03639 -1704.5744,280 -1724,280 c -5.7794,0 -11.4081,-0.64123 -16.8438,-1.8125 l -5.5937,6.8125 c -12.4296,-3.33045 -23.7588,-9.25521 -33.375,-17.1875 l -15.0313,15.0625 1.8438,11.125 -55.9062,55.9375 5.4062,2.0625 52.5,-20 52.5,20 52.5,-20 20,-52.5 -6.875,-18.03125 z"
style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
</g>
</g>
<g
id="g8629"
transform="translate(-810.00001,-19.000003)">
<rect
y="238.99998"
x="935"
height="100.00001"
width="100.00001"
id="rect8627"
style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
inkscape:connector-curvature="0"
d="m 1035,259.46976 c -3.679,1.6066 -7.6336,2.69227 -11.7831,3.18013 4.2351,-2.49939 7.4885,-6.45736 9.0205,-11.17402 -3.9645,2.31516 -8.3552,3.99577 -13.0286,4.90089 -3.7418,-3.92491 -9.0738,-6.37759 -14.9751,-6.37759 -11.33021,0 -20.51679,9.04283 -20.51679,20.19639 0,1.58324 0.18008,3.12476 0.53217,4.60303 -17.05108,-0.8424 -32.16868,-8.88327 -42.28747,-21.10256 -1.76581,2.98278 -2.77795,6.45238 -2.77795,10.15396 0,7.00715 3.62183,13.1887 9.12688,16.81077 -3.36304,-0.1076 -6.52651,-1.01351 -9.29247,-2.52616 -0.002,0.084 -0.002,0.16796 -0.002,0.25194 0,9.78524 7.07195,17.94866 16.45764,19.80431 -1.72156,0.46135 -3.53416,0.70856 -5.40515,0.70856 -1.32202,0 -2.60724,-0.12596 -3.85969,-0.36215 2.61039,8.02355 10.18701,13.86315 19.16488,14.02559 -7.02158,5.41762 -15.8675,8.64629 -25.48033,8.64629 -1.65593,0 -3.28903,-0.0945 -4.89377,-0.28289 9.07933,5.73043 19.86348,9.07458 31.44972,9.07458 37.73703,0 58.37353,-30.77522 58.37353,-57.46492 0,-0.87573 -0.037,-1.74674 -0.063,-2.61276 4.0095,-2.84789 7.4872,-6.40461 10.238,-10.45497"
style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path5047-4-7"
inkscape:export-filename="/Users/saman/Dropbox/mapbox-redesign/mockup.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
</g>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 128 KiB

After

Width:  |  Height:  |  Size: 134 KiB

img/sprite.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 22 KiB

js/id/svg/surface.js
+1 -1
View File
@@ -93,7 +93,7 @@ iD.svg.Surface = function() {
.attr({
id: 'sprite',
width: 460,
height: 220,
height: 320,
'xlink:href': 'img/sprite.png'
});
js/id/ui/commit.js
+20 -27
View File
@@ -28,22 +28,30 @@ iD.ui.Commit = function(context) {
var changes = selection.datum(),
connection = changes.connection,
user = connection.user(),
header = selection.append('div').attr('class', 'header modal-section fillL'),
header = selection.append('div').attr('class', 'header modal-section'),
body = selection.append('div').attr('class', 'body');
header.append('h2')
header.append('h3')
.text(t('commit.title'));
// Comment Section
var commentSection = body.append('div')
.attr('class', 'modal-section fillD');
.attr('class', 'modal-section preset-field');
var commentField = commentSection.append('textarea')
.attr('class', 'changeset-comment')
.attr('placeholder', t('commit.description_placeholder'))
.property('value', context.storage('comment') || '');
commentSection.append('h4')
.attr('for','input-commit-note')
.text(t('commit.message_label'));
var commentField = commentSection
.append('textarea')
.attr('placeholder', t('commit.description_placeholder'))
.property('value', context.storage('comment') || '');
commentField.node().select();
// Save Section
var saveSection = body.append('div').attr('class','modal-section cf');
var userLink = d3.select(document.createElement('div'));
if (user.image_url) {
@@ -58,18 +66,13 @@ iD.ui.Commit = function(context) {
.attr('href', connection.url() + '/user/' + user.display_name)
.attr('target', '_blank');
commentSection.append('p')
saveSection.append('p')
.attr('class', 'commit-info')
.html(t('commit.upload_explanation', {user: userLink.html()}));
// Confirm / Cancel Buttons
var buttonWrap = commentSection.append('div')
.attr('class', 'buttons cf')
.append('div')
.attr('class', 'button-wrap joined col4');
var saveButton = buttonWrap.append('button')
.attr('class', 'save action col6 button')
// Confirm Button
var saveButton = saveSection.append('button')
.attr('class', 'action col2 button')
.on('click.save', function() {
var comment = commentField.node().value;
localStorage.comment = comment;
@@ -82,21 +85,11 @@ iD.ui.Commit = function(context) {
.attr('class', 'label')
.text(t('commit.save'));
var cancelButton = buttonWrap.append('button')
.attr('class', 'cancel col6 button')
.on('click.cancel', function() {
event.cancel();
});
cancelButton.append('span')
.attr('class', 'label')
.text(t('commit.cancel'));
var warnings = body.selectAll('div.warning-section')
.data(iD.validate(changes, context.graph()))
.enter()
.append('div')
.attr('class', 'modal-section warning-section fillL');
.attr('class', 'modal-section warning-section fillL2');
warnings.append('h3')
.text(t('commit.warnings'));
js/id/ui/confirm.js
+8 -12
View File
@@ -4,26 +4,22 @@ iD.ui.confirm = function(selection) {
modal.select('.modal')
.classed('modal-alert', true);
var section = modal.select('.content')
.attr('class', 'modal-section fillD');
var section = modal.select('.content');
var modalHeader = section.append('div')
.attr('class', 'modal-section header');
var description = section.append('div')
.attr('class', 'description');
.attr('class', 'modal-section message-text');
var buttonwrap = section.append('div')
.attr('class', 'buttons cf');
.attr('class', 'modal-section buttons cf');
var okbutton = buttonwrap.append('button')
.attr('class', 'col2 action centered')
.attr('class', 'col2 action')
.on('click.confirm', function() {
modal.remove();
});
okbutton.append('span')
.attr('class', 'icon apply icon-pre-text');
okbutton.append('span')
.attr('class', 'label')
})
.text('Okay');
return modal;
js/id/ui/loading.js
+2
View File
@@ -8,5 +8,7 @@ iD.ui.loading = function(selection, message, blocking) {
loadertext.append('img').attr('class','loader').attr('src', 'img/loader.gif');
loadertext.append('h3').text(message || '');
modal.select('button.close').attr('class','hide');
return modal;
};
js/id/ui/modal.js
+5 -3
View File
@@ -21,13 +21,15 @@ iD.ui.modal = function(selection, blocking) {
});
var modal = shaded.append('div')
.attr('class', 'modal');
.attr('class', 'modal fillL col6');
modal.append('button')
.attr('class', 'icon remove')
.attr('class', 'close')
.on('click', function() {
if (!blocking) shaded.remove();
});
})
.append('div')
.attr('class','icon close');
modal.append('div')
.attr('class', 'content');
js/id/ui/preset_grid.js
+3 -3
View File
@@ -12,7 +12,7 @@ iD.ui.PresetGrid = function(context, entity) {
presets = context.presets().matchGeometry(entity, context.graph());
var messagewrap = selection.append('div')
.attr('class', 'message fillL');
.attr('class', 'header fillL cf');
var message = messagewrap.append('h3')
.attr('class', 'inspector-inner fl')
@@ -20,13 +20,13 @@ iD.ui.PresetGrid = function(context, entity) {
if (preset) {
messagewrap.append('button')
.attr('class', 'tooltip-bottom preset-choose fr')
.attr('class', 'preset-choose')
.on('click', event.choose)
.append('span')
.attr('class', 'icon forward');
} else {
messagewrap.append('button')
.attr('class', 'tooltip-bottom preset-close fr')
.attr('class', 'close')
.on('click', event.close)
.append('span')
.attr('class', 'icon close');
js/id/ui/restore.js
+2 -2
View File
@@ -11,12 +11,12 @@ iD.ui.Restore = function(context) {
var introModal = modal.select('.content');
introModal.append('div')
.attr('class', 'modal-section fillL')
.attr('class', 'modal-section header')
.append('h3')
.text(t('restore.description'));
var buttonWrap = introModal.append('div')
.attr('class', 'modal-section fillD cf col12');
.attr('class', 'modal-section cf col12');
var buttons = buttonWrap
.append('div')
js/id/ui/save.js
+8 -4
View File
@@ -39,11 +39,15 @@ iD.ui.Save = function(context) {
function(err, changeset_id) {
loading.remove();
if (err) {
var desc = iD.ui.confirm(context.container())
.select('.description');
desc.append('h2')
var confirm = iD.ui.confirm(context.container());
confirm
.select('.modal-section.header')
.append('h3')
.text(t('save.error'));
desc.append('p').text(err.responseText);
confirm
.select('.modal-section.message-text')
.append('p')
.text(err.responseText);
} else {
history.reset();
map.flush().redraw();
js/id/ui/success.js
+13 -16
View File
@@ -3,12 +3,10 @@ iD.ui.Success = function(connection) {
function success(selection) {
var changeset = selection.datum(),
header = selection.append('div').attr('class', 'header fillL modal-section'),
header = selection.append('div').attr('class', 'header modal-section'),
body = selection.append('div').attr('class', 'body');
var section = body.append('div').attr('class','modal-section fillD');
header.append('h2').text(t('just_edited'));
header.append('h3').text(t('just_edited'));
var m = '';
if (changeset.comment) {
@@ -18,34 +16,33 @@ iD.ui.Success = function(connection) {
var message = (m || 'Edited OSM!') +
connection.changesetUrl(changeset.id);
header.append('a')
var links = body.append('div').attr('class','cf');
links.append('a')
.attr('class','col6 success-action modal-section osm')
.attr('target', '_blank')
.attr('href', function() {
return connection.changesetUrl(changeset.id);
})
.attr('target', '_blank')
.attr('class', 'success-action')
.text(t('view_on_osm'));
header.append('a')
links.append('a')
.attr('class','col6 success-action modal-section twitter')
.attr('target', '_blank')
.attr('href', function() {
return 'https://twitter.com/intent/tweet?source=webclient&text=' +
encodeURIComponent(message);
})
.attr('class', 'success-action')
.text('Tweet');
var buttonwrap = section.append('div')
.attr('class', 'buttons cf');
var section = body.append('div').attr('class','modal-section cf');
var okbutton = buttonwrap.append('button')
section.append('button')
.attr('class', 'action col2')
.on('click.save', function() {
event.cancel();
});
okbutton.append('span').attr('class','icon apply icon-pre-text');
okbutton.append('span').attr('class','label').text('Okay');
})
.append('span').attr('class','label').text('Okay');
}
return d3.rebind(success, event, 'on');
js/id/ui/tag_editor.js
+1 -1
View File
@@ -24,7 +24,7 @@ iD.ui.TagEditor = function(context, entity) {
selection.html('');
var messagewrap = selection.append('div')
.attr('class', 'message fillL');
.attr('class', 'header fillL cf');
var back = messagewrap.append('button')
.attr('class', 'preset-reset fl ' + geometry)
js/id/ui/tag_reference.js
+2 -2
View File
@@ -4,7 +4,7 @@ iD.ui.tagReference = function(selection) {
var selection = d3.select(this);
var header = selection.append('div')
.attr('class','modal-section fillL header')
.append('h2');
.append('h3');
header.selectAll('span.icon')
.data(g('types'))
@@ -23,7 +23,7 @@ iD.ui.tagReference = function(selection) {
.attr('class','modal-section fillL2');
referenceBody
.append('h5')
.append('h4')
.text(t('tag_reference.description'));
if (selection.datum().image) {