From 6ddccb23e033b843d7bc2de44f8142a5f489c98f Mon Sep 17 00:00:00 2001 From: Saman Bemel-Benrud Date: Tue, 26 Mar 2013 18:45:20 -0400 Subject: [PATCH] better animation for modals. --- css/app.css | 1 - js/id/ui/modal.js | 5 +++++ js/id/ui/splash.js | 4 ++-- js/id/ui/tag_editor.js | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/css/app.css b/css/app.css index 9c2ec85f6..8435bcef6 100644 --- a/css/app.css +++ b/css/app.css @@ -1785,7 +1785,6 @@ div.typeahead a:first-child { left: 0; right: 0; margin: auto; - top: 30px; z-index: 3; } diff --git a/js/id/ui/modal.js b/js/id/ui/modal.js index 5da396a2b..44ef6a25a 100644 --- a/js/id/ui/modal.js +++ b/js/id/ui/modal.js @@ -36,6 +36,11 @@ iD.ui.modal = function(selection, blocking) { if (animate) { shaded.transition().style('opacity', 1); + modal + .style('top','0px') + .transition() + .duration(200) + .style('top','40px') } else { shaded.style('opacity', 1); } diff --git a/js/id/ui/splash.js b/js/id/ui/splash.js index 7c96171ef..09b2a6432 100644 --- a/js/id/ui/splash.js +++ b/js/id/ui/splash.js @@ -1,7 +1,7 @@ iD.ui.Splash = function(context) { return function(selection) { - // if (context.storage('sawSplash')) - // return; + if (context.storage('sawSplash')) + return; context.storage('sawSplash', true); diff --git a/js/id/ui/tag_editor.js b/js/id/ui/tag_editor.js index a0e942de0..408a3cd17 100644 --- a/js/id/ui/tag_editor.js +++ b/js/id/ui/tag_editor.js @@ -68,7 +68,7 @@ iD.ui.TagEditor = function(context, entity) { .call(presetUI); editorwrap.append('div') - .attr('class', 'inspector-inner col12 fillL2 additional-tags') + .attr('class', 'inspector-inner col12 additional-tags') .call(tagList, preset.id === 'other'); if (!entity.isNew()) {