minor fixes.

This commit is contained in:
Saman Bemel-Benrud
2013-01-31 15:54:14 -05:00
9 changed files with 1305 additions and 10 deletions
+56 -6
View File
@@ -440,7 +440,7 @@ button[disabled] .label {
.icon.geolocate { background-position: -360px 0px;}
.icon.warning { background-position: -380px 0px;}
.icon.close-modal { background-position: -200px -40px;}
.icon.close-modal { background-position: -200px 0px;}
.fillD .icon.avatar { background-position: -320px -20px;}
.fillD .icon.nearby { background-position: -340px -20px;}
@@ -911,10 +911,14 @@ div.typeahead a:first-child {
position: absolute;
right:5px;
top:5px;
border:0;
opacity: .5;
-webkit-transition: opacity 100ms;
-moz-transition: opacity 100ms;
transition: opacity 100ms;
}
.modal button.close-modal:hover {
background-color: transparent;
opacity: 1;
}
.shaded {
@@ -932,7 +936,7 @@ div.typeahead a:first-child {
padding: 20px;
}
.modal-section.header {
.modal-section:first-child {
border-radius: 4px 4px 0 0;
}
@@ -940,6 +944,10 @@ div.typeahead a:first-child {
border-radius: 0 0 4px 4px;
}
.modal-section:only-child {
border-radius: 4px;
}
.modal-section .buttons {
padding-top: 10px;
width: 100%;
@@ -966,10 +974,25 @@ div.typeahead a:first-child {
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 {
.commit-modal a.user-info {
display: inline-block;
}
@@ -1012,11 +1035,38 @@ div.typeahead a:first-child {
.commit-section.modal-section:last-child { padding-bottom: 20px;}
.changeset-list li {
.commit-modal .changeset-list li {
position: relative;
border-top:1px solid #ccc;
padding:5px 10px;
}
.modal-section {
padding: 20px;
}
.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;
}
.changeset-list li span.count {
font-size:10px;
color:#555;
@@ -1257,5 +1307,5 @@ a.success-action {
span.label {display: none;}
/* override hide for save button */
.icon.icon-pre-text { margin-right: 0px;}
.save .label, .apply .label { display: block;}
.save .label, .apply .label, .cancel .label { display: block;}
}
BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

+1205
View File
File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 65 KiB

+10 -4
View File
@@ -39,8 +39,8 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="4"
inkscape:cx="332.2911"
inkscape:cy="175.13176"
inkscape:cx="202.2911"
inkscape:cy="164.38176"
inkscape:document-units="px"
inkscape:current-layer="layer12"
showgrid="false"
@@ -1344,10 +1344,16 @@
style="fill:#ffffff;fill-opacity:1;display:inline" />
</g>
<path
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 231,4.9999992 -1,1 0,1 3,3 -3,2.9999998 0,1 1,1 1,0 3,-3 3,3 1,0 1,-1 0,-1 -3,-2.9999998 3,-3 0,-1 -1,-1 -1,0 -3,3 -3,-3 z"
style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 231,44.999999 -1,1 0,1 3,3 -3,3 0,1 1,1 1,0 3,-3 3,3 1,0 1,-1 0,-1 -3,-3 3,-3 0,-1 -1,-1 -1,0 -3,3 -3,-3 z"
id="path11047"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccccccccccccccccc" />
<path
sodipodi:nodetypes="ccccccccccccccccccccc"
inkscape:connector-curvature="0"
id="path4246"
d="m 231,4.999999 -1,1 0,1 3,3 -3,3 0,1 1,1 1,0 3,-3 3,3 1,0 1,-1 0,-1 -3,-3 3,-3 0,-1 -1,-1 -1,0 -3,3 -3,-3 z"
style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 87 KiB

BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

+12
View File
@@ -69,6 +69,7 @@
<script src='js/id/ui/notice.js'></script>
<script src='js/id/ui/flash.js'></script>
<script src='js/id/ui/save.js'></script>
<script src='js/id/ui/splash.js'></script>
<script src='js/id/ui/tag_reference.js'></script>
<script src='js/id/ui/key_reference.js'></script>
@@ -140,4 +141,15 @@
d3.select("#iD").call(id);
});
</script></body>
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-38039653-2']);
_gaq.push(['_trackPageview']);
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
</html>
+5
View File
@@ -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(_) {
+16
View File
@@ -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("<h2 class>Welcome to the iD OpenStreetMap editor</h2><p>This is development version 0.0.0-alpha1. For more information see <a href='http://ideditor.com/'>ideditor.com</a> and report bugs at <a href='https://github.com'>github.com.systemed/iD</a>.</p>");
return modal;
};
+1
View File
@@ -66,6 +66,7 @@
<script src='../js/id/ui/modal.js'></script>
<script src='../js/id/ui/flash.js'></script>
<script src='../js/id/ui/confirm.js'></script>
<script src='../js/id/ui/splash.js'></script>
<script src='../js/id/actions.js'></script>
<script src="../js/id/actions/add_midpoint.js"></script>