From 41a8f9d6a20a17b0ae9ed475182751cd98c5c676 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 27 Aug 2015 09:28:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=95=E9=83=A8=E5=8E=BB=E6=8E=89marginBotto?= =?UTF-8?q?m:10px=20=E7=99=BB=E5=BD=95=E7=95=8C=E9=9D=A2=E5=8A=A0=E5=BA=95?= =?UTF-8?q?=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/login.html.erb | 6 ++++++ public/stylesheets/header.css | 2 +- public/stylesheets/new_user.css | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb index 3cd1fc25e..81b647b65 100644 --- a/app/views/layouts/login.html.erb +++ b/app/views/layouts/login.html.erb @@ -26,3 +26,9 @@ <%= yield %> +
+<%= render :partial => 'layouts/footer' %> +
+<%= call_hook :view_layouts_base_body_bottom %> + + \ No newline at end of file diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css index eda554eaf..b448e03af 100644 --- a/public/stylesheets/header.css +++ b/public/stylesheets/header.css @@ -96,7 +96,7 @@ a.topnav_login_box:hover {color:#a1ebff;} .topnav_login_list li{ } /*底部*/ -#Footer{background-color:#ffffff; margin-bottom:10px; padding-bottom:15px; color:#666666;} +#Footer{background-color:#ffffff; padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/ .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;} .footerAbout{ width:455px; margin:0 auto;height:35px; line-height:35px; border-bottom:1px solid #efefef; } .languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 22e13709b..4e88ebf3f 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -647,7 +647,7 @@ ul.list_watch{ .Agreementh4{ color:#2980b9; font-weight:bold; font-size:14px; margin-top:30px;} /*底部*/ -#Footer{background-color:#ffffff; margin-bottom:10px; padding-bottom:15px; color:#666666;} +#Footer{background-color:#ffffff; padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/ .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;} .footerAbout{ width:455px; margin:0 auto;height:35px; line-height:35px; border-bottom:1px solid #efefef; } .languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;}