From 5bf7aeb4308a36573b4e8cdfb035a4e13c8f45e5 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 24 Aug 2015 16:35:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93css=E5=B0=8F?= =?UTF-8?q?=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/account_controller.rb | 2 +- public/stylesheets/new_public.css | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index a96eba479..0e2f9569c 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -28,7 +28,7 @@ class AccountController < ApplicationController if User.current.logged? redirect_to home_url end - render :layout => 'login' + # render :layout => 'login' else authenticate_user end diff --git a/public/stylesheets/new_public.css b/public/stylesheets/new_public.css index de6cf696f..c2cc7d719 100644 --- a/public/stylesheets/new_public.css +++ b/public/stylesheets/new_public.css @@ -418,11 +418,12 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; .courseSend {width:260px; height:15px; line-height:15px; margin-bottom:10px;} .courseSendCheckbox {padding:0px; margin:0px; width:12px; height:12px; margin-right:10px; display:inline-block; margin-top:2px;} .sendCourseName {font-size:12px; color:#5f6060;} -.courseSendSubmit {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#64bdd9; margin-right:25px; float:left;} -.courseSendSubmit:hover {background-color:#0182bb;} +.courseSendSubmit {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#64bdd9; margin-right:25px; float:left;cursor: pointer;} +/*.courseSendSubmit:hover {background-color:#0182bb;}*/ .courseSendCancel {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#c1c1c1; float:left} a.sendSourceText {font-size:14px; color:#ffffff;} -input.sendSourceText {font-size:14px;color:#ffffff;background-color:#64bdd9;} +input.sendSourceText {font-size:14px;color:#ffffff;background-color:#64bdd9;cursor: pointer;} +/*input.sendSourceText:hover {font-size:14px; color:#ffffff;}*/ .resourcesSendTo {float:left; height:20px; margin-top:15px;} .resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;} .courseReferContainer {float:left; max-height:120px;margin-right:16px;margin-bottom:10px; overflow:scroll; overflow-x:hidden;}