Merge branch 'master' of github.com:ant-design/ant-design

This commit is contained in:
afc163 2015-06-04 17:06:02 +08:00
commit 13222b5c74
2 changed files with 15 additions and 7 deletions

View File

@ -163,10 +163,7 @@ $(function () {
self.imgBox.removeClass("fn-alpha-out")
//T.to(self.imgBox,.5,{alpha:1})
self.imgBox.css("opacity",1);
$("body").css("background","#fff").addClass("index-page");
var header=$("#header")||$("header"),footer=$("#footer")||$("footer");
header.removeAttr("style");
footer.removeAttr("style")
},
textTween:function (){
var self=this;
@ -181,7 +178,14 @@ $(function () {
addLine:function (){
var self=bannerAnim;
var a_lineBox=[],end_num=0;
self.textTween();
setTimeout(function (){
self.textTween();
$("body").css("background","#fff").addClass("index-page");
var header=$("#header")||$("header"),footer=$("#footer")||$("footer");
header.removeAttr("style");
footer.removeAttr("style")
},500);
function addLine(i,j,lineBox){
var t=new C.Shape();
if(j%2){

View File

@ -117,6 +117,7 @@ header {
overflow: hidden;
border-bottom: 1px solid #eee;
font-size: 16px;
}
.fn-hide {
@ -1468,14 +1469,17 @@ footer ul li > a {
}
}
/***************************************************************************/
.index-page header{
transition: opacity 0.5S;
}
.index-page .nav {
-webkit-animation: yTopMatrix .5s ease-out .5s backwards;
animation: yTopMatrix .5s ease-out .5s backwards;
}
.index-page footer {
-webkit-animation: yBottomMatrix .5s ease-out .7s backwards;
animation: yBottomMatrix .5s ease-out .7s backwards;
-webkit-animation: yBottomMatrix .5s ease-out 1s backwards;
animation: yBottomMatrix .5s ease-out 1s backwards;
}
.index-page .logo {