From ed36003624e354919b70da693a93bd9d2910818d Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 4 Jun 2015 18:25:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=89=8D=E9=A1=B6=E9=83=A8=E5=AF=BC?= =?UTF-8?q?=E8=88=AA=E7=9A=84=E5=8A=A8=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/home.js | 3 --- static/homeLoad.js | 1 - static/style.css | 11 ++++++++--- theme/templates/home.html | 2 ++ theme/templates/layout.html | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/static/home.js b/static/home.js index 91f8f532f2..7e10ed140f 100644 --- a/static/home.js +++ b/static/home.js @@ -180,9 +180,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){ diff --git a/static/homeLoad.js b/static/homeLoad.js index d0bcc8f292..6ab1f76497 100644 --- a/static/homeLoad.js +++ b/static/homeLoad.js @@ -11,7 +11,6 @@ $(function () { self.header=$("#header")||$("header"); self.main=$(".main"); self.footer=$("#footer")||$("footer"); - self.footer.css("opacity",0); self.addLoad() }, addLoad:function (){ diff --git a/static/style.css b/static/style.css index 1e46b3ecb4..f93e316393 100644 --- a/static/style.css +++ b/static/style.css @@ -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 { @@ -1472,8 +1471,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 { diff --git a/theme/templates/home.html b/theme/templates/home.html index 6c3e37b95b..4b407229e8 100644 --- a/theme/templates/home.html +++ b/theme/templates/home.html @@ -1,5 +1,7 @@ {% extends "layout.html" %} +{% block bodyAttribute %}class="index-page"{% endblock %} + {% block content %}