Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/student_work/_work_information.html.erb

@@ -1,26 +1,27 @@
 <div id="popbox02">
   <div class="ni_con">
-    <h2>您刚上传的作品信息：</h2>
-    <p>
-      作品名称：<%=@student_work.name%>
+    <span class="f16 fontBlue fb">您上传的作品信息</span>
+    <p class="f14 mt5">
+      <span class="fb">作品名称：</span><%=@student_work.name%>
     </p>
-    <p>
-      作品描述：<%=@student_work.description%>
+    <p class="f14 mt5">
+      <span class="fb">作品描述：</span><%=@student_work.description%>
     </p>
-    <p>
-      <span class="fl">附件：</span>
+    <p class="mt5">
+      <span class="fl fb mr30">附</span><span class="fb fl">件：</span>
       <% if @student_work.attachments.count == 0%>
         <%= "无附件"%>
       <% else %>
         <div class="fl">
             <% @student_work.attachments.each do |attachment| %>
-              <span style="display: block"><%=attachment.filename %></span>
+              <span style="display: block; color: #808181;"><%=attachment.filename %></span>
             <% end %>
         </div>
       <% end %>
     </p>
-    <div class="ni_btn">
-      <a href="javascript:" class="tijiao" onclick="clickOK('<%= student_work_index_url(:homework => @homework.id)%>');" style="margin-bottom: 20px;" >
+    <div class="cl"></div>
+    <div class="ni_btn mt10">
+      <a href="javascript:" class="tijiao" onclick="clickOK('<%= student_work_index_url(:homework => @homework.id)%>');" style="margin-bottom: 15px; margin-left: 55px;" >
         确&nbsp;&nbsp;定
       </a>
     </div>

public/stylesheets/new_user.css

@@ -213,6 +213,8 @@ a.bBlue {background-color:#3498db;}
 a.bBlue:hover {background-color:#297fb8;}
 a.submit_btn {border:1px solid #3498db; padding:3px 10px; border-radius:3px; color:#3498db;}
 a.submit_btn:hover {background-color:#3498db; color:#ffffff;}
+a.submit_btn2 {background-color: #269ac9; padding: 3px 5px; color: #ffffff;}
+a.submit_btn2:hover {background-color:  #297fb8;}
 
 /****翻页***/
 .wlist{float:right;}
@@ -1295,13 +1297,13 @@ a:hover.SetUpIcon{background: url(../images/homepage_icon.png) 0px -486px no-rep
 /* 开启匿评弹框 */
 .anonymos{width:480px;height:180px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
 .anonymos_work {position:fixed !important;left:60%;top:60%;margin:-215px 0 0 -300px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
-.ni_con { width:425px; margin:25px 30px;}
+.ni_con { width:425px; margin:15px;}
 .ni_con h2{ display:block; height:40px; width:425px;   text-align:center; color:#3a3a3a;}
 .ni_con p{ color:#808181; }
 .ni_con a:hover{ text-decoration:none;}
 .ni_btn{ width:190px; margin:15px auto;  line-height:1.9;}
-a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#15bccf; text-align:center; padding-top:4px; float:left; margin-right:15px;}
-a:hover.tijiao{ background:#0f99a9;}
+a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#269ac9; text-align:center; padding-top:4px; float:left; margin-right:15px;}
+a:hover.tijiao{ background:#297fb8;}
 .c_pink{ color:#e65d5e;}
 .ni_con_work { width:300px; margin:25px 20px;}
 .ni_con_work p{ color:#808181; }