splash screen + other cleanup.

This commit is contained in:
Saman Bemel-Benrud
2013-03-26 18:10:55 -04:00
parent d67dd98956
commit 3405e87cb7
12 changed files with 421 additions and 106 deletions

View File

@@ -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;

View File

@@ -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?"

View File

@@ -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",

View File

@@ -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" />
<path
transform="matrix(1.6666667,0,0,1.6666667,1058.6667,-31.97115)"
d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
d="M 32,66.5 C 32,67.328427 31.328427,68 30.5,68 29.671573,68 29,67.328427 29,66.5 29,65.671573 29.671573,65 30.5,65 c 0.828427,0 1.5,0.671573 1.5,1.5 z"
sodipodi:ry="1.5"
sodipodi:rx="1.5"
sodipodi:cy="66.5"
@@ -2132,7 +2132,7 @@
sodipodi:cy="66.5"
sodipodi:rx="1.5"
sodipodi:ry="1.5"
d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
d="M 32,66.5 C 32,67.328427 31.328427,68 30.5,68 29.671573,68 29,67.328427 29,66.5 29,65.671573 29.671573,65 30.5,65 c 0.828427,0 1.5,0.671573 1.5,1.5 z"
transform="translate(1079,12.362188)" />
<path
sodipodi:type="arc"
@@ -2142,11 +2142,11 @@
sodipodi:cy="66.5"
sodipodi:rx="1.5"
sodipodi:ry="1.5"
d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
d="M 32,66.5 C 32,67.328427 31.328427,68 30.5,68 29.671573,68 29,67.328427 29,66.5 29,65.671573 29.671573,65 30.5,65 c 0.828427,0 1.5,0.671573 1.5,1.5 z"
transform="matrix(1.6666667,0,0,1.6666667,1019.6667,-31.97115)" />
<path
transform="translate(1040,12.362188)"
d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
d="M 32,66.5 C 32,67.328427 31.328427,68 30.5,68 29.671573,68 29,67.328427 29,66.5 29,65.671573 29.671573,65 30.5,65 c 0.828427,0 1.5,0.671573 1.5,1.5 z"
sodipodi:ry="1.5"
sodipodi:rx="1.5"
sodipodi:cy="66.5"
@@ -3038,7 +3038,7 @@
inkscape:connector-curvature="0" />
<path
transform="translate(500,12.362183)"
d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
d="M 32,66.5 C 32,67.328427 31.328427,68 30.5,68 29.671573,68 29,67.328427 29,66.5 29,65.671573 29.671573,65 30.5,65 c 0.828427,0 1.5,0.671573 1.5,1.5 z"
sodipodi:ry="1.5"
sodipodi:rx="1.5"
sodipodi:cy="66.5"
@@ -3061,11 +3061,11 @@
sodipodi:cy="66.5"
sodipodi:rx="1.5"
sodipodi:ry="1.5"
d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
d="M 32,66.5 C 32,67.328427 31.328427,68 30.5,68 29.671573,68 29,67.328427 29,66.5 29,65.671573 29.671573,65 30.5,65 c 0.828427,0 1.5,0.671573 1.5,1.5 z"
transform="matrix(1.6666667,0,0,1.6666667,518.66667,-31.97115)" />
<path
transform="translate(539,12.362188)"
d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
d="M 32,66.5 C 32,67.328427 31.328427,68 30.5,68 29.671573,68 29,67.328427 29,66.5 29,65.671573 29.671573,65 30.5,65 c 0.828427,0 1.5,0.671573 1.5,1.5 z"
sodipodi:ry="1.5"
sodipodi:rx="1.5"
sodipodi:cy="66.5"
@@ -3075,7 +3075,7 @@
sodipodi:type="arc" />
<path
transform="matrix(1.6666667,0,0,1.6666667,479.66667,-31.97115)"
d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
d="M 32,66.5 C 32,67.328427 31.328427,68 30.5,68 29.671573,68 29,67.328427 29,66.5 29,65.671573 29.671573,65 30.5,65 c 0.828427,0 1.5,0.671573 1.5,1.5 z"
sodipodi:ry="1.5"
sodipodi:rx="1.5"
sodipodi:cy="66.5"
@@ -3091,7 +3091,7 @@
sodipodi:cy="66.5"
sodipodi:rx="1.5"
sodipodi:ry="1.5"
d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
d="M 32,66.5 C 32,67.328427 31.328427,68 30.5,68 29.671573,68 29,67.328427 29,66.5 29,65.671573 29.671573,65 30.5,65 c 0.828427,0 1.5,0.671573 1.5,1.5 z"
transform="translate(500,12.362188)" />
</g>
<g
@@ -3823,5 +3823,99 @@
id="g4713"
transform="translate(551,1)" />
</g>
<g
id="category-rail"
inkscape:label="#g26461"
transform="translate(830,3.828125e-7)">
<rect
style="color:#000000;fill:none;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect17520-3"
width="60"
height="60"
x="830"
y="37.362183" />
<path
inkscape:connector-curvature="0"
id="rect17528-7-7"
d="m 853.5,55.362183 -1.5,1 -0.4688,2 -3.2812,0 c -0.554,0 -0.8656,0.462541 -1,1 l -0.25,1 c -0.1344,0.537459 0.446,1 1,1 l 24,0 c 0.554,0 1.1344,-0.462541 1,-1 l -0.25,-1 c -0.1344,-0.537459 -0.446,-1 -1,-1 l -2.7812,0 -0.4688,-2 -1.5,-1 -1,1 0.4688,2 -12.4376,0 0.4688,-2 -1,-1 z m -2,4 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m 17,0 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m -17.9375,3 -0.4687,2 -2.8438,0 c -0.554,0 -0.8656,0.462541 -1,1 l -0.25,1 c -0.1344,0.537459 0.446,1 1,1 l 26,0 c 0.554,0 1.1344,-0.462541 1,-1 l -0.25,-1 c -0.1344,-0.537459 -0.446,-1 -1,-1 l -2.3438,0 -0.4687,-2 -2.5,0 0.4687,2 -15.3124,0 0.4687,-2 -2.5,0 z m -0.0625,3 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m 19,0 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m -20.3438,3 -0.4687,2 -2.4375,0 c -0.554,0 -0.8656,0.462541 -1,1 l -0.25,1 c -0.1344,0.537459 0.446,1 1,1 l 28,0 c 0.554,0 1.1344,-0.462541 1,-1 l -0.25,-1 c -0.1344,-0.537459 -0.446,-1 -1,-1 l -1.9375,0 -0.4687,-2 -2.5,0 0.4687,2 -18.125,0 0.4687,-2 -2.5,0 z m 0.3438,3 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m 21,0 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m -22.7812,3 -0.7188,3 1.5,1 1,-1 0.7188,-3 -2.5,0 z m 22.5624,0 0.7188,3 1,1 1.5,-1 -0.7188,-3 -2.5,0 z"
style="color:#000000;fill:#989898;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
</g>
<g
inkscape:label=""
id="category-path"
transform="translate(1110,0)">
<rect
style="color:#000000;fill:none;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect5008-3"
width="60"
height="60"
x="610"
y="37.362183" />
<path
style="color:#000000;fill:#ae8681;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 632,78.362183 3,-11 3,-11 4,0 3,11 3,11 z"
id="path26176-5-3"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc" />
</g>
<g
id="category-water"
inkscape:label="#g7302"
transform="translate(1390,3.828125e-7)">
<rect
style="color:#000000;fill:none;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect24307-1"
width="60"
height="60"
x="390"
y="37.362183" />
<path
inkscape:label="#path24321"
sodipodi:nodetypes="cscscscsccscscscscc"
inkscape:connector-curvature="0"
id="245-3"
d="m 406.76193,78.362183 c 0,0 -0.53638,-1.846128 -0.34524,-2.75 0.22134,-1.046677 1.65476,-2.75 1.65476,-2.75 0,0 1.43342,-1.703323 1.65476,-2.75 0.19114,-0.903872 -0.34524,-2.75 -0.34524,-2.75 0,0 -0.53639,-1.846127 -0.34525,-2.75 0.22134,-1.046678 1.65476,-2.75 1.65476,-2.75 0,0 1.43342,-1.703323 1.65476,-2.75 0.19114,-0.903872 -0.34524,-2.75 -0.34524,-2.75 l 16.5,0 c 0,0 1.43342,1.703323 1.65476,2.75 0.19115,0.903872 -0.34523,2.75 -0.34523,2.75 0,0 -0.53638,1.846128 -0.34524,2.75 0.22134,1.046679 1.65477,2.75 1.65477,2.75 0,0 1.43342,1.703323 1.65476,2.75 0.19115,0.903872 -0.34523,2.75 -0.34523,2.75 0,0 -0.53638,1.846128 -0.34524,2.75 0.22134,1.046679 1.65477,2.75 1.65477,2.75 z"
style="color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
transform="matrix(0.48296291,0.12940952,-0.19411409,0.72444365,27.631711,-71.388519)"
d="m 808,51 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
sodipodi:ry="2"
sodipodi:rx="2"
sodipodi:cy="51"
sodipodi:cx="806"
id="path25543-0"
style="opacity:0.5;color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
sodipodi:type="arc"
style="opacity:0.5;color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path25545-0"
sodipodi:cx="806"
sodipodi:cy="51"
sodipodi:rx="2"
sodipodi:ry="2"
d="m 808,51 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
transform="matrix(0.64951905,0.375,-0.50000001,0.86602541,-89.512357,-287.05512)" />
<path
sodipodi:type="arc"
style="opacity:0.5;color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path25547-3"
sodipodi:cx="806"
sodipodi:cy="51"
sodipodi:rx="2"
sodipodi:ry="2"
d="m 808,51 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
transform="matrix(-0.48296291,0.12940952,0.19411409,0.72444365,811.75652,-77.439629)" />
<path
transform="matrix(-0.64951905,0.375,0.50000001,0.86602541,933.61049,-272.05512)"
d="m 808,51 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
sodipodi:ry="2"
sodipodi:rx="2"
sodipodi:cy="51"
sodipodi:cx="806"
id="path25549-8"
style="opacity:0.5;color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 324 KiB

After

Width:  |  Height:  |  Size: 332 KiB

View File

@@ -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">
<defs
id="defs12395">
<clipPath
@@ -38,9 +38,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="4"
inkscape:cx="382.23632"
inkscape:cy="299.5493"
inkscape:zoom="1"
inkscape:cx="81.123179"
inkscape:cy="108.45595"
inkscape:document-units="px"
inkscape:current-layer="layer12"
showgrid="false"
@@ -56,8 +56,10 @@
showguides="true"
inkscape:guide-bbox="true"
inkscape:snap-bbox="true"
inkscape:snap-nodes="true"
inkscape:snap-global="true">
inkscape:snap-nodes="false"
inkscape:snap-global="true"
inkscape:object-nodes="true"
inkscape:object-paths="true">
<inkscape:grid
type="xygrid"
id="grid12420"
@@ -155,16 +157,8 @@
id="guide47496" />
<sodipodi:guide
orientation="1,0"
position="320,311"
position="300,85"
id="guide14115" />
<sodipodi:guide
orientation="1,0"
position="360,310"
id="guide3406" />
<sodipodi:guide
orientation="1,0"
position="380,305"
id="guide3408" />
<sodipodi:guide
orientation="1,0"
position="240,316"
@@ -2106,5 +2100,201 @@
id="path3874"
d="m 251,24.999997 1.125,-1 6.75,0 1.125,1 0,10 -1.125,1 -3.375,-2.886751 -3.375,2.886751 -1.125,-1 z"
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" />
<rect
style="opacity:0.14999999999999999;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect6623-9"
width="100"
height="100"
x="225"
y="220" />
<g
transform="translate(375,-25.000003)"
style="display:inline"
id="g7459-3">
<path
sodipodi:nodetypes="ccccccccccc"
inkscape:connector-curvature="0"
id="path6625-8"
d="m -145,255 0,74.66666 L -122.5,340 -100,330 -77.5,340 -55,329.66666 -55,255 l -22.5,10 -22.5,-10 -22.5,10 z"
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" />
<path
inkscape:connector-curvature="0"
id="path7440-7"
d="m -112.78125,290.90625 -0.40625,3.96875 0.5625,0.0625 0.15625,0.0312 0.9375,0.15625 0.0312,0 0.125,0.0312 0.8125,0.21875 0.15625,0.0625 0.0312,0 0.71875,0.25 0.0625,0.0312 0.0937,0.0312 0.65625,0.3125 0.75,0.40625 0.125,0.0937 0.53125,0.34375 0.0625,0.0625 0.0625,0.0312 0.375,0.3125 2.53125,-3.09375 -0.5,-0.40625 -0.125,-0.0937 -0.8125,-0.5625 -0.15625,-0.0937 -0.875,-0.5 -0.15625,-0.0625 -0.96875,-0.46875 -0.15625,-0.0625 -1.0625,-0.375 -0.15625,-0.0312 -1.15625,-0.3125 -0.15625,-0.0312 -1.25,-0.21875 -0.125,-0.0312 -0.71875,-0.0625 z m -4.84375,0.375 -0.0625,0.0312 -0.21875,0.0937 -0.625,0.3125 -0.15625,0.0937 -0.625,0.375 -0.125,0.0937 -0.59375,0.46875 -0.125,0.0937 -0.5625,0.5 -0.0937,0.0937 -0.5625,0.5625 -0.0937,0.125 -1.0625,1.25 -0.125,0.125 -0.96875,1.4375 -0.0937,0.0937 -0.4375,0.71875 3.40625,2.09375 0.46875,-0.71875 -0.0312,0 0.84375,-1.1875 0.0312,-0.0312 0.0625,-0.0937 0.84375,-1 0.125,-0.125 0.34375,-0.34375 0.0937,-0.0937 0.34375,-0.3125 0.125,-0.125 0.46875,-0.34375 0.28125,-0.15625 0.40625,-0.21875 0.0625,-0.0312 0.15625,-0.0625 -0.625,-1.21875 -0.875,-2.5 z m 33.46875,6.28125 -0.125,0.375 -0.03125,0.125 -0.34375,1 -0.03125,0.0937 -0.03125,0.0625 -0.65625,1.5 -0.03125,0.0937 -0.03125,0.0312 -0.40625,0.78125 -0.0625,0.0937 -0.46875,0.8125 -0.09375,0.125 -0.5625,0.78125 -0.03125,0.0312 -0.0625,0.0937 -0.28125,0.34375 3.0625,2.5625 0.375,-0.46875 0.125,-0.125 0.71875,-1.03125 0.09375,-0.125 0.625,-1.03125 0.0625,-0.0937 0.53125,-1.03125 0.0625,-0.125 0.75,-1.78125 0.0625,-0.125 0.4375,-1.28125 0.03125,-0.0937 0.15625,-0.46875 -3.84375,-1.125 z m -17.21875,0.0937 -3.34375,2.21875 0.40625,0.59375 0.0937,0.125 0.71875,1.3125 0.0625,0.0937 1.46875,2.9375 0.0312,0.0312 0.71875,1.40625 0.0937,0.125 0.21875,0.375 3.375,-2.15625 -0.21875,-0.375 -0.65625,-1.1875 -0.0312,-0.0625 -1.46875,-2.96875 -0.0625,-0.0937 -0.84375,-1.53125 -0.0937,-0.125 -0.46875,-0.71875 z m -24.75,3.8125 -0.1875,0.375 -0.0312,0.0625 -0.65625,1.5 -0.0312,0.0625 -1.0625,2.6875 -0.0312,0.0625 -0.65625,1.90625 -0.0312,0.0625 -0.21875,0.71875 3.8125,1.1875 0.1875,-0.65625 0.0312,0 0.625,-1.8125 0.0312,-0.0937 1,-2.5 0.0312,-0.0937 0.59375,-1.375 0.0312,-0.0625 0.15625,-0.3125 -3.59375,-1.71875 z m 36.25,4.625 -0.53125,0.3125 -0.09375,0.0312 -0.09375,0.0625 -0.46875,0.1875 0,0.0312 -0.375,0.125 -0.15625,0.0625 L -92,307 l -0.59375,0.125 -0.15625,0.0312 -0.625,0.0625 -0.46875,0.0312 -0.09375,0 -0.09375,0 -0.46875,-0.0312 -0.5625,-0.125 -0.40625,-0.15625 -0.125,-0.0625 -1.8125,3.5625 0.40625,0.1875 0.25,0.125 0.65625,0.21875 0.25,0.0625 0.71875,0.125 0.25,0.0312 0.78125,0.0625 0.21875,0 0.8125,-0.0312 0.15625,0 0.78125,-0.0937 0.15625,-0.0312 0.75,-0.15625 0.15625,-0.0312 0.71875,-0.21875 0.125,-0.0312 0.6875,-0.25 0.15625,-0.0625 0.625,-0.3125 0.1875,-0.0937 0.71875,-0.40625 -2.03125,-3.4375 z"
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;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:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
</g>
<path
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;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:#ffffff;fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
d="M 262.40625 253.59375 L 259.59375 256.40625 L 265.1875 262 L 259.59375 267.59375 L 262.40625 270.40625 L 268 264.8125 L 273.59375 270.40625 L 276.40625 267.59375 L 270.8125 262 L 276.40625 256.40625 L 273.59375 253.59375 L 268 259.1875 L 262.40625 253.59375 z "
transform="translate(25,-3.0624999e-6)"
id="path7490" />
<rect
style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect6623-9-2"
width="100"
height="100"
x="325"
y="220" />
<path
inkscape:connector-curvature="0"
id="path8139-4-6-3"
d="m 392.5314,229 c -8.2842,0 -15,6.71574 -15,15 0,8.28429 15,21 15,21 0,0 15,-12.71571 15,-21 0,-8.28426 -6.7158,-15 -15,-15 z M 393,238 c 3.3138,0 6,2.68629 6,6 0,3.31371 -2.6862,6 -6,6 -3.3135,0 -6,-2.68629 -6,-6 0,-3.31371 2.6865,-6 6,-6 z"
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" />
<path
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"
d="m 403,274 -24,24 5,5 24,-24 z"
id="path5387-6-5"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
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"
d="m 338,260.34375 0,21.3125 6.34375,7.34375 20.3125,0 L 372,281.65625 372,260.34375 361.65625,255 l -17.3125,0 z m 9.34375,1.65625 15.3125,0 2.34375,1.34375 0,18.3125 -0.34375,0.34375 -18.3125,0 -1.34375,-0.34375 0,-17.3125 z"
id="path5288-4-8-0"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccccccccccc" />
<g
id="g7659">
<path
transform="matrix(15,0,0,15,-5344,-3829)"
d="m 384,273.5 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
sodipodi:ry="0.5"
sodipodi:rx="0.5"
sodipodi:cy="273.5"
sodipodi:cx="383.5"
id="path7654"
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"
sodipodi:type="arc" />
<path
sodipodi:type="arc"
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"
id="path7656"
sodipodi:cx="383.5"
sodipodi:cy="273.5"
sodipodi:rx="0.5"
sodipodi:ry="0.5"
d="m 384,273.5 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
transform="matrix(6,0,0,6,-1892.5,-1367.5)" />
</g>
<g
id="g7663"
transform="translate(-28,28)">
<path
sodipodi:type="arc"
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="path7665"
sodipodi:cx="383.5"
sodipodi:cy="273.5"
sodipodi:rx="0.5"
sodipodi:ry="0.5"
d="m 384,273.5 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
transform="matrix(15,0,0,15,-5344,-3829)" />
<path
transform="matrix(6,0,0,6,-1892.5,-1367.5)"
d="m 384,273.5 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
sodipodi:ry="0.5"
sodipodi:rx="0.5"
sodipodi:cy="273.5"
sodipodi:cx="383.5"
id="path7667"
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"
sodipodi:type="arc" />
</g>
<g
id="g7690"
transform="translate(1.625,1.3749969)">
<path
transform="matrix(15,0,0,15,-5385.625,-3818.375)"
d="m 384,273.5 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
sodipodi:ry="0.5"
sodipodi:rx="0.5"
sodipodi:cy="273.5"
sodipodi:cx="383.5"
id="path7665-4"
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"
sodipodi:type="arc" />
<path
sodipodi:type="arc"
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"
id="path7667-1"
sodipodi:cx="383.5"
sodipodi:cy="273.5"
sodipodi:rx="0.5"
sodipodi:ry="0.5"
d="m 384,273.5 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
transform="matrix(6,0,0,6,-1934.125,-1356.875)" />
</g>
<g
transform="translate(-25.375,1.3749969)"
id="g7694">
<path
sodipodi:type="arc"
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="path7696"
sodipodi:cx="383.5"
sodipodi:cy="273.5"
sodipodi:rx="0.5"
sodipodi:ry="0.5"
d="m 384,273.5 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
transform="matrix(15,0,0,15,-5385.625,-3818.375)" />
<path
transform="matrix(6,0,0,6,-1934.125,-1356.875)"
d="m 384,273.5 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
sodipodi:ry="0.5"
sodipodi:rx="0.5"
sodipodi:cy="273.5"
sodipodi:cx="383.5"
id="path7698"
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"
sodipodi:type="arc" />
</g>
<g
transform="translate(1.625,-25.625003)"
id="g7700">
<path
sodipodi:type="arc"
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="path7702"
sodipodi:cx="383.5"
sodipodi:cy="273.5"
sodipodi:rx="0.5"
sodipodi:ry="0.5"
d="m 384,273.5 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
transform="matrix(15,0,0,15,-5385.625,-3818.375)" />
<path
transform="matrix(6,0,0,6,-1934.125,-1356.875)"
d="m 384,273.5 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
sodipodi:ry="0.5"
sodipodi:rx="0.5"
sodipodi:cy="273.5"
sodipodi:cx="383.5"
id="path7704"
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"
sodipodi:type="arc" />
</g>
<g
id="g7706"
transform="translate(-25.375,-25.625003)">
<path
transform="matrix(15,0,0,15,-5385.625,-3818.375)"
d="m 384,273.5 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
sodipodi:ry="0.5"
sodipodi:rx="0.5"
sodipodi:cy="273.5"
sodipodi:cx="383.5"
id="path7708"
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"
sodipodi:type="arc" />
<path
sodipodi:type="arc"
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"
id="path7710"
sodipodi:cx="383.5"
sodipodi:cy="273.5"
sodipodi:rx="0.5"
sodipodi:ry="0.5"
d="m 384,273.5 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
transform="matrix(6,0,0,6,-1934.125,-1356.875)" />
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 136 KiB

After

Width:  |  Height:  |  Size: 150 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 57 KiB

View File

@@ -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');

View File

@@ -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'))

View File

@@ -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)

View File

@@ -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');

View File

@@ -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: '<a href="http://ideditor.com/">ideditor.com</a>',
github: '<a href="https://github.com/systemed/iD">github.com</a>'
}));
modal.select('button.close').attr('class','hide');
};
};