diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss index dc9cde6fd44..8e35ab13b62 100644 --- a/app/assets/stylesheets/common/base/modal.scss +++ b/app/assets/stylesheets/common/base/modal.scss @@ -38,6 +38,12 @@ from {opacity: 0} to {opacity: .8} } + +@-webkit-keyframes fade { + from {opacity: 0} + to {opacity: 1} +} + .modal-outer-container { display:table; width:100%; diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss index b51f8a75010..ae3c1f80a31 100644 --- a/app/assets/stylesheets/desktop/modal.scss +++ b/app/assets/stylesheets/desktop/modal.scss @@ -25,20 +25,8 @@ } .modal.in { - -webkit-animation: modal .25s; - animation: modal .25s; -} - -//fade in and animate up - -@-webkit-keyframes modal { - from {opacity: 0} - to {opacity: 1} -} - -@keyframes fade { - from {opacity: 0} - to {opacity: 1} + -webkit-animation: fade .25s; + animation: fade .25s; } .modal-body { diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index b134adf7b67..b2ec22dfcf4 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -525,8 +525,7 @@ video { .star, .badge-wrapper, i, .topic-link:not(.loading) { -webkit-animation: fadein .7s; - animation-duration: .7s; - animation-name: fadein; + animation: fadein .7s; } .topic-statuses { diff --git a/app/assets/stylesheets/vendor/font_awesome/_spinning.scss b/app/assets/stylesheets/vendor/font_awesome/_spinning.scss index 8eace85262d..e51b9d0b942 100644 --- a/app/assets/stylesheets/vendor/font_awesome/_spinning.scss +++ b/app/assets/stylesheets/vendor/font_awesome/_spinning.scss @@ -7,8 +7,8 @@ } @keyframes spin { - 0% { transform: rotate(0deg); -webkit-transform: rotate(0deg); } - 100% { transform: rotate(359deg); -webkit-transform: rotate(359deg); } + 0% { transform: rotate(0deg); } + 100% { transform: rotate(359deg); } } @-webkit-keyframes spin {