diff --git a/css/app.css b/css/app.css index 4cf72174d..f30a4570f 100644 --- a/css/app.css +++ b/css/app.css @@ -916,6 +916,66 @@ div.typeahead a:first-child { left:0px; right:0px; top:0px; bottom:0px; } +.modal-section { + padding: 20px; +} + +.modal-section.header { + border-radius: 4px 4px 0 0; +} + +.modal-section:last-child { + border-radius: 0 0 4px 4px; +} + +.modal-section:only-child { + border-radius: 4px; +} + +.modal-section .buttons { + padding-top: 10px; + width: 100%; +} + +.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; +} + +.loading-modal { + text-align: center; +} + +/* Splash Modal +------------------------------------------------------- */ + +.modal-splash { + width: 33.3333%; + left: 33.3333%; +} + +.logo { + height: 100px; + width: 100px; + margin: 0 auto 20px auto; + background: url(../img/logo.png) 0 0 repeat; +} + +/* Commit Modal +------------------------------------------------------- */ + .commit-modal .user-info { display: inline-block; } @@ -977,10 +1037,6 @@ div.typeahead a:first-child { border-radius: 4px 4px 0 0; } -.modal-section:last-child { - border-radius: 0 0 4px 4px; -} - .modal-section .buttons { padding-top: 10px; width: 100%; diff --git a/img/logo.png b/img/logo.png new file mode 100644 index 000000000..6afa01f1b Binary files /dev/null and b/img/logo.png differ diff --git a/img/source/logo.svg b/img/source/logo.svg new file mode 100644 index 000000000..bf3841f90 --- /dev/null +++ b/img/source/logo.svg @@ -0,0 +1,1205 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + iD + + + + + + + + + + + + + + + + + + + + + + + + + A javascript OpenStreetMap Editor + + + + + + + + + + + iD + + + + + + + + + + + + + + + + + + + + + + + A Javascript OpenStreetMap Editor + + + + + + + + + + + + + + + + + + + + + + + D3.js + + + + + + iD + + + + + + + + + + + iD + + + diff --git a/index.html b/index.html index deadb5add..330029e96 100644 --- a/index.html +++ b/index.html @@ -69,6 +69,7 @@ + @@ -135,4 +136,15 @@ d3.select("#iD").call(id); }); + + diff --git a/js/id/id.js b/js/id/id.js index ab6dd37f2..ac700f846 100644 --- a/js/id/id.js +++ b/js/id/id.js @@ -245,6 +245,11 @@ window.iD = function(container) { .on('login.editor', connection.authenticate)); controller.enter(iD.modes.Browse()); + + if (!localStorage.sawSplash) { + iD.ui.splash(); + localStorage.sawSplash = true; + } } editor.connection = function(_) { diff --git a/js/id/ui/splash.js b/js/id/ui/splash.js new file mode 100644 index 000000000..43489fab1 --- /dev/null +++ b/js/id/ui/splash.js @@ -0,0 +1,16 @@ +iD.ui.splash = function() { + var modal = iD.ui.modal(); + + modal.select('.modal') + .attr('class', 'modal-splash modal') + + var introModal = modal.select('.content') + .append('div') + .attr('class', 'modal-section fillL'); + + introModal.append('div').attr('class','logo'); + + introModal.append('div').html("

Welcome to the iD OpenStreetMap editor

This is development version 0.0.0-alpha1. For more information see ideditor.com and report bugs at github.com.systemed/iD.

"); + + return modal; +}; \ No newline at end of file diff --git a/test/index.html b/test/index.html index 12cf31886..c65237b22 100644 --- a/test/index.html +++ b/test/index.html @@ -66,6 +66,7 @@ +