From 7d04a9461eb80975b95a4e2c3166bb6d947f7249 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Mon, 5 Oct 2015 01:14:29 +0200
Subject: [PATCH] Move animations.scss

---
 app/assets/stylesheets/_application.scss      |  1 +
 app/assets/stylesheets/_flash_messages.scss   |  3 ---
 app/assets/stylesheets/admin.scss             |  2 +-
 app/assets/stylesheets/animations.scss        | 23 +++++++++++++++++++
 app/assets/stylesheets/mobile/mobile.scss     |  1 +
 .../stylesheets/new_styles/_animations.scss   | 22 ------------------
 6 files changed, 26 insertions(+), 26 deletions(-)
 create mode 100644 app/assets/stylesheets/animations.scss
 delete mode 100644 app/assets/stylesheets/new_styles/_animations.scss

diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss
index 38302959e..ab54a70be 100644
--- a/app/assets/stylesheets/_application.scss
+++ b/app/assets/stylesheets/_application.scss
@@ -10,6 +10,7 @@
 @import 'entypo';
 @import 'icons';
 @import 'mentions';
+@import 'animations';
 @import 'flash_messages';
 @import 'sprites';
 @import 'hovercard';
diff --git a/app/assets/stylesheets/_flash_messages.scss b/app/assets/stylesheets/_flash_messages.scss
index e4b4e46c4..851d9eae8 100644
--- a/app/assets/stylesheets/_flash_messages.scss
+++ b/app/assets/stylesheets/_flash_messages.scss
@@ -1,6 +1,3 @@
-
-@import 'new_styles/animations';
-
 #flash_notice,
 #flash_alert,
 #flash_error {
diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index f796777a6..866bba6b3 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -1,5 +1,5 @@
 @import 'colors';
-@import 'new_styles/animations';
+@import 'animations';
 
 /** ADMIN STYlES **/
 /** user search **/
diff --git a/app/assets/stylesheets/animations.scss b/app/assets/stylesheets/animations.scss
new file mode 100644
index 000000000..f42ff32ef
--- /dev/null
+++ b/app/assets/stylesheets/animations.scss
@@ -0,0 +1,23 @@
+// flash message animations - header height is about 50px
+@keyframes expose {
+  0% { top: -100px; }
+  15% { top: 44px; }
+  85% { top: 44px; }
+  100% { top: -100px; }
+}
+
+// spinner animation
+@keyframes spinner {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
+
+@keyframes pulsate {
+  from {
+    opacity: 1;
+  }
+
+  to {
+    opacity: .1;
+  }
+}
diff --git a/app/assets/stylesheets/mobile/mobile.scss b/app/assets/stylesheets/mobile/mobile.scss
index fd433a115..8ee50ef1d 100644
--- a/app/assets/stylesheets/mobile/mobile.scss
+++ b/app/assets/stylesheets/mobile/mobile.scss
@@ -2,6 +2,7 @@
 @import "bootstrap-complete";
 @import "_mixins";
 @import "vendor/autoSuggest";
+@import 'animations';
 @import "_flash_messages";
 @import 'entypo';
 @import 'icons';
diff --git a/app/assets/stylesheets/new_styles/_animations.scss b/app/assets/stylesheets/new_styles/_animations.scss
deleted file mode 100644
index 64b47cf20..000000000
--- a/app/assets/stylesheets/new_styles/_animations.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-/* flash message animations - header height is about 50px */
-@keyframes expose {
-  0%   { top : -100px; }
-  15%  { top : 44px; }
-  85%  { top : 44px; }
-  100% { top : -100px; }
-}
-
-/* spinner animation */
-@keyframes spinner {
-  0%   { transform: rotate(0deg); }
-  100% { transform: rotate(360deg); }
-}
-
-@keyframes pulsate {
-  from {
-    opacity: 1;
-  }
-  to {
-    opacity: .1;
-  }
-}