From c78fc6cbe6eb1645dce8743378559ddebfc05ed7 Mon Sep 17 00:00:00 2001
From: Ben Sperry <ben@drifty.com>
Date: Sun, 6 Oct 2013 17:42:43 -0500
Subject: [PATCH] updated modal animation speed and reduced opacity

---
 dist/ionic-ios7.css         | 8 ++++----
 dist/ionic.css              | 8 ++++----
 scss/ionic/_animations.scss | 8 ++++----
 test/modals.html            | 4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dist/ionic-ios7.css b/dist/ionic-ios7.css
index f3f4b89fe6..21cb88acb3 100644
--- a/dist/ionic-ios7.css
+++ b/dist/ionic-ios7.css
@@ -2305,11 +2305,11 @@ a.button {
   padding: 10px; }
 
 .slide-in-up {
-  opacity: 0;
+  opacity: 0.5;
   -webkit-transform: translate3d(0, 100%, 0);
   transform: translate3d(0, 100%, 0);
-  -webkit-transition: -webkit-transform 0.25s, opacity 0.25s;
-  transition: -webkit-transform 0.25s, opacity 0.25s;
+  -webkit-transition: -webkit-transform 0.3s, opacity 0.2s;
+  transition: -webkit-transform 0.3s, opacity 0.2s;
   -webkit-transition-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1);
   transition-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1);
   -webkit-animation-fill-mode: forwards; }
@@ -2321,7 +2321,7 @@ a.button {
 
 @keyframes fadein {
   from {
-    opacity: 0; }
+    opacity: 0.7; }
 
   to {
     opacity: 1; } }
diff --git a/dist/ionic.css b/dist/ionic.css
index 64e337beb5..e82531413c 100644
--- a/dist/ionic.css
+++ b/dist/ionic.css
@@ -2387,11 +2387,11 @@ a.button {
   padding: 10px; }
 
 .slide-in-up {
-  opacity: 0;
+  opacity: 0.5;
   -webkit-transform: translate3d(0, 100%, 0);
   transform: translate3d(0, 100%, 0);
-  -webkit-transition: -webkit-transform 0.25s, opacity 0.25s;
-  transition: -webkit-transform 0.25s, opacity 0.25s;
+  -webkit-transition: -webkit-transform 0.3s, opacity 0.2s;
+  transition: -webkit-transform 0.3s, opacity 0.2s;
   -webkit-transition-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1);
   transition-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1);
   -webkit-animation-fill-mode: forwards; }
@@ -2403,7 +2403,7 @@ a.button {
 
 @keyframes fadein {
   from {
-    opacity: 0; }
+    opacity: 0.7; }
 
   to {
     opacity: 1; } }
diff --git a/scss/ionic/_animations.scss b/scss/ionic/_animations.scss
index 715ce6d64c..8ff0011c76 100644
--- a/scss/ionic/_animations.scss
+++ b/scss/ionic/_animations.scss
@@ -2,13 +2,13 @@ $bezier-function: cubic-bezier(.1, .7, .1, 1);
  
 .slide-in-up {
   // Start hidden
-  opacity: 0;
+  opacity: 0.5;
   // Start it down low
  -webkit-transform: translate3d(0, 100%, 0);
   transform: translate3d(0, 100%, 0);
 
-  -webkit-transition: -webkit-transform 0.25s, opacity 0.25s;
-  transition: -webkit-transform 0.25s, opacity 0.25s;
+  -webkit-transition: -webkit-transform 0.3s, opacity 0.2s;
+  transition: -webkit-transform 0.3s, opacity 0.2s;
 
   -webkit-transition-timing-function: $bezier-function;
   transition-timing-function: $bezier-function;
@@ -23,7 +23,7 @@ $bezier-function: cubic-bezier(.1, .7, .1, 1);
 }
 
 @keyframes fadein {
-    from { opacity:0; }
+    from { opacity:0.7; }
     to { opacity:1; }
 }
 @-webkit-keyframes fadein { /* Safari and Chrome */
diff --git a/test/modals.html b/test/modals.html
index 05709cd4df..e571f47cdd 100644
--- a/test/modals.html
+++ b/test/modals.html
@@ -24,14 +24,14 @@
     </section>
 
     <div id="modal" class="modal slide-in-up">
-      <header class="bar bar-header bar-success">
+      <header class="bar bar-header bar-secondary">
         <h1 class="title">BOOM</h1>
         <a href="#" class="button" id="modal-closer">Close</a>
       </header>
 
       <main class="content padded has-header">
         <h2>I'm a thing</h2>
-        <div style="background-color: red; width: 100%; height: 1000px"></div>
+        <div style="background-color: blue; width: 100%; height: 1000px"></div>
       </main>
     </div>