fix some bug

alsodzy · Apr 3, 2014 · b1fff49 · b1fff49
1 parent 2d241bf
commit b1fff49
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 18 deletions.
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,5 +1,8 @@
-<div class="opacity" style="position:fixed;right:20px;top:10px;">
-  <button id="nav_btn" class="btn btn-lg"><i class="fa fa-reorder"></i></button>
+<div style="position:fixed;right:20px;top:10px;">
+  <button id="nav_btn" class="btn btn-lg" style="height:45px;width:45px;"><i class="fa fa-angle-left"></i></button>
+</div>
+<div style="position:fixed;right:20px;top:60px;">
+  <button id="content_btn" class="btn btn-lg" style="height:45px;width:45px;"><i class="fa fa-angle-down"></i></button>
 </div>
 <script type="text/javascript" src="/public/js/jquery.js"></script>
 <script type="text/javascript" src="/public/js/bootstrap.js"></script>

diff --git a/_layouts/post.html b/_layouts/post.html
@@ -9,19 +9,17 @@ <h2 id="#identifier">{{ page.title }}</h2>
   </div>
   <div class="col-md-12 aside3-content">
     <hr>
-    <div class="pull-right panel panel-success">
-      <div class="panel-heading">
-        <h4 class="panel-title"><a data-toggle="collapse" data-toggle="collapse" href="#content-table">目录</a></h4>
-      </div>
-      <div id="content-table" class="panel-collapse collapse">
-        <div class="panel-body" id="nav"></div>
-      </div>
-    </div>
     <div id="content">
       {{ content }}
     </div>
     <hr>
     {% include disqus.html %}
   </div>
+  <!-- 目录 -->
+  <div id="content_table" style="position:fixed;right:20px;top:120px;display:none;">
+    <div class="panel panel-success">
+      <div class="panel-body" id="nav"></div>
+    </div>
+  </div>
 </div>
 
diff --git a/public/css/base.css b/public/css/base.css
@@ -71,12 +71,7 @@ blockquote p{font-size:20px;}
   color: #2a6496;
   background-color: #fafaf6;
 }
-.opacity {
-  opacity:0.75;
-  -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(opacity=75)";
-  filter:alpha(opacity=75);
-  zoom:1
-}
+
 .show-commend{
   width:100%;
   margin-bottom:40px;

diff --git a/public/js/base.js b/public/js/base.js
@@ -8,16 +8,32 @@ $(document).ready(function() {
       $('.aside').removeClass('visible-md visible-lg').addClass('hidden-md hidden-lg');
       $('.aside3').removeClass('col-md-8 col-lg-8').addClass('col-md-12 col-lg-12');
       $('.aside3-content').removeClass('col-md-12').addClass('col-md-10 col-lg-10 col-md-offset-1 col-lg-offset-1');
+      $('#nav_btn i').removeClass('fa-angle-left').addClass('fa-angle-right');
     }else{
       $('.aside').addClass('visible-md visible-lg').removeClass('hidden-md hidden-lg')
       $('.aside3').removeClass('col-md-12 col-lg-12').addClass('col-md-8 col-lg-8');
       $('.aside3-content').removeClass('col-md-10 col-lg-10 col-md-offset-1 col-lg-offset-1').addClass('col-md-12');
+      $('#nav_btn i').removeClass('fa-angle-right').addClass('fa-angle-left');
+    }
+  });
+  $("#content_btn").on('click', function(){
+    isClicked=$(this).data('clicked');
+    if (isClicked) {isClicked=false;} else {isClicked=true;}
+    $(this).data('clicked',isClicked);
+    if(isClicked){
+      $('#content_table').show();
+      $('#content_btn i').removeClass('fa-angle-down').addClass('fa-angle-up');
+    }else{
+      $('#content_table').hide();
+      $('#content_btn i').removeClass('fa-angle-up').addClass('fa-angle-down');
     }
   });
   $(document).pjax('.pjaxlink', '#pjax', { fragment: "#pjax", timeout: 10000 });
   $(document).on("pjax:end", function() {
-      $('.aside3').scrollTop(0);
-      contentEffects();
+    if($("body").find('.container').width() < 992)
+      $('#nav_btn').click();
+    $('.aside3').scrollTop(0);
+    contentEffects();
   });
   $('body').on('click', '.show-commend', function(){
     var ds_loaded = false;