From 2461a5c918667a34c5111efe9d3975c0766a7546 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Mon, 9 May 2016 19:40:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=97=A8=E6=88=B7=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E7=9B=AE=E5=BD=95=E4=BD=8D=E7=BD=AE=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org2.html.erb       | 4 ++--
 app/views/layouts/base_sub_domain.html.erb | 4 ++--
 public/stylesheets/org2.css                | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb
index 4269db02e..6a641d0f2 100644
--- a/app/views/layouts/base_org2.html.erb
+++ b/app/views/layouts/base_org2.html.erb
@@ -77,7 +77,7 @@
       </div>
     </div>
     <!--导航-->
-    <div class="sn-row sn-bg-blue">
+    <div class="sn-row sn-bg-blue sn-p-relative">
       <ul class="sn-nav">
         <% @subfield_content.each do |field| %>
             <% if is_default_field?(field) %>
@@ -101,7 +101,7 @@
                       <a href="#message_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
                     </li>
                     <!--二级目录-->
-                    <div class="<%= User.current.logged? ? "sn-row sn-subnav-position2 sn-grey-opacity" : "sn-row sn-subnav-position sn-grey-opacity" %>" style="display:none;">
+                    <div class="sn-row sn-subnav-position sn-grey-opacity" style="display:none;">
                       <ul class="sn-sub-nav" style="display:<%= if_hidden_subdomain( field) ? 'block':'none' %>;">
                         <% field.sub_domains.each do |subdomain| %>
                             <li><%=link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => field.id), :class => "sn-link-grey" %></li>
diff --git a/app/views/layouts/base_sub_domain.html.erb b/app/views/layouts/base_sub_domain.html.erb
index 1cb1575c1..871e2cdea 100644
--- a/app/views/layouts/base_sub_domain.html.erb
+++ b/app/views/layouts/base_sub_domain.html.erb
@@ -94,7 +94,7 @@
         </div>
       </div>
       <!--导航-->
-      <div class="sn-row sn-bg-blue">
+      <div class="sn-row sn-bg-blue sn-p-relative">
         <ul class="sn-nav">
           <% @subfield_content.each do |field| %>
               <% if is_default_field?(field) %>
@@ -118,7 +118,7 @@
                         <a href="#message_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
                       </li>
                       <!--二级目录-->
-                      <div class="<%= User.current.logged? ? "sn-row sn-subnav-position2 sn-grey-opacity" : "sn-row sn-subnav-position sn-grey-opacity" %>" style="display:none;">
+                      <div class="sn-row sn-subnav-position sn-grey-opacity" style="display:none;">
                         <ul class="sn-sub-nav" style="display:<%= if_hidden_subdomain( field) ? 'block':'none' %>;">
                           <% field.sub_domains.each do |subdomain| %>
                               <li><%=link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => @org_subfield.id), :class => "sn-link-grey" %></li>
diff --git a/public/stylesheets/org2.css b/public/stylesheets/org2.css
index d1ba03354..6e2954bf4 100644
--- a/public/stylesheets/org2.css
+++ b/public/stylesheets/org2.css
@@ -14,6 +14,7 @@ a:hover,a:active{color:#24366e;}
 .sn-cl {clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden}
 .sn-container {width:100%; background-color:#fff;}
 .sn-p-absolute {position:absolute;}
+.sn-p-relative {position:relative;}
 .sn-grey-opacity {background:rgba(230, 230, 230, 0.9)!important; filter:Alpha(opacity=90); background:#e6e6e6;}
 .sn-border {border-top:1px solid #dfdfdf; border-bottom:1px solid #dfdfdf;}
 /* 公共 */
@@ -65,12 +66,11 @@ a.sn-link-select {color:#809df9;}
 .sn-logo {width:1200px; height:90px; line-height:90px; margin:0 auto; vertical-align:middle;position:relative;}
 .sn-search-input {width:328px; height:40px; font-size:16px; color:#ccc; padding-left:10px; border:1px solid #ccc; border-right:none; float:right; background-color:#fff; outline:none;}
 a.sn-search-button {width:53px; height:40px; border:1px solid #ccc; border-left:none; float:right; outline:none; background:url(../images/sn_search_icon.jpg) 0 3px no-repeat;}
-.sn-nav {width:1200px; height:55px; margin:0 auto; font-size:16px; position:relative; line-height:1; overflow:hidden;}
+.sn-nav {width:1200px; height:55px; margin:0 auto; font-size:16px; line-height:1; overflow:hidden;}
 .nav-element-default, .nav-element {float:left; padding-top:11px; padding-bottom:12px; margin-right:50px;}
 .nav-element-default a, .nav-element a  {display:inline-block; padding:8px 6px; border-radius:5px;}
 .nav-element-default a:hover, .nav-element a:hover {background-color:#809df9;}
-.sn-subnav-position {position:fixed; left:0; top:190px; z-index:99;}
-.sn-subnav-position2 {position:fixed; left:0; top:203px; z-index:99;}
+.sn-subnav-position {position:absolute; left:0; top:55px; z-index:99;}
 .sn-sub-nav {width:1200px; margin:0 auto; font-size:14px; position:relative; line-height:1;}
 .sn-sub-nav li {color:#999; float:left;}
 .sn-sub-nav li a {height:40px; line-height:40px; vertical-align:middle; margin:0 5px; padding:0 5px; display:inline-block;}