Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2161 from awesomerobot/master 

dialing back the animations I added previously
This commit is contained in:
Régis Hanol 2014-03-21 14:54:16 +01:00
parent 88ba80b239 63eb7a60e5
commit e8c53d171a
2 changed files with 11 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/assets/stylesheets/desktop/discourse.scss
View File

@ -283,27 +283,14 @@ blockquote {
animation: spinner .25s; animation: spinner .25s;
} }
//loading spinner drop-in animation //loading spinner fade-in
@-webkit-keyframes spinner { @-webkit-keyframes spinner {
0% { from {opacity: 0}
margin: 0px auto 30px auto; to {opacity: 1}
opacity: 0; }@keyframes fade {
from {opacity: 0}
to {opacity: 1}
} }
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;
}
}

23
app/assets/stylesheets/desktop/modal.scss
View File

@ -102,24 +102,11 @@ animation: modal .25s;
//fade in and animate up //fade in and animate up
@-webkit-keyframes modal { @-webkit-keyframes modal {
0% { from {opacity: 0}
margin-top: 100px; to {opacity: 1}
opacity: 0; }@keyframes fade {
} from {opacity: 0}
100% { to {opacity: 1}
margin-top: 0;
opacity: 1;
}
}@keyframes modal {
0% {
margin-top: 100px;
opacity: 0;
}
100% {
margin-top: 0;
opacity: 1;
}
} }
.modal-body { .modal-body {