From 48bd70b9f6e200dfe5c343e32ae61891a5580048 Mon Sep 17 00:00:00 2001 From: Tim Date: Sat, 10 Oct 2015 10:23:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/new_user.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 5d31c3984..f867f7342 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -549,7 +549,7 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no- .homepageImageSexMan {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;} .homepageImageSexWomen {width: 20px;height: 20px;background: url(../images/homepage_icon.png) -10px -149px no-repeat;float: left;} a.UsersEditBtn{ display:block; width:55px; height:20px; border:1px solid #6d6d6d; color:#fff; background:#888888 url(../images/homepage_icon.png) -11px -35px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px;} -a:hover.UsersEditBtn{ color:#484848; background:#888888 url(../images/homepage_icon.png) -11px -74px no-repeat;} +a:hover.UsersEditBtn{ color:#484848; background:#888888 url(../images/homepage_icon2.png) -11px -74px no-repeat;} a.UsersAttBtn{ display:block; width:55px; height:20px; border:1px solid #d3d3d3; color:#888888; background:#f2f3f3 url(../images/homepage_icon2.png) -9px -6px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px;} a:hover.UsersAttBtn{border:1px solid #888888; } a.UsersApBtn{ display:block; width:55px; height:20px; border:1px solid #d3d3d3; color:#888888; background:#f2f3f3 url(../images/homepage_icon2.png) -177px -6px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px;} @@ -1065,7 +1065,7 @@ a.FilesName02{ max-width:665px;overflow:hidden; white-space:nowrap; text-overflo .DateBorder{border:1px solid #d9d9d9; border-left:none; padding:7px 6px 6px 6px;} a.UsersEditBtn{ display:block; width:55px; height:20px; border:1px solid #6d6d6d; color:#fff; background:#888888 url(../images/homepage_icon.png) -11px -35px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px;} -a:hover.UsersEditBtn{ color:#484848; background:#888888 url(../images/homepage_icon.png) -11px -74px no-repeat;} +a:hover.UsersEditBtn{ color:#484848; background:#888888 url(../images/homepage_icon2.png) -11px -74px no-repeat;} a.UsersAttBtn{ display:block; width:55px; height:20px; border:1px solid #d3d3d3; color:#888888; background:#f2f3f3 url(../images/homepage_icon2.png) -9px -6px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px;} a:hover.UsersAttBtn{border:1px solid #888888; } a.UsersApBtn{ display:block; width:55px; height:20px; border:1px solid #d3d3d3; color:#888888; background:#f2f3f3 url(../images/homepage_icon2.png) -177px -6px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px;} From 9e91429b1e770e73d48f0e84e7f6037df1d0912d Mon Sep 17 00:00:00 2001 From: Tim Date: Sat, 10 Oct 2015 10:32:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=BC=A0=E6=A0=87=E5=9C=A8=E4=BE=A7?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E5=B7=A6=E4=BE=A7=E6=96=87=E5=AD=97=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E4=B8=8D=E5=8F=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/header.css | 4 ++-- public/stylesheets/new_user.css | 4 ++-- public/stylesheets/public.css | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css index b6566d628..36dcf1d81 100644 --- a/public/stylesheets/header.css +++ b/public/stylesheets/header.css @@ -43,9 +43,9 @@ a.homepageImageNumber:hover {color:#15bccf;} .homepageLeftMenuContainer {width:238px; border:1px solid #dddddd; border-bottom:none; background-color:#ffffff; margin-top:10px;} .homepageLeftMenuBlock {border-bottom:1px solid #dddddd; height:50px; line-height:50px; vertical-align:middle;} .homepageLeftMenuCourses {font-size:14px; border-bottom:1px solid #dddddd;} -.homepageLeftMenuCoursesLine {padding-left:25px; height:38px; line-height:38px; vertical-align:middle;} +.homepageLeftMenuCoursesLine {height:38px; line-height:38px; vertical-align:middle;} .homepageLeftMenuCoursesLine:hover {background-color:#b3e0ee;} -a.coursesLineGrey {color:#808080; display:block;} +a.coursesLineGrey {padding-left:25px; color:#808080; display:block;} a.coursesLineGrey:hover {color:#ffffff;} .homepageLeftMenuMore {height:18px;} .homepageLeftMenuMore:hover {background-color:#b3e0ee;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 53daa5933..4d8623fd6 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -564,9 +564,9 @@ a.homepageImageNumber:hover {color:#269ac9;} .homepageLeftMenuContainer {width:238px; border:1px solid #dddddd; border-bottom:none; background-color:#ffffff; margin-top:10px;} .homepageLeftMenuBlock {border-bottom:1px solid #dddddd; height:50px; line-height:50px; vertical-align:middle;} .homepageLeftMenuCourses {font-size:13px; border-bottom:1px solid #dddddd;} -.homepageLeftMenuCoursesLine {padding-left:25px; height:38px; line-height:38px; vertical-align:middle;} +.homepageLeftMenuCoursesLine {height:38px; line-height:38px; vertical-align:middle;} .homepageLeftMenuCoursesLine:hover {background-color:#269ac9;} -a.coursesLineGrey {color:#808080; display:block;} +a.coursesLineGrey {padding-left:25px; color:#808080; display:block;} a.coursesLineGrey:hover {color:#ffffff;} .homepageLeftMenuMore {height:18px;} .homepageLeftMenuMore:hover {background-color:#269ac9;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 90651f362..89073a8f8 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -479,9 +479,9 @@ a.homepageImageNumber:hover {color:#15bccf;} .homepageLeftMenuContainer {width:238px; border:1px solid #dddddd; border-bottom:none; background-color:#ffffff; margin-top:10px;} .homepageLeftMenuBlock {border-bottom:1px solid #dddddd; height:50px; line-height:50px; vertical-align:middle;} .homepageLeftMenuCourses {font-size:14px; border-bottom:1px solid #dddddd;} -.homepageLeftMenuCoursesLine {padding-left:25px; height:38px; line-height:38px; vertical-align:middle;} +.homepageLeftMenuCoursesLine {height:38px; line-height:38px; vertical-align:middle;} .homepageLeftMenuCoursesLine:hover {background-color:#b3e0ee;} -a.coursesLineGrey {color:#15bccf; display:block;} +a.coursesLineGrey {padding-left:25px; color:#15bccf; display:block;} a.coursesLineGrey:hover {color:#ffffff;} .homepageLeftMenuMore {height:18px;} .homepageLeftMenuMore:hover {background-color:#b3e0ee;} From 0d85fb3c5f7fb91c9edaecc7a0457f617a67cf7b Mon Sep 17 00:00:00 2001 From: Tim Date: Sat, 10 Oct 2015 11:07:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E5=9C=A8=E5=8F=98=E8=89=B2=E8=8C=83=E5=9B=B4=E5=86=85?= =?UTF-8?q?=E9=83=BD=E5=8F=AF=E7=82=B9=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_logined_header.html.erb | 8 +- app/views/layouts/_unlogin_header.html.erb | 190 ++++++++++----------- public/stylesheets/header.css | 2 +- public/stylesheets/new_user.css | 2 +- 4 files changed, 101 insertions(+), 101 deletions(-) diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index fbbe40a93..c750ff3b5 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -5,15 +5,15 @@
  • - <%= link_to "首页",user_activities_path(User.current.id), :class => "c_white f16 db"%> + <%= link_to "首页",user_activities_path(User.current.id), :class => "c_white f16 db p10"%>
  • - 资源库
    • + 资源库
  • - <%= link_to "作业", user_homeworks_user_path(User.current.id), :class => "c_white f16 db"%> + <%= link_to "作业", user_homeworks_user_path(User.current.id), :class => "c_white f16 db p10"%>
  • - 帮助中心 + 帮助中心
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb index 1665a2493..e674a769f 100644 --- a/app/views/layouts/_unlogin_header.html.erb +++ b/app/views/layouts/_unlogin_header.html.erb @@ -1,95 +1,95 @@ -
- -
- -
- - -
- 登录 -
-
- 注册 -
-
- - +
+ +
+ +
+ + +
+ 登录 +
+
+ 注册 +
+
+ + diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css index 36dcf1d81..096dd7e57 100644 --- a/public/stylesheets/header.css +++ b/public/stylesheets/header.css @@ -4,7 +4,7 @@ .homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;} .navHomepage {width:1000px; height:54px; background-color:#269ac9; margin:0 auto;} .navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;} -.navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle; padding:0px 10px;} +.navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle;} .navHomepageMenu:hover {background-color:#297fb8;} .navHomepageSearchBoxcontainer {margin-top:11px; } .navHomepageSearchBox {width:380px; border:none; outline:none; height:32px; margin-top:11px; background-color:#ffffff;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 4d8623fd6..5b187fa2d 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -518,7 +518,7 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; .homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;} .navHomepage {width:1000px; height:54px; background-color:#269ac9; margin:0 auto;} .navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;} -.navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle; padding:0px 10px;} +.navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle;} .navHomepageMenu:hover {background-color:#297fb8;} /*.navHomepageMenu:hover {background-color:#0ea6b7;}*/ .navHomepageSearchBoxcontainer {margin-top:11px; }