diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 181f76b22..a96eba479 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -28,6 +28,7 @@ class AccountController < ApplicationController if User.current.logged? redirect_to home_url end + render :layout => 'login' else authenticate_user end diff --git a/public/stylesheets/new_public.css b/public/stylesheets/new_public.css index 40b049b7e..838934375 100644 --- a/public/stylesheets/new_public.css +++ b/public/stylesheets/new_public.css @@ -582,8 +582,8 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;} .homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;} a.homepageWhite {color:#ffffff;} a.homepageWhite:hover {color:#a1ebff} -a.newsGrey1 {color:#4b4b4b;} -a.newsGrey1:hover {color:#000000;} +a.newsGrey {color:#4b4b4b;} +a.newsGrey:hover {color:#000000;} a.replyGrey {color:#888888; display:block;} a.replyGrey:hover {color:#4b4b4b;} a.replyGrey1 {color:#888888;} @@ -592,6 +592,8 @@ a.newsBlue {color:#15bccf;} a.newsBlue:hover {color:#0781b4;} a.menuGrey {color:#808080;} a.menuGrey:hover {color:#fe7d68;} +.navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #98a1a6; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;} +#navSearchAlert {display:none;} /*个人主页右部分*/ .homepagePostType {width:180px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-170px; font-size:12px; color:#4b4b4b; line-height:2; z-index:9999; display:none;} @@ -653,6 +655,33 @@ a.postGrey:hover {color:#000000;} a.gz_btn{display:block; background:url(../images/pic_uersall.png) -318px -25px no-repeat; width:53px; height:18px; border:1px solid #cdcdcd; color:#333333; padding:0px 0 0 18px;margin-top: 2px;margin-right: 15px;} a:hover.gz_btn{ color:#ff5722;} +/*注册登陆页面*/ +#loginInBox {display:block; margin-top:143px;} +#signUpBox {display:none; margin-top:79px;} +#loginSignButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;} +#loginInButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;} +#loginSignButton:hover {background-color:#0ea6b7;} +#loginInButton:hover {background-color:#0ea6b7;} +.loginContentContainer {width:100%; background-color:#15bccf; margin-top:1px; height:580px;} +.loginContent {width:1000px; margin:0px auto;} +.loginLeft {width:595px; float:left;} +.loginLogo {padding-left:208px; padding-top:155px;} +.loginInro {width:465px; padding-top:55px; padding-left:50px; font-size:16px; color:#ffffff;} +.loginRight {width:405px; float:left;} +.loginChooseBox {width:405px; height:54px; background-color:#ffffff; padding-top:18px;} +.loginChooseList {width:350px; height:30px; font-size:14px; margin:0px auto;} +.loginChoose {width:55px; height:30px; border-bottom:1px solid #8ad2da; text-align:center;} +a.loginChooseTab {color:#484848; height:30px; display:block;} +.loginInButton {width:315px; height:40px; background-color:#15bccf; margin-left:46px; font-size:14px; text-align:center; line-height:40px; vertical-align:middle; margin-top:20px;} +.loginUpButton {width:315px; height:40px; background-color:#15bccf; margin-left:46px; font-size:14px; text-align:center; line-height:40px; vertical-align:middle; margin-top:30px;} +.loginChooseBorder {width:295px; height:30px; border-bottom:1px solid #e3e3e3;} +.loginChoose:hover {border-bottom:1px solid #8ad2da;} +.loginSign {width:405px; background-color:#ffffff;} +.loginSignBox {width:308px; height:38px; margin-left:46px; border:1px solid #98a1a6; outline:none;} +.loginSignOption {margin-left:46px; margin-top:15px;} +.loginIn {width:405px; background-color:#ffffff; padding-bottom:30px;} +.loginSignAlert {font-size:12px; color:#fc0000; margin-left:60px;} + /*底部*/