From 9b8270aed111e432d5f09188561a90e60de69792 Mon Sep 17 00:00:00 2001
From: suntao <719450423@qq.com>
Date: Wed, 2 Sep 2015 14:15:26 +0800
Subject: [PATCH] =?UTF-8?q?Banner=20padding=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/show.html.erb             |  2 --
 app/views/users/user_homeworks.html.erb   | 11 ++++-------
 app/views/users/user_messages.html.erb    |  4 +---
 app/views/users/user_newfeedback.html.erb |  5 ++---
 app/views/users/user_resource.html.erb    |  5 ++---
 public/stylesheets/new_user.css           | 12 ++++++------
 6 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 76599739c..aa2c02ce2 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,5 +1,4 @@
 <input type="hidden" value="<%= @type%>" name="type" id="user_activities_type">
-<div class="resources">
   <div class="homepageRightBanner">
     <div class="NewsBannerName">最新动态</div>
     <ul class="resourcesSelect">
@@ -37,6 +36,5 @@
       </li>
     </ul>
   </div>
-</div>
 
 <%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => 0} %>
\ No newline at end of file
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index 3e2a0abe7..9d93ad0fd 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -15,11 +15,10 @@
 
 <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
     <!-- 老师身份才可以发布作业 -->
-    <div class="resources mb10">
-      <div class="homepageRightBanner">
+    <div class="homepageRightBanner mb10">
         <div class="NewsBannerName">发布作业</div>
       </div>
-    </div>
+
     <div class="cl"></div>
 
     <div class="HomeWork mb10">
@@ -32,10 +31,8 @@
     </div><!----HomeWork end-->
 
 <%else%>
-    <div class="resources mb10">
-      <div class="homepageRightBanner">
-        <div class="NewsBannerName">作业</div>
-      </div>
+    <div class="homepageRightBanner mb10">
+      <div class="NewsBannerName">作业</div>
     </div>
     <div class="cl"></div>
 <% end%>
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 207572a1c..d330857c3 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -1,5 +1,4 @@
-<div class="resources">
-  <div class="homepageRightBanner">
+<div class="homepageRightBanner">
     <div class="NewsBannerName">消息</div>
     <ul class="resourcesSelect">
       <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
@@ -28,7 +27,6 @@
       </li>
     </ul>
   </div>
-</div>
 <div class="resources mt10" id="users_setting">
 <div>
 <% if @message_alls.count >0 %>
diff --git a/app/views/users/user_newfeedback.html.erb b/app/views/users/user_newfeedback.html.erb
index c8196c90f..60e630959 100644
--- a/app/views/users/user_newfeedback.html.erb
+++ b/app/views/users/user_newfeedback.html.erb
@@ -10,11 +10,10 @@
     div.ke-toolbar .ke-outline{border:none;}
 </style>
 <div >
-  <div class="resources mb10">
-    <div class="homepageRightBanner">
+  <div class="homepageRightBanner mb10">
       <div class="NewsBannerName">留言</div>
     </div>
-  </div>
+
   <div class="cl"></div>
 
   <div class="message_box mb10" id="users_setting">
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index c0049db88..096d6e8f5 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -42,8 +42,7 @@
         $("#upload_form").submit();
     }
 </script>
-<div class="resources" >
-  <div class="homepageRightBanner">
+<div class="homepageRightBanner">
     <div class="NewsBannerName">资源库</div>
     <ul class="resourcesSelect">
       <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
@@ -67,7 +66,7 @@
       </li>
     </ul>
   </div>
-</div>
+
 <div class="resources mt10" id="users_setting">
   <div class="resourcesSearchBanner mt10">
     <div class="resourcesUploadBox">
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 0da0c02fa..8f62820a5 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -499,12 +499,12 @@ a.coursesLineGrey:hover {color:#ffffff;}
 .homepageLeftMenuMore {height:18px;}
 .homepageLeftMenuMore:hover {background-color:#269ac9;}
 .homepageLeftMenuMoreIcon {background:url(../images/homepage_icon.png) -74px -240px no-repeat; display:block; height:18px;}
-.homepageMenuSetting {display:inline-block; margin-left:155px;background:url(../images/homepage_icon.png) -190px -365px no-repeat; width:15px; height:15px; margin-top: 16px; margin-right: 15px;}
+.homepageMenuSetting {display:inline-block; background:url(../images/homepage_icon.png) -190px -365px no-repeat; width:15px; height:15px; margin-top: 16px; margin-right: 15px;}
 .homepageMenuSetting:hover {background:url(../images/homepage_icon.png) -190px -407px no-repeat;}
 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; margin:0px auto;}
+.homepageRightBanner {width:718px; margin:0px auto; float:right; background-color: #ffffff; padding:10px 15px; border:1px solid #dddddd;}
 .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;}
@@ -560,7 +560,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostReplyBannerCount{width:255px; display:inline-block; margin-left:20px;}
 .homepagePostReplyBannerTime{width:85px; display:inline-block;}
 .homepagePostReplyBannerMore{width:330px; display:inline-block; text-align:right;}
-.homepagePostReplyInputContainer {width:670px; margin: 10px auto 0 auto;}
+.homepagePostReplyInputContainer {width:680px; margin: 10px auto 0 auto;}
 .homepagePostReplyInput {width:663px; height:45px; max-width:663px; max-height:45px; border:1px solid #d9d9d9; outline:none; margin:20px auto 10px auto;}
 .homepagePostReplyEmotion {background:url(../images/homepage_icon.png) -90px -88px no-repeat; width:50px; height:24px; float:left; padding-left:30px;}
 .homepagePostReplySubmit {float:right; width:45px; height:24px; text-align:center; line-height:24px; vertical-align:middle; font-size:12px; color:#ffffff; background-color:#269ac9;}
@@ -572,7 +572,7 @@ a.postReplyCancel {color:#888888; display:block;}
 a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostReplyInputContainer2 {width:595px; margin:0px auto;}
 .homepagePostReplyInput2 {width:588px; height:45px; max-width:588px; max-height:45px; border:1px solid #d9d9d9; outline:none; margin:0px auto 10px auto;}
-.homepagePostReplyContainer {border-bottom:1px solid #e3e3e3; width:680px; margin:0px auto; margin-top:15px; min-height:65px;}
+.homepagePostReplyContainer {border-bottom:1px solid #e3e3e3; width:680px; margin:0px auto; margin-top:15px; min-height:60px;}
 .homepagePostSetting {position:absolute; width:20px; height:20px; right:0px; top:0px;}
 .homepagePostSettingIcon {background:url(../images/homepage_icon.png) -93px -5px no-repeat; width:20px; height:20px;}
 .homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;}
@@ -580,7 +580,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;}
 a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyPortrait {float:left; width:45px;}
-.homepagePostReplyDes {float:left; width:595px; margin-left:15px;}
+.homepagePostReplyDes {float:left; width:620px; margin-left:15px;}
 .homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;}
 .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;}
@@ -843,7 +843,7 @@ a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
 .uppic_btn:hover {background-color: #329cbd;}
 
 /*20150820课程作业 LB*/
-.HomeWork {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;}
+.HomeWork {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd; float:right;}
 .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 #269ac9; color:#269ac9;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}