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

Conflicts:
	static/homeLoad.js
This commit is contained in:
罗宪 2015-06-04 18:43:12 +08:00
commit e3ff170306
5 changed files with 11 additions and 8 deletions

View File

@ -188,9 +188,6 @@ $(function () {
var a_lineBox=[],end_num=0;
setTimeout(function (){
self.textTween();
$("body").addClass("index-page");
var header=$("#header")||$("header"),footer=$("#footer")||$("footer");
footer.removeAttr("style")
},500);
function addLine(i,j,lineBox){

View File

@ -12,7 +12,6 @@ $(function () {
self.main=$(".main");
self.footer=$("#footer")||$("footer");
self.footer.css("opacity",0);
self.body.addClass("index-page");
self.addLoad()
},
addLoad:function (){

View File

@ -117,6 +117,7 @@ header {
overflow: hidden;
border-bottom: 1px solid #eee;
font-size: 16px;
}
.fn-hide {
@ -230,8 +231,6 @@ header {
font-size: 0.875em;
position: relative;
margin-right: 25px;
-webkit-animation: yTopMatrix .5s ease-out .5s backwards;
animation: yTopMatrix .5s ease-out .5s backwards;
}
.nav ul li {
@ -1537,8 +1536,14 @@ footer ul li > a {
}
}
/***************************************************************************/
.index-page header{
.index-page header {
transition: opacity 0.5S;
-webkit-animation: xRightMatrix .5s ease-out .3s backwards;
animation: xRightMatrix .5s ease-out .3s backwards;
}
.index-page .nav {
-webkit-animation: yTopMatrix .5s ease-out .5s backwards;
animation: yTopMatrix .5s ease-out .5s backwards;
}
.index-page footer {

View File

@ -1,5 +1,7 @@
{% extends "layout.html" %}
{% block bodyAttribute %}class="index-page"{% endblock %}
{% block content %}
<div class="main-box" id="main">
<div class="banner-box">

View File

@ -18,7 +18,7 @@
<script src="https://t.alipayobjects.com/images/T12TdfXlpbXXXXXXXX.js"></script>
<script src="/static/script.js"></script>
</head>
<body>
<body {% block bodyAttribute %}{% endblock %}>
<header id="header">
<a class="logo" href="/">
<img width="60" src="https://t.alipayobjects.com/images/rmsweb/T1B9hfXcdvXXXXXXXX.svg">