From 2a464182842c1cd44561a42cc505f0520738a6a2 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Thu, 25 Dec 2014 02:19:06 -0800 Subject: [PATCH] add back in @-webkit-keyframes --- app/assets/stylesheets/common/base/discourse.scss | 13 +++++++++---- app/assets/stylesheets/desktop/modal.scss | 5 +++++ app/assets/stylesheets/desktop/topic-post.scss | 5 +++++ .../stylesheets/vendor/font_awesome/_spinning.scss | 5 +++++ 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss index 039e9fe2d3e..941fbbf7fdf 100644 --- a/app/assets/stylesheets/common/base/discourse.scss +++ b/app/assets/stylesheets/common/base/discourse.scss @@ -181,17 +181,22 @@ body { opacity: 1; } - -@keyframes rotate-forever { +@-webkit-keyframes rotate-forever { 0% { - transform: rotate(0deg); -webkit-transform: rotate(0deg); } 100% { - transform: rotate(360deg); -webkit-transform: rotate(360deg); } } +@keyframes rotate-forever { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(360deg); + } +} .inline-spinner { display: inline-block; diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss index 2f0e0405175..b51f8a75010 100644 --- a/app/assets/stylesheets/desktop/modal.scss +++ b/app/assets/stylesheets/desktop/modal.scss @@ -31,6 +31,11 @@ //fade in and animate up +@-webkit-keyframes modal { + from {opacity: 0} + to {opacity: 1} +} + @keyframes fade { from {opacity: 0} to {opacity: 1} diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index fef95418de4..b134adf7b67 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -510,6 +510,11 @@ video { max-height: 500px; } +@-webkit-keyframes fadein { + from {opacity: 0;} + to {opacity: 1;} +} + @keyframes fadein { from {opacity: 0;} to {opacity: 1;} diff --git a/app/assets/stylesheets/vendor/font_awesome/_spinning.scss b/app/assets/stylesheets/vendor/font_awesome/_spinning.scss index 1e97236eb78..8eace85262d 100644 --- a/app/assets/stylesheets/vendor/font_awesome/_spinning.scss +++ b/app/assets/stylesheets/vendor/font_awesome/_spinning.scss @@ -10,3 +10,8 @@ 0% { transform: rotate(0deg); -webkit-transform: rotate(0deg); } 100% { transform: rotate(359deg); -webkit-transform: rotate(359deg); } } + +@-webkit-keyframes spin { + 0% { -webkit-transform: rotate(0deg); } + 100% { -webkit-transform: rotate(359deg); } +}