diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss index 77db9fda9..354725528 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 1b4f643d5..c860d9198 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 {