Browse Source

fix darkmode

잉여개발기 (SPDV) 3 years ago
parent
commit
e2c4a48eed
3 changed files with 5 additions and 12 deletions
  1. 4 2
      route/tool/func.py
  2. 1 1
      version.json
  3. 0 9
      views/main_css/js/load_skin_set.js

+ 4 - 2
route/tool/func.py

@@ -1041,7 +1041,7 @@ def wiki_css(data):
     data += ['' for _ in range(0, 3 - len(data))]
     data += ['' for _ in range(0, 3 - len(data))]
     
     
     data_css = ''
     data_css = ''
-    data_css_ver = '158'
+    data_css_ver = '159'
     
     
     # Func JS + Defer
     # Func JS + Defer
     data_css += '<script src="/views/main_css/js/func/func.js?ver=' + data_css_ver + '"></script>'
     data_css += '<script src="/views/main_css/js/func/func.js?ver=' + data_css_ver + '"></script>'
@@ -1075,7 +1075,9 @@ def wiki_css(data):
     
     
     # Main CSS
     # Main CSS
     data_css += '<link rel="stylesheet" href="/views/main_css/css/main.css?ver=' + data_css_ver + '">'
     data_css += '<link rel="stylesheet" href="/views/main_css/css/main.css?ver=' + data_css_ver + '">'
-    
+    if request.cookies.get('main_css_darkmode', '') == '1':
+        data_css += '<link rel="stylesheet" href="/views/main_css/css/sub/dark.css?ver=' + data_css_ver + '">'
+
     # External
     # External
     data_css += '<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.5.0/build/styles/default.min.css">'
     data_css += '<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.5.0/build/styles/default.min.css">'
     data_css += '<script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.5.0/build/highlight.min.js"></script>'
     data_css += '<script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.5.0/build/highlight.min.js"></script>'

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
 {
     "beta" : {
     "beta" : {
-        "r_ver" : "v3.4.5-unstable (stable2) (beta5-70)",
+        "r_ver" : "v3.4.5-unstable (stable2) (beta5-71)",
         "c_ver" : "3500354",
         "c_ver" : "3500354",
         "s_ver" : "3500110"
         "s_ver" : "3500110"
     }
     }

+ 0 - 9
views/main_css/js/load_skin_set.js

@@ -134,15 +134,6 @@ function main_css_skin_load() {
         head_data.innerHTML += '<style>body, input, textarea { font-size: ' + document.cookie.match(opennamu_cookie_split_regex('main_css_font_size'))[1] + 'px; }</style>';
         head_data.innerHTML += '<style>body, input, textarea { font-size: ' + document.cookie.match(opennamu_cookie_split_regex('main_css_font_size'))[1] + 'px; }</style>';
     }
     }
     
     
-    if(
-        document.cookie.match(opennamu_cookie_split_regex('main_css_darkmode')) &&
-        document.cookie.match(opennamu_cookie_split_regex('main_css_darkmode'))[1] === '1'
-    ) {
-        head_data.innerHTML += '' +
-            '<link rel="stylesheet" href="/views/main_css/css/sub/dark.css?ver=6">' +
-        '';
-    }
-    
     if(
     if(
         document.cookie.match(opennamu_cookie_split_regex('main_css_link_delimiter')) &&
         document.cookie.match(opennamu_cookie_split_regex('main_css_link_delimiter')) &&
         document.cookie.match(opennamu_cookie_split_regex('main_css_link_delimiter'))[1] === '1'
         document.cookie.match(opennamu_cookie_split_regex('main_css_link_delimiter'))[1] === '1'