Manually merge in animate branch fadeIn work

This commit is contained in:
Tom MacWright
2013-03-15 14:59:17 -04:00
parent c34f48c207
commit aea5abe41a
+13
View File
@@ -709,6 +709,7 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;}
position: relative;
background: white;
padding-bottom: 20px;
-webkit-animation:fadeInInspect 500ms ease 0ms both;
}
.grid-entry .preset-icon-fill.area {
@@ -2002,3 +2003,15 @@ a.success-action {
@media only screen and (max-height: 840px) {
}
/* Keyframes
* --------------------------------------------------- */
@-webkit-keyframes fadeIn {
0% { opacity:0;}
100% { opacity:1;}
}
@-webkit-keyframes fadeInInspect {
0% { opacity:0; max-height: 0; padding-top: 0; padding-bottom: 0;}
100% { opacity:1; max-height: 160px; top-bottom: 20px; padding-bottom: 20px;}
}