diff --git a/css/app.css b/css/app.css
index c588972f7..296985c5b 100644
--- a/css/app.css
+++ b/css/app.css
@@ -6,7 +6,7 @@ body {
margin:0;
padding:0;
min-width: 768px;
- color:#222;
+ color:#333;
overflow: hidden;
/* text-rendering: optimizeLegibility; */
-webkit-font-smoothing: subpixel-antialiased;
@@ -286,8 +286,6 @@ a.hide {
box-shadow: 0 0 30px 0px rgba(0, 0, 0, 0.7);
}
-.pad1 {padding: 10px;}
-
.loading {
background: url(../img/loader_bg.gif);
background-size:5px 5px;
@@ -320,6 +318,7 @@ button {
line-height:20px;
border:0;
background: white;
+ color:#333;
font-weight:bold;
font-size:12px;
display: inline-block;
@@ -570,6 +569,7 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;}
#bar {
position:absolute;
+ padding: 10px;
left:0px;
top:0px;
right:0;
@@ -721,7 +721,7 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;}
}
.inspector-body-line .grid-entry > .icon {
- top: 10px;
+ top: 15px;
left: -10px;
right: -10px;
}
@@ -748,7 +748,7 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;}
.current .grid-entry,
.current .grid-entry .label {
- background-color: #eef0ff;
+ background-color: #E8EBFF;
}
.category .grid-entry:after,
@@ -1108,6 +1108,11 @@ input[type=number] {
border-radius: 0;
border-right: 1px solid #CCC;
width: 22.5%;
+ color: #7092FF;
+}
+
+.radio-wrap button.active {
+ background-color: #E8EBFF !important;
}
.radio-wrap button:last-child {
@@ -1378,6 +1383,10 @@ img.wiki-image {
margin-top: 10px;
}
+.background-control .adjustments {
+ padding: 10px;
+}
+
.background-control .adjustments button {
height:30px;
font-size:10px;
@@ -1613,7 +1622,7 @@ img.wiki-image {
}
.help-wrap .toc li a.selected {
- background: #eef0ff;
+ background: #E8EBFF;
}
.help-wrap .toc li:first-child a {
@@ -1822,18 +1831,70 @@ div.typeahead a:first-child {
text-align: center;
}
-/* Splash Modal
+.modal a.action, .modal button.action {
+ font-weight: normal;
+ color: #7092FF;
+ background-color: white;
+ border-bottom: 1px solid #CCC;
+ border-radius: 0;
+ height: 180px;
+ text-align: center;
+ -webkit-transition: all 200ms;
+ -moz-transition: all 200ms;
+ transition: all 200ms;
+}
+
+.modal a.action:hover, .modal button.action:hover {
+ background-color: #ececec;
+}
+
+a.action:before,
+.modal button.action:before {
+ display: block;
+ content: '';
+ height: 100px;
+ width: 100px;
+ margin: auto;
+ margin-bottom: 10px;
+ background:transparent url(../img/sprite.png) no-repeat 0px -220px;
+}
+
+/* Success Modal
------------------------------------------------------- */
-.modal-splash {
- width: 33.3333%;
+a.action.osm {
+ border-right: 1px solid #CCC;
}
+a.action.twitter:before {
+ background-position: -100px -220px;
+}
+
+/* Splash Modal
+------------------------------------------------------- */
+
.logo {
height: 100px;
width: 100px;
- margin: 0 auto 20px auto;
background: url(../img/logo.png) 0 0 repeat;
+ margin: auto;
+}
+
+.modal-splash h3 {
+ padding-top: 20px;
+ text-align: center;
+ }
+
+.modal-splash .action.start {
+ border-left: 1px solid #CCC;
+}
+
+.modal-splash .action.walkthrough:before {
+ background-position: -200px -220px;
+}
+
+.modal-splash .action.start:before {
+ background-position: -300px -220px;
}
/* Commit Modal
@@ -1899,40 +1960,6 @@ div.typeahead a:first-child {
.changeset-list li:first-child { border-top: 0;}
-/* Success
-------------------------------------------------------- */
-
-.modal a.success-action {
- height: 170px;
- 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: 10px;
- background:transparent url(../img/sprite.png) no-repeat 0px -220px;
-}
-
-a.success-action.twitter:before {
- background-position: -100px -220px;
-}
-
/* Notices
------------------------------------------------------- */
@@ -1973,6 +2000,7 @@ a.success-action.twitter:before {
width: 200px;
position: absolute;
display: none;
+ color:#333;
}
.tooltip.in {
@@ -2005,8 +2033,8 @@ a.success-action.twitter:before {
.tooltip-inner {
display: inline-block;
padding: 10px;
- font-size: 11px;
- font-weight: bold;
+ font-size: 12px;
+ font-weight: normal;
background-color: white;
}
@@ -2268,9 +2296,9 @@ a.success-action.twitter:before {
.intro-nav-wrap {
position: absolute;
- left: 30px;
- right: 500px;
- bottom: 30px;
+ left: 10px;
+ right: 10px;
+ bottom: 40px;
border-radius: 4px;
background: rgba(255, 255, 255, 0.8);
z-index: 1001;
diff --git a/data/core.yaml b/data/core.yaml
index 6f38a68ad..953642857 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -163,9 +163,9 @@ en:
unsaved_changes: You have unsaved changes
splash:
welcome: Welcome to the iD OpenStreetMap editor
- text: "This is development version {version}. For more information see {website} and report bugs at {github}."
- walkthrough: Walkthrough
- start: Start Editing
+ text: "iD is a friendly but powerful tool for contributing to the world's best free world map. This is development version {version}. For more information see {website} and report bugs at {github}."
+ walkthrough: "Start the walkthrough"
+ start: "Edit now"
source_switch:
live: live
lose_changes: "You have unsaved changes. Switching the map server will discard them. Are you sure you want to switch servers?"
diff --git a/data/locales.js b/data/locales.js
index d33af171b..d48e24853 100644
--- a/data/locales.js
+++ b/data/locales.js
@@ -139,7 +139,7 @@ locale.en = {
"nothing_to_redo": "Nothing to redo.",
"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 →",
+ "view_on_osm": "View on OSM",
"zoom_in_edit": "zoom in to edit the map",
"logout": "logout",
"report_a_bug": "report a bug",
@@ -202,10 +202,10 @@ locale.en = {
"unsaved_changes": "You have unsaved changes"
},
"splash": {
- "welcome": "Welcome to the iD OpenStreetMap editor",
- "text": "This is development version {version}. For more information see {website} and report bugs at {github}.",
- "walkthrough": "Walkthrough",
- "start": "Start Editing"
+ "welcome": "Welcome to the iD OpenStreetMap Editor",
+ "text": "iD is a friendly but powerful tool for contributing to the world's best free world map. This is development version {version}. For more information see {website} and report bugs at {github}.",
+ "walkthrough": "Start the walkthrough",
+ "start": "Edit now"
},
"source_switch": {
"live": "live",
diff --git a/img/source/line-presets.svg b/img/source/line-presets.svg
index 2dde38edf..405d77371 100644
--- a/img/source/line-presets.svg
+++ b/img/source/line-presets.svg
@@ -228,21 +228,21 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="1"
- inkscape:cx="1791.8182"
- inkscape:cy="52.162498"
+ inkscape:cx="1616.8605"
+ inkscape:cy="25.644225"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1721"
inkscape:window-height="881"
- inkscape:window-x="0"
- inkscape:window-y="0"
+ inkscape:window-x="22"
+ inkscape:window-y="32"
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-nodes="true"
inkscape:snap-bbox="true"
@@ -2116,7 +2116,7 @@
y="78.362183" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/img/source/sprite.svg b/img/source/sprite.svg
index ef9cfd4fe..12bb15915 100644
--- a/img/source/sprite.svg
+++ b/img/source/sprite.svg
@@ -15,9 +15,9 @@
version="1.1"
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"
- inkscape:export-ydpi="90">
+ inkscape:export-filename="/Users/saman/work_repos/iD/img/sprite2x.png"
+ inkscape:export-xdpi="180"
+ inkscape:export-ydpi="180">
+ inkscape:snap-nodes="false"
+ inkscape:snap-global="true"
+ inkscape:object-nodes="true"
+ inkscape:object-paths="true">
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/img/sprite.png b/img/sprite.png
index f55d749fd..5f4a91d67 100644
Binary files a/img/sprite.png and b/img/sprite.png differ
diff --git a/img/sprite2x.png b/img/sprite2x.png
index 7836189c7..93e093db1 100644
Binary files a/img/sprite2x.png and b/img/sprite2x.png differ
diff --git a/js/id/ui.js b/js/id/ui.js
index 6924412d4..b8540f9fd 100644
--- a/js/id/ui.js
+++ b/js/id/ui.js
@@ -31,7 +31,7 @@ iD.ui = function(context) {
var bar = container.append('div')
.attr('id', 'bar')
- .attr('class','pad1 fillD');
+ .attr('class','fillD');
var limiter = bar.append('div')
.attr('class', 'limiter');
diff --git a/js/id/ui/background.js b/js/id/ui/background.js
index 0595875c2..072236006 100644
--- a/js/id/ui/background.js
+++ b/js/id/ui/background.js
@@ -237,7 +237,7 @@ iD.ui.Background = function(context) {
var adjustments = content
.append('div')
- .attr('class', 'adjustments pad1');
+ .attr('class', 'adjustments');
adjustments.append('a')
.text(t('background.fix_misalignment'))
diff --git a/js/id/ui/intro.js b/js/id/ui/intro.js
index 71e42c570..e13b8b8ab 100644
--- a/js/id/ui/intro.js
+++ b/js/id/ui/intro.js
@@ -40,10 +40,10 @@ iD.ui.intro = function(context) {
}
});
- var navwrap = selection.append('div').attr('class', 'intro-nav-wrap');
+ var navwrap = selection.append('div').attr('class', ' col12 intro-nav-wrap');
var buttonwrap = navwrap.append('div')
- .attr('class', 'col12 button-wrap joined')
+ .attr('class', 'button-wrap joined')
.selectAll('button.step');
var entered = buttonwrap.data(steps)
diff --git a/js/id/ui/restore.js b/js/id/ui/restore.js
index b1dd64e33..2ff639f31 100644
--- a/js/id/ui/restore.js
+++ b/js/id/ui/restore.js
@@ -22,7 +22,6 @@ iD.ui.Restore = function(context) {
.append('p')
.text(t('restore.description'));
-
var buttonWrap = introModal.append('div')
.attr('class', 'modal-section col12');
diff --git a/js/id/ui/splash.js b/js/id/ui/splash.js
index add6a394e..d18bc7bf7 100644
--- a/js/id/ui/splash.js
+++ b/js/id/ui/splash.js
@@ -1,31 +1,30 @@
iD.ui.Splash = function(context) {
return function(selection) {
- if (context.storage('sawSplash'))
- return;
+ // if (context.storage('sawSplash'))
+ // return;
context.storage('sawSplash', true);
var modal = iD.ui.modal(selection);
modal.select('.modal')
- .attr('class', 'modal-splash modal');
+ .attr('class', 'modal-splash modal col6');
var introModal = modal.select('.content')
.append('div')
- .attr('class', 'modal-section fillL');
+ .attr('class', 'fillL');
- introModal.append('div')
- .attr('class', 'logo');
+ var header = introModal.append('div')
+ .attr('class','modal-section cf');
- var div = introModal.append('div');
+ header.append('div').attr('class', 'logo');
- div.append("h2")
- .text(t('splash.welcome'));
+ header.append('h3').text(t('splash.welcome'));
- var buttons = div.append('div').attr('class', 'col12 button-wrap joined');
+ var buttons = introModal.append('div').attr('class', 'cf');
buttons.append('button')
- .attr('class', 'col6')
+ .attr('class', 'col6 action modal-section walkthrough')
.text(t('splash.walkthrough'))
.on('click', function() {
d3.select(document.body).call(iD.ui.intro(context));
@@ -33,17 +32,22 @@ iD.ui.Splash = function(context) {
});
buttons.append('button')
- .attr('class', 'col6')
+ .attr('class', 'col6 action modal-section start')
.text(t('splash.start'))
.on('click', function() {
modal.remove();
});
- div.append("p")
+ introModal.append('div')
+ .attr('class','modal-section')
+ .append('p')
.html(t('splash.text', {
version: iD.version,
website: 'ideditor.com',
github: 'github.com'
}));
+
+ modal.select('button.close').attr('class','hide');
+
};
};