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

Conflicts: app/views/organizations/_org_custom_header.html.erb
9 years ago · 81ab73e286
parent 698e4bd7b3 9cc749bd57
commit 81ab73e286
4 changed files with 5 additions and 28 deletions
--- a/app/views/layouts/base_org_custom.html.erb
+++ b/app/views/layouts/base_org_custom.html.erb
@ -15,7 +15,7 @@
  <!-- MathJax的配置 -->
  <%=render :partial => "math_js" %>
 </head>
-<body>
+<body style="background: #fff">
 <% update_visiti_count @organization %>
 <header id="por_header">
  <%= render :partial => 'org_custom_header', :locals => {:subfield_content => @subfield_content} %>
--- a/app/views/organizations/_org_custom_header.html.erb
+++ b/app/views/organizations/_org_custom_header.html.erb
@ -67,7 +67,7 @@
    <% end %>
  </ul>
  <% if User.current.admin_of_org?(@organization) %>
-      <a href="<%= setting_organization_path(@organization) %>" class="fr por_edit_index">配置</a>
+      <a href="<%= setting_organization_path(@organization) %>" class="link-black fr por_edit_index">配置</a>
  <% end %>
  <div class="cl"></div>
 </div><!--por_nav end-->
--- a/public/stylesheets/org_custom.css
+++ b/public/stylesheets/org_custom.css
@ -1,28 +1,3 @@
-/* 门户样式重置 */
-body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;}
-body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:12px;line-height:1.5; background:#fff;}
-div,img,tr,td,table{ border:0;}
-table,tr,td{border:0;cellspacing:0; cellpadding:0;}
-ol,ul,li{ list-style-type:none}
-a:link,a:visited{color:#000;text-decoration:none;}
-a:hover,a:active{color:#3b94d6;}
-
-/* 公共 */
-.clear:after {content:".";height:0;visibility:hidden;display:block;clear:both;}
-.fl{ float:left;}
-.fr{ float:right;}
-.cl{ clear:both; overflow:hidden;}
-.mt5{ margin-top:5px;}
-.mt10{ margin-top:10px;}
-.mb5{ margin-bottom:5px;}
-.mb10{ margin-bottom:10px;}
-.ml5{ margin-left:5px;}
-.ml10{ margin-left:10px;}
-.ml15{ margin-left:15px;}
-.mr5{ margin-right:5px;}
-.mr10{ margin-right:15px;}
-.mr15{ margin-right:10px;}
-
 /* 门户首页 */
 #por_header{ width:100%;   }
 .por_header_top{ width:100%; height:70px; background:#3b94d6; }
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@ -270,6 +270,8 @@ a.linkGrey6 {color:#484848 !important;}
 a.linkGrey6:hover {color:#ffffff !important;}
 a.linkGrey7 {color:#888888;}
 a.linkGrey7:hover {color:#269ac9;}
+a.link-black {color:#000;}
+a.link-black:hover {color:#3b94d6;}
 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;}
@ -1139,4 +1141,4 @@ a.st_down{ display: block; width:8px; float:left; height:13px; background:url(..
 .likeNum{color: #7f7f7f}

 /*弹框*/
-.apply_content{ border:1px solid #ddd;line-height: 16px; height:80px;width:420px; background:#fff; margin-bottom:10px;}
+.apply_content{ border:1px solid #ddd;line-height: 16px; height:80px;width:420px; background:#fff; margin-bottom:10px;}