Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou

app/views/attachments/_show_attachment_history.html.erb

@@ -39,8 +39,9 @@
         <!--<a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="closeModal();"><%#= l(:button_cancel)%></a>-->
         <!--<a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%#= l(:button_confirm)%></a>-->
       </div>
-      <div class="mb5">
-        <label class="fl c_dark f14" style="margin-top: 4px;">描述：</label>
+      <div class="cl"></div>
+      <div class="mb5 mt5">
+        <label class="fl c_dark f14" style="line-height:30px;">描述：</label>
         <div class="fl">
           <input  type="text" name="description" class="InputBox fl W160" value="<%= @attachment.description %>">
         </div>