Fixed known bugs

zhwangart · Apr 3, 2022 · c670371 · c670371
1 parent effd07d
commit c670371
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 56 deletions.
diff --git a/_config.yml b/_config.yml
@@ -10,7 +10,7 @@ menu:
 excerpt_link: 阅读全文
 
 # Toc
-toc: true
+toc: false
 
 # MIIT ICP/IP/DOMAIN
 beian: 
@@ -33,7 +33,7 @@ hero:
   image: /images/banner.jpg
 ## keen-slider
 keen_slider: 
-  enable: true
+  enable: false
 
 # Slogan
 slogan: 

diff --git a/layout/_partial/after-footer.ejs b/layout/_partial/after-footer.ejs
@@ -1,47 +1,59 @@
 <%- js('//cdn.jsdelivr.net/npm/feather-icons/dist/feather.min.js') %>
 <% if (theme.toc){ %>
-  <%- js('//cdnjs.cloudflare.com/ajax/libs/tocbot/4.11.1/tocbot.min.js') %>
+	<%- js('//cdnjs.cloudflare.com/ajax/libs/tocbot/4.11.1/tocbot.min.js') %>
+	<script>
+    tocbot.init({
+      // Where to render the table of contents.
+      tocSelector: '.js-toc',
+      // Where to grab the headings to build the table of contents.
+      contentSelector: '.js-toc-content',
+      // Which headings to grab inside of the contentSelector element.
+      headingSelector: 'h3, h4, h5',
+      // For headings inside relative or absolute positioned containers within content.
+      hasInnerContainers: true,
+    });
+	</script>
 <% } %>
 <% if (theme.keen_slider.enable){ %>
-  <%- js('//cdn.jsdelivr.net/npm/keen-slider@latest/keen-slider.js') %>
-  <script>
-    var slider = new KeenSlider(
-      "#my-keen-slider",
-      {
-        loop: true,
-      },
-      [
-        (slider) => {
-          let timeout
-          let mouseOver = false
-          function clearNextTimeout() {
-            clearTimeout(timeout)
-          }
-          function nextTimeout() {
-            clearTimeout(timeout)
-            if (mouseOver) return
-            timeout = setTimeout(() => {
-              slider.next()
-            }, 3000)
-          }
-          slider.on("created", () => {
-            slider.container.addEventListener("mouseover", () => {
-              mouseOver = true
-              clearNextTimeout()
-            })
-            slider.container.addEventListener("mouseout", () => {
-              mouseOver = false
-              nextTimeout()
-            })
-            nextTimeout()
-          })
-          slider.on("dragStarted", clearNextTimeout)
-          slider.on("animationEnded", nextTimeout)
-          slider.on("updated", nextTimeout)
-        },
-      ]
-    )
-  </script>
+	<%- js('//cdn.jsdelivr.net/npm/keen-slider@latest/keen-slider.js') %>
+	<script>
+		var slider = new KeenSlider(
+			"#my-keen-slider",
+			{
+				loop: true,
+			},
+			[
+				(slider) => {
+					let timeout
+					let mouseOver = false
+					function clearNextTimeout() {
+						clearTimeout(timeout)
+					}
+					function nextTimeout() {
+						clearTimeout(timeout)
+						if (mouseOver) return
+						timeout = setTimeout(() => {
+							slider.next()
+						}, 3000)
+					}
+					slider.on("created", () => {
+						slider.container.addEventListener("mouseover", () => {
+							mouseOver = true
+							clearNextTimeout()
+						})
+						slider.container.addEventListener("mouseout", () => {
+							mouseOver = false
+							nextTimeout()
+						})
+						nextTimeout()
+					})
+					slider.on("dragStarted", clearNextTimeout)
+					slider.on("animationEnded", nextTimeout)
+					slider.on("updated", nextTimeout)
+				},
+			]
+		)
+	</script>
 <% } %>
+<%- js('/js/mobile-nav') %>
 <%- js('/js/script') %>
-<%- js('/js/mobile-nav') %>
diff --git a/layout/_partial/header.ejs b/layout/_partial/header.ejs
@@ -4,7 +4,7 @@
 	<header class="header">
 <% } %>
 	<div class="container">
-		<nav class="navbar d-flex justify-content-between align-items-center">
+		<nav class="navbar d-flex align-items-center">
 			<a class="brand" href="<%- url_for() %>">
 				<img class="logo" src="<%- url_for(theme.brand) %>" alt="<%= config.title %>" role="img">
 			</a>

diff --git a/layout/index.ejs b/layout/index.ejs
@@ -9,7 +9,7 @@
 </section>
 
 <% for (var section in site.data.index){%>
-  <section class="section py-5 <%=site.data.index[section]['bg_color'] %>">
+  <section class="section py-5 <%=site.data.index[section]['bg_color'] %>" id="<%=site.data.index[section]['id'] %>">
     <div class="container<%=site.data.index[section]['fluid'] %>">
       <div class="section-heading text-center mb-5">
         <h3><%=site.data.index[section]['title'] %></h3>

diff --git a/source/js/script.js b/source/js/script.js
@@ -11,17 +11,6 @@ document.onscroll = function() {
 
 feather.replace()
 
-tocbot.init({
-  // Where to render the table of contents.
-  tocSelector: '.js-toc',
-  // Where to grab the headings to build the table of contents.
-  contentSelector: '.js-toc-content',
-  // Which headings to grab inside of the contentSelector element.
-  headingSelector: 'h3, h4, h5',
-  // For headings inside relative or absolute positioned containers within content.
-  hasInnerContainers: true,
-});
-
 var tesObj = document.getElementsByName("carousel");
 	//设置 value 值为 0 选中
 	for(var i=0; i < tesObj.length; i++){