🚑 Hotfix: 修复夜晚模式开关不管用

#12
xzhuz · Jul 28, 2020 · 73961d0 · 73961d0
1 parent 29d6ed8
commit 73961d0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 19 deletions.
diff --git a/module/header.ftl b/module/header.ftl
@@ -16,7 +16,8 @@
                 <@menuTag method="tree">
                     <#list menus?sort_by('priority') as menu>
                         <li class="item">
-                            <a class="link md:text-base sm:text-sm " href="${menu.url!}" target="${menu.target!}">${menu.name}</a>
+                            <a class="link md:text-base sm:text-sm " href="${menu.url!}"
+                               target="${menu.target!}">${menu.name}</a>
                         </li>
                     </#list>
                 </@menuTag>
@@ -25,9 +26,11 @@
                 <div class="overlay"></div>
             </div>
         </ul>
-        <div class="day-night-mode">
-            <input id="switch_Word" type="checkbox" class="switch_Word">
-            <label for="switch_Word"><i></i></label>
-        </div>
+        <#if settings.open_night_mode!true>
+            <div class="day-night-mode">
+                <input id="switch_Word" type="checkbox" class="switch_Word">
+                <label for="switch_Word"><i></i></label>
+            </div>
+        </#if>
     </nav>
 </header>
diff --git a/settings.yaml b/settings.yaml
@@ -83,20 +83,9 @@ genernal:
         - value: false
           label: 关闭
       description: '悬浮显示简介'
-    auto_night_mode:
-      name: auto_night_mode
-      label: 暗夜模式总开关
-      type: radio
-      data-type: bool
-      default: true
-      options:
-        - value: true
-          label: 开启
-        - value: false
-          label: 关闭
-    night_mode:
-      name: night_mode
-      label: 暗夜模式顶部按钮(需要先打开暗黑模式总开关)
+    open_night_mode:
+      name: open_night_mode
+      label: 开启夜晚模式
       type: radio
       data-type: bool
       default: true
@@ -105,6 +94,17 @@ genernal:
           label: 开启
         - value: false
           label: 关闭
+#    night_mode:
+#      name: night_mode
+#      label: 暗夜模式顶部按钮(需要先打开暗黑模式总开关)
+#      type: radio
+#      data-type: bool
+#      default: true
+#      options:
+#        - value: true
+#          label: 开启
+#        - value: false
+#          label: 关闭
     Icp:
       name: Icp
       label: 'ICP 备案号'