diff --git a/css/app.css b/css/app.css
index e83c7152f..47bf15f45 100644
--- a/css/app.css
+++ b/css/app.css
@@ -89,7 +89,7 @@ a:visited, a {
}
a:hover {
- color:#154dff;
+ color:#597be7;
}
@@ -220,9 +220,10 @@ ul.link-list li:last-child {
.fillD {
background:rgba(0,0,0,.8);
- color: white;
+ color: #a9a9a9;
}
+
.fl { float: left;}
.fr { float: right;}
@@ -399,7 +400,7 @@ button[disabled] .label {
height: 40px;
}
-.icon.icon-pre-text {
+.icon-pre-text {
margin-right: 3px;
}
@@ -424,6 +425,9 @@ button[disabled] .label {
.icon.avatar { background-position: -320px 0px;}
.icon.nearby { background-position: -340px 0px;}
.icon.geolocate { background-position: -360px 0px;}
+.icon.warning { background-position: -380px 0px;}
+
+.icon.close-modal{ background-position: -200px -40px;}
.icon.invert.zoom-in { background-position: -240px -40px;}
@@ -900,6 +904,18 @@ div.typeahead a:first-child {
left:0px; right:0px; top:0px; bottom:0px;
}
+.commit-modal .user-info {
+ display: inline-block;
+}
+
+.commit-modal .commit-info {
+ margin-top: 10px;
+}
+
+.commit-modal .user-info img {
+ float: left;
+}
+
.commit-modal h3 small.count {
margin-right: 10px;
text-align: center;
@@ -919,10 +935,26 @@ div.typeahead a:first-child {
border:1px solid #ccc;
background:#fff;
max-height: 160px;
+ overflow: visible;
}
-.commit-modal .user-details {
- float: right;
+.commit-modal .warning-section .changeset-list {
+ margin-right: 20px;
+}
+
+.commit-section.modal-section {
+ padding-bottom: 0;
+}
+
+.commit-section.modal-section:last-child { padding-bottom: 20px;}
+
+.commit-modal .changeset-list li {
+ position: relative;
+}
+
+.commit-modal .changeset-list li button {
+ position: absolute;
+ right: -30px;
}
.user-icon {
diff --git a/img/source/radial-menu.svg b/img/source/radial-menu.svg
new file mode 100644
index 000000000..7c43c61d8
--- /dev/null
+++ b/img/source/radial-menu.svg
@@ -0,0 +1,14044 @@
+
+
+
+
diff --git a/img/source/sprite.svg b/img/source/sprite.svg
index 537a84226..e11e3a93e 100644
--- a/img/source/sprite.svg
+++ b/img/source/sprite.svg
@@ -9,11 +9,11 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="380"
+ width="400"
height="200"
id="svg12393"
version="1.1"
- inkscape:version="0.48.1 r9760"
+ inkscape:version="0.48.2 r9819"
sodipodi:docname="sprite.svg"
inkscape:export-filename="/Users/saman/work_repos/iD/img/sprite.png"
inkscape:export-xdpi="90"
@@ -38,15 +38,15 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="2.8284271"
- inkscape:cx="173.1037"
- inkscape:cy="123.12989"
+ inkscape:zoom="2"
+ inkscape:cx="300.38044"
+ inkscape:cy="166.96802"
inkscape:document-units="px"
inkscape:current-layer="layer12"
showgrid="false"
- inkscape:window-width="1560"
- inkscape:window-height="922"
- inkscape:window-x="223"
+ inkscape:window-width="1280"
+ inkscape:window-height="756"
+ inkscape:window-x="119"
inkscape:window-y="0"
inkscape:window-maximized="0"
fit-margin-top="0"
@@ -56,7 +56,7 @@
showguides="false"
inkscape:guide-bbox="true"
inkscape:snap-bbox="true"
- inkscape:snap-nodes="false">
+ inkscape:snap-nodes="true">
+
+
@@ -173,7 +181,7 @@
image/svg+xml
-
+
@@ -183,15 +191,6 @@
id="layer1"
transform="translate(-25,-62.362183)"
style="display:inline">
-
+ style="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" />
-
-
-
-
-
-
+
+ transform="translate(-511.00001,-14)"
+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.55555558;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
+ d="m 925.00003,-6.4444512 c -3.86599,0 -7,3.1340096 -7,6.99999958 0,1.12543002 0.30585,2.16901002 0.77778,3.11112002 l -5.44445,5.444436 0,3.1111096 3.11112,0 5.44444,-5.4444396 c 0.94211,0.47192 1.98568,0.77777 3.11111,0.77777 3.86599,0 7,-3.133996 7,-6.99999602 0,-3.86598998 -3.13401,-6.99999958 -7,-6.99999958 z m 0,3.1111096 c 2.14777,0 3.88889,1.74112 3.88889,3.88888998 0,2.14778002 -1.74112,3.88889002 -3.88889,3.88889002 -2.14777,0 -3.88889,-1.74111 -3.88889,-3.88889002 0,-2.14776998 1.74112,-3.88888998 3.88889,-3.88888998 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.55555558;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
@@ -1080,5 +1062,28 @@
id="path33359"
d="m 354.5,22.999997 c -1.5,0 -2.5,2 -2.5,3 0,0.666667 0,1.333333 0,2 0,1 1,2.153847 1,2.153847 l 0,0.846153 -1.69231,0.384617 c -1.45419,0.330499 -2.02608,1.236079 -2.15384,2.76923 L 349,35.999998 l 12,0 -0.15385,-1.846154 c -0.12776,-1.533151 -0.69965,-2.438731 -2.15384,-2.76923 L 357,30.999997 l 0,-0.846153 c 0,0 1,-1.153847 1,-2.153847 0,-0.666667 0,-1.333333 0,-2 0,-1 -1,-3 -2.5,-3 z"
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+
+
+
+
diff --git a/img/sprite.png b/img/sprite.png
index e3037eebd..82dde059e 100644
Binary files a/img/sprite.png and b/img/sprite.png differ
diff --git a/js/id/ui/commit.js b/js/id/ui/commit.js
index 47484419a..e62c8415d 100644
--- a/js/id/ui/commit.js
+++ b/js/id/ui/commit.js
@@ -31,32 +31,7 @@ iD.ui.commit = function(map) {
header = selection.append('div').attr('class', 'header modal-section fillL'),
body = selection.append('div').attr('class', 'body');
-
- var user_details = header
- .append('div')
- .attr('class', 'user-details');
-
- var user_link = user_details
- .append('div')
- .append('a')
- .attr('href', connection.url() + '/user/' +
- user.display_name)
- .attr('target', '_blank');
-
- if (user.image_url) {
- user_link
- .append('img')
- .attr('src', user.image_url)
- .attr('class', 'user-icon');
- }
-
- user_link
- .append('div')
- .text(user.display_name);
-
- header.append('h2').text('Save Changes');
-
- header.append('p').text('The changes you upload will be visible on all maps that use OpenStreetMap data.');
+ header.append('h2').text('Save Changes to OpenStreetMap');
// Comment Box
var comment_section = body.append('div').attr('class','modal-section fillD');
@@ -66,6 +41,28 @@ iD.ui.commit = function(map) {
.property('value', localStorage.comment || '')
.node().select();
+ var commit_info =
+ comment_section
+ .append('p')
+ .attr('class','commit-info');
+
+ commit_info.append('span').text('The changes you upload as ');
+
+ var user_link = commit_info.append('a')
+ .attr('class','user-info')
+ .text(user.display_name)
+ .attr('href', connection.url() + '/user/' + user.display_name)
+ .attr('target', '_blank');
+
+ commit_info.append('span').text(' will be visible on all maps that use OpenStreetMap data:');
+
+ if (user.image_url) {
+ user_link
+ .append('img')
+ .attr('src', user.image_url)
+ .attr('class', 'icon icon-pre-text');
+ }
+
// Confirm / Cancel Buttons
var buttonwrap = comment_section.append('div')
.attr('class', 'buttons cf')
@@ -111,7 +108,7 @@ iD.ui.commit = function(map) {
.attr('class', 'minor')
.on('click', event.fix)
.append('span')
- .attr('class', 'icon inspect');
+ .attr('class', 'icon warning');
warning_li.append('strong').text(function(d) {
return d.message;
diff --git a/js/id/ui/modal.js b/js/id/ui/modal.js
index 498f1e241..3ea341f42 100644
--- a/js/id/ui/modal.js
+++ b/js/id/ui/modal.js
@@ -16,7 +16,7 @@ iD.ui.modal = function(blocking) {
.attr('class', 'modal');
modal.append('button')
- .attr('class', 'icon remove close-modal')
+ .attr('class', 'icon close-modal')
.on('click', function() {
if (!blocking) shaded.remove();
});