From 63eb7a60e5d90b9e15facbabe2725bbc7a4b421c Mon Sep 17 00:00:00 2001
From: Kris Aubuchon <shout@k-ris.com>
Date: Fri, 21 Mar 2014 09:23:22 -0400
Subject: [PATCH] dialing back the animations I added previously

---
 app/assets/stylesheets/desktop/discourse.scss | 25 +++++--------------
 app/assets/stylesheets/desktop/modal.scss     | 23 ++++-------------
 2 files changed, 11 insertions(+), 37 deletions(-)

diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index 77db9fda909..35472552800 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -283,31 +283,18 @@ blockquote {
   animation: spinner .25s;
 }
 
-//loading spinner drop-in animation
+//loading spinner fade-in
 @-webkit-keyframes spinner {
-  0% {
-      margin: 0px auto 30px auto;
-      opacity: 0;
-    }
-    100% {
-    margin: 20px auto 30px auto;
-      opacity: 1;
-    }
-}@keyframes modal {
-    0% {
-        margin: 0px auto 30px auto;
-        opacity: 0;
-      }
-      100% {
-      margin: 20px auto 30px auto;
-        opacity: 1;
-      }
+    from {opacity: 0}
+    to {opacity: 1}
+}@keyframes fade {
+    from {opacity: 0}
+    to {opacity: 1}
 }
 
 
 
 
-
 .avatar {
   @include border-radius-all(2px);
 }
diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss
index 1b4f643d5b2..c860d9198cc 100644
--- a/app/assets/stylesheets/desktop/modal.scss
+++ b/app/assets/stylesheets/desktop/modal.scss
@@ -102,24 +102,11 @@ animation: modal .25s;
 //fade in and animate up
 
 @-webkit-keyframes modal {
-  0% {
-      margin-top: 100px;
-      opacity: 0;
-    }
-    100% {
-      margin-top: 0;
-      opacity: 1;
-    }
-
-  }@keyframes modal {
-    0% {
-        margin-top: 100px;
-        opacity: 0;
-      }
-      100% {
-        margin-top: 0;
-        opacity: 1;
-      }
+    from {opacity: 0}
+    to {opacity: 1}
+}@keyframes fade {
+    from {opacity: 0}
+    to {opacity: 1}
 }
 
 .modal-body {