Merge remote-tracking branch 'origin/next' into next

This commit is contained in:
Leo Horie 2015-03-09 21:30:32 -04:00
commit ff37512028

View file

@ -19,7 +19,7 @@
[class*=',12)'] {width:100%;} [class*=',12)'] {width:100%;}
} }
html {background:#999;color:#222;font:14px Helvetica;} html {background:#999;color:#222;font:14px/1.4 Helvetica;}
html,body {margin:0;padding:0;} html,body {margin:0;padding:0;}
header,footer {background:#999;} header,footer {background:#999;}
nav {text-align:right;} nav {text-align:right;}
@ -89,4 +89,4 @@ background-size: 20px 20px;
@-webkit-keyframes logo { @-webkit-keyframes logo {
from {opacity:0;-webkit-transform:scale(2) rotate(359deg);} from {opacity:0;-webkit-transform:scale(2) rotate(359deg);}
to {opacity:1;-webkit-transform:scale(1) rotate(0deg);} to {opacity:1;-webkit-transform:scale(1) rotate(0deg);}
} }