From 2804d7d7303c2d0063798e41b1234d1c8c9ab8a9 Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Mon, 31 Aug 2015 15:42:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?resource=E5=9B=BE=E7=89=87=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stylesheets/images/resource_icon_list.png | Bin 2476 -> 2654 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public/stylesheets/images/resource_icon_list.png b/public/stylesheets/images/resource_icon_list.png index 1b5bc6f58c73e58545a57fc4e29463d4ef7a0e9b..d1fdc2610048ca14f12af220fad73d18f6e91c93 100644 GIT binary patch delta 1989 zcmZ`(X*3&%7LF~nJh9ayEw$BNYwS{z5KU{TDlv%KT3ZNXOPXp@v?;B9d#H%DwzjmG zk_Oejk|1MHTP(4pRlG8mcGTeMoSFB|{OCR3uY2!zzjMBO&ux^Rm1#oq`ye3}NTi9K z5d>yzXlQ6}0)rzAUFC%A)z*(eH>ho z6k@9yHkx)*!i0YqD3z|SL_QAGN^!VKHy%IyIGqzcIiqLpJu!KRI$)F*(VtJwQH?)L zTg9MB|Cw%gqdy7f1!OFGChmQ1)z;R|bC>f7oNC`SCpeOq!iLdx@cA+ENM}E*n`Ez5 z&3a^6sEL19W{!nKR}M&Fwra})xBc#ETTba>hCa9sV*JctF*MIN%bm`Q6F%6xVk zz~bb!3vzX|inZuRb(F+GY0z3g)Q1K8ay-dbM(Qm=l;fFKsXd32;IxLL^N?~FFw#}g zU&gmb(-x<*5@Rc+gt00`1 zdN3p3cFvryS#m{aUvG%3MHj$y-tnj`OW6d62(|!M?VX&`zA!cXO!Q z5?nWgT%_d=Nsu{Z)$5fZ1u&EiSO+9SoR|%t%Af3(Cn{L_RfPNa_QZdw%03|^h^q~? z8muChq@W{Sb$x-2KVxr^`X!qeEk3XJwan;Eq!@F!BHf`t7JT`P8b$i{Vlv68Mj`h-&!)t+cdX(R zRsN}$@JwJlQxnn2P`z{_wsd!M>DCG`1kTc``cx83(@2ZP>J*k}(1L0AM`AGwTd*gU$N;WXySTV;*VO+pc4FLhvg0{0auVZgtTReHtOY_f@eN>YFaCPztoh$*A4t>I~vO;oarrzixduSkA8>!IN~;+ z@*%%=C-q0-U5-=frCP5Ar&*I`k9~Qie+c(Yc|K2IkpKN_O;C|nT2mHxEA*cu{imE)J zSPN*T{Q5#V^;1}C{HW-g{PHV&-KG)V;ZYdQ$u)A~qn5{Gtmp+60K}X(#d~8K-<_0u z8JC;RJF3_-kzqnGq3ehR`o`Re zsT`>vS85Q?+4BV?82u2S4|vg>YD5PzRg}kVM+vG!>w(*K>ZSre$M4M4uGd#NO1dCC zF!z=WyY|7$o)@!pWeFKMR?f03j0?OKhkK7J*)gLU8*Q(dQgLdoHL}VLotl&5YNTvg ztWB9FdaIh9t0K=_L<&;4p;roM*%N%;4Fu zyx6IHbAl<>Y&{pZNXjkaJ)Y#dDY1=fukJPO)azfzgWyl$jKQ{nkI;x+9b8c8b?bft z$on9shms~q#b*p~s?QO1OG!MSYi~0BN4N7-rRAdcr}Pooo$f^+i_JzZbR{_mbu%p~ zd*yUm4J1+322&Q;VXnRr;H9#@l&?Q{R5M$wdlrdDzt6f8{KJ7%wRmo$)hm1; zWnU;R6T;}$cTPwyfJa!;896+3g9bd3hBMw4f~co;2`Wx|(yV?Woyb~QssbT=S*u>< zRuy9FQ5xLYI}cB}SQ`(nu2ur|UkuZO3zp-ZP|vKJ)??h*o;6w2oSHE@qzMWMD}3q6 z>Qfr&(b;t$V`}Yz1vb8VAAl#YV{$w!UF+xdRuk67`y#$uookOZUvq+Y!_g$MT_||a zAR@7Ouztu~{sQsaQ-vIP{SB3W*ggNtk==g)`M;0*|KgwP5Xt;o@$b7jBHttbHGlKu;IB%_!B delta 1810 zcmZ`$c{JOJ7B;rDT8u3XY1L9pwZvXaY>_BZj0{Z?bZTo5O9?^vSrSW^ph`OLRJ|6Vud9VHFo#USGkNe$ozx$o@-Dy>}O0%mZ!NSJM z)x{EZ&cf8j#MBgHX@kL_t!>OqEHI{)W;W+sbhId>cu!ATbX+Kz6ds%8j<(m?pBRS` z!)(83tq;?D_-N??2)PrkyatllP^;k*!fj)H9Yf4Bz5nvN zA@iGyA59vXANKz?d?wJZ?#DS@WbZzz4i$lhct5+5k7BW-D$@q+2kSxWExRov3i*d0 z#@{Pfnt#x&ys>dq$`M>>XVbmED<;_s|GMj8#FO7GE~T-X!WDN*U|bBUzxZd3QnE67O$*V1bK6$QvsOY{fN&Sq>u zC_2dgNwU1ZcgA7XLhA3|P+Cy`KEp^1B*w<(iF1lp25;xZ3MtJ@Bp*+)=3;BEO8hzdu0%Mj%O9hxL#Uk2%3Eq&?VL`h2z}7hA+D?5ev4Vs z*fzaEgxP8YFI-p!2=2A!aL`rk0#ww4)Tjilio;5kNQtTB#?;c$e#La+x32 zA|$y^11?fgG)}H~qKP1T7ok$o*fwQpW~$jaF*%+suL1n@ZTzF|RSN)tET2^9Eq#`I z7TP6MG?p-01-5`B+l~5h>W!o<_tRW z67N2r1?fBvEBQ6pJ|Qo~a?gZXJ&mP!TuHyS;>w6%7=naCtLF~Fpagas?%GAW8MLyv z)NMrrBFLNt6xf=b+D#-@Ob0mi(1<8y$I^2$ESXyszR6grd3(qknpOiqx9?4mdH&%2 zmLu#g-ZIMg}R!3<8RQRlYpHWu!5Lgx`)MS1w{-9&n8b$3W3OD6Ij zcX#HMkm$3Aomn1!KuEAxFu0CP(!94$UG}E9-Vut7C6{H|+kS^2z-_Ac#7u|5lYwJ( zuV0i8+BBAV@uR^rJ3xT!i$v1fa5qYNK>XP~-iVvTg zZZm%;USybY`)zv^v7@f))A*;Xpw}8;iW~XKz+^>D%k_rukLD?B?#GJxJKwJnA4K=l u|1aFWZ2ymcc@FLT|553$7wPOS8JGn9eVVi`tx-i{zuYli=qA+Voc{pzrcAj2 From acf5db70674d8e6bfa70cdcab6306bb706d6143e Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Mon, 31 Aug 2015 17:50:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?placeholder=E6=98=BE=E7=A4=BA=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/account/lost_password.html.erb | 2 +- app/views/users/_user_homework_form.html.erb | 2 +- public/stylesheets/new_user.css | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/account/lost_password.html.erb b/app/views/account/lost_password.html.erb index 0e4ddd1ff..9881dd186 100644 --- a/app/views/account/lost_password.html.erb +++ b/app/views/account/lost_password.html.erb @@ -1,6 +1,6 @@ <%= stylesheet_link_tag 'new_user'%> -
+

忘记密码

diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index 8340306e0..ef3cbca3e 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -9,7 +9,7 @@
<%= link_to "导入作业", user_import_homeworks_user_path(User.current.id),:class => "BlueCirBtn fl mr10",:remote => true%>
- + <%= calendar_for('homework_end_time')%>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 13cff4a66..19cfafd0d 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -405,7 +405,7 @@ a.resourcesTypeAtt {background:url(images/homepage_icon.png) -180px -49px no-rep /*.resourcesUploadBox:hover {background-color:#0781b4;}*/ /* 个人主页右边部分*/ .homepageSearchIcon {width:30px; height:32px; background:url(images/nav_icon.png) -8px 3px no-repeat; float:left;} -input.homepageSearchIcon:hover {cursor: pointer;} +input.homepageSearchIcon:hover {cursor: pointer;background:url(../images/nav_icon.png) -49px 3px no-repeat;} a.homepagePostTypeQuiz {background:url(images/homepage_icon.png) -90px -124px no-repeat; padding-left:23px;} a.homepagePostTypeAssignment {background:url(images/homepage_icon.png) -93px -318px no-repeat; padding-left:23px;} a.replyGrey {color:#888888; display:inline-block;} @@ -532,8 +532,8 @@ a.coursesLineGrey:hover {color:#ffffff;} a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;} .homepageLeftLabelContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px;} .homepageLabelText {color:#484848; font-size:16px; margin-left:10px; margin-bottom:12px; display:block;} -.homepageRightBanner {width:720px; height:30px; margin:0px auto;} -.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; width:150px; float:left; margin-top:4px;} +.homepageRightBanner {width:720px; margin:0px auto;} +.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; width:150px; float:left;} .newsType {width:60px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-40px; font-size:12px; color:#888888; display:none; line-height:2; z-index:9999;} .newsReadSetting {width:700px; background-color:#f6f6f6; border-bottom:1px solid #eeeeee; margin:10px auto; height:39px; line-height:39px; vertical-align:middle; font-size:14px; color:#7a7a7a; padding-left:10px;} .homepageNewsList {width:710px; height:49px; line-height:49px; vertical-align:middle; border-bottom:1px dashed #eaeaea; margin-left:10px;} @@ -611,7 +611,7 @@ a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;} .homepagePostReplyPublisher {font-size:12px; color:#484848; margin-bottom:12px;} .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;} .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;} -.homepagePostAssignTo {float:left; font-size:14px; color:#269ac9; height:30px; line-height:30px; vertical-align:middle;} +.homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;} .homepagePostFileAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -85px -150px no-repeat; padding-left:35px; font-size:14px; margin-right:25px;} .homepagePostImageAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -86px -195px no-repeat; padding-left:35px; font-size:14px; margin-right:25px;} .postAttSize {color:#888888; font-size:12px;} @@ -689,9 +689,9 @@ a.referenceTypeBlock {color:#888888; display:inline-block; padding:0px 20px;} /*20150826忘记密码 LB*/ -.BgBox{ width:968px; border:1px solid #dddddd; background:#fff; padding:15px; padding-top:10px;margin: 20px auto} +.BgBox{ width:968px; border:1px solid #dddddd; background:#fff; padding:15px; padding-top:10px;margin: 10px auto 20px auto;} .BgBox_h2{ font-size:16px; color:#484848; width:968px;border-bottom:1px solid #e3e3e3; padding-bottom:5px;} -.NomalInput{width:308px; height:38px; border:1px solid #98a1a6; outline:none; color:#888888; font-size:14px;} +.NomalInput{width:308px; height:38px; border:1px solid #98a1a6 !important; outline:none; color:#888888; font-size:14px;} .BgBoxCon{ width:310px; margin:80px auto;} .BgBoxConP{ font-size:14px; color:#484848;} .LoginButton {width:315px; height:40px; background-color:#269ac9; font-size:14px; text-align:center; line-height:40px; vertical-align:middle;} @@ -870,7 +870,7 @@ a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;} .uppic_btn:hover {background-color: #329cbd;} /*20150820课程作业 LB*/ -.HomeWork {width:708px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;} +.HomeWork {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;} .RightBanner {width:708px; height:34px; border-bottom:1px solid #e9e9e9;} select.InputBox,input.InputBox,textarea.InputBox{ border:1px solid #d9d9d9; color:#888888; height:28px; line-height:28px; padding-left:5px; font-size:14px;} a.BlueCirBtn{ display:block;width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; text-align:center; border:1px solid #15bccf; color:#15bccf; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;}