기본 다크모드 CSS, 버그 수정

language/ko-KR.json

@@ -84,7 +84,7 @@
     "all_acl": "모든 사용자",
     "send": "전송",
     "not_sure": "확실하지 않음",
-    "file_name_error": "파일 이름에는 알파벳, 한글, 공백, 밑줄 및 빼기 기호만 사용할 수 있습니다.",
+    "file_name_error": "파일명에는 알파벳, 한글, 공백, 밑줄 및 빼기 기호만 사용할 수 있습니다.",
     "pass": "넘기기",
     "recaptcha_error": "'로봇이 아닙니다'를 통해 reCAPTCHA를 통과하세요.",
     "file_capacity_error": "최대 파일 크기 (MB): ",

route/tool/func.py

@@ -537,10 +537,12 @@ def other2(data):
 
     if req_list == '':
         for i_data in os.listdir(os.path.join("views", "main_css", "css")):
-            req_list += '<link rel="stylesheet" href="/views/main_css/css/' + i_data + '?ver=' + main_css_ver + '">'
+            if i_data != 'sub':
+                req_list += '<link rel="stylesheet" href="/views/main_css/css/' + i_data + '?ver=' + main_css_ver + '">'
 
         for i_data in os.listdir(os.path.join("views", "main_css", "js")):
-            req_list += '<script src="/views/main_css/js/' + i_data + '?ver=' + main_css_ver + '"></script>'
+            if i_data != 'sub':
+                req_list += '<script src="/views/main_css/js/' + i_data + '?ver=' + main_css_ver + '"></script>'
 
     data = data[0:2] + ['', '''
         <link   rel="stylesheet"

route/tool/set_mark/namumark.py

@@ -358,7 +358,8 @@ def middle_parser(data):
                             1
                         )
                     elif re.search(r'^#!syntax', middle_data[0]):
-                        middle_data_2 = re.search(r'{{{#!syntax ((?:(?!\n|{{{).)+)\n?', data)
+                        syntax_re = re.compile(r'{{{#!syntax ?((?:(?!\n|{{{|}}}).)*)\n?')
+                        middle_data_2 = syntax_re.search(data)
                         if middle_data_2:
                             middle_data_2 = middle_data_2.groups()
                         else:
@@ -371,8 +372,7 @@ def middle_parser(data):
 
                         middle_list += ['pre']
 
-                        data = re.sub(
-                            r'{{{#!syntax ?((?:(?!\n|{{{).)*)\n?',
+                        data = syntax_re.sub(
                             '<pre id="syntax"><code class="' + middle_data_2[0] + '">',
                             data,
                             1

version.json

@@ -1,7 +1,7 @@
 {
     "beta" : {
-        "r_ver" : "v3.2.0-beta-30 (v3.2.0-dev-2020-08-31-01)",
+        "r_ver" : "v3.2.0-beta-30 (v3.2.0-dev-2020-08-31-02)",
         "c_ver" : "3202600",
-        "s_ver" : "9"
+        "s_ver" : "10"
     }
 }

views/main_css/css/sub/dark.css

@@ -0,0 +1,11 @@
+textarea, input, button, select { background: #1f2023; color: white; }
+input::placeholder, textarea::placeholder, select::placeholder { color: white; }
+#toc, #cate, #redirect { background: #1f2023; }
+#toron_color_grey { background: #4a4a4a; }
+#toron_color_green { background: #2e4a2e; }
+#toron_color_red { background: #803737; }
+#toron_color_blue { background: #314c56; }
+pre#syntax, pre#syntax code { background: black; }
+.hljs, .hljs-subst { color: white; }
+blockquote { background-color: black; border-left: 5px solid #eee; }
+.spead_footnote { background-color: black; color: white; }

views/marisa/css/dark.css

@@ -17,46 +17,19 @@ html, #main {
     color: white;
 }
 
-textarea, input, button, select {
-    background: #1f2023;
-    color: white;
-    border-color: #1f2023;
-}
-
 #mobile_search_input, #mobile_search_input::placeholder {
     background: gray;
     color: white;
 }
 
-#toron_color_grey {
-    background: #4a4a4a;
-}
-
-#toron_color_green {
-    background: #2e4a2e;
-}
-
-#toron_color_red {
-    background: #803737;
-}
-
-#toron_color_blue {
-    background: #314c56;
-}
-
-pre#syntax {
-    background: black;
-}
-
 a#titlt_a {
     color: white;
 }
 
-button#save {
-    background: #083808;
+textarea, input, button, select, #toc, #cate, #redirect { 
+    border-color: #1f2023; 
 }
 
-blockquote {
-    background-color: black;
-    border-left: 5px solid #eee;
+button#save {
+    background: #083808;
 }

views/marisa/index.html

@@ -9,7 +9,7 @@
         {% endif %}
         {{imp[3][3]|safe}}
         <link rel="stylesheet" href="/views/marisa/css/main.css?ver=16">
-        <script src="/views/marisa/js/skin_set.js?ver=4"></script>
+        <script src="/views/marisa/js/skin_set.js?ver=5"></script>
         <script src="/views/marisa/js/main.js?ver=3"></script>
         <script>main_load(); window.addEventListener('DOMContentLoaded', function() { skin_set(); });</script>
         <script src="https://code.iconify.design/1/1.0.3/iconify.min.js"></script>

views/marisa/info.json

@@ -1,5 +1,5 @@
 {
     "name" : "Marisa",
-    "skin_ver" : "v1.2.7",
-    "require_ver" : "9"
+    "skin_ver" : "v1.2.8",
+    "require_ver" : "10"
 }

views/marisa/js/skin_set.js

@@ -15,7 +15,10 @@ function main_load() {
         cookies.match(regex_data('invert')) &&
         cookies.match(regex_data('invert'))[1] === '1'
     ) {
-        head_data.innerHTML += '<link rel="stylesheet" href="/views/marisa/css/dark.css?ver=6">';
+        head_data.innerHTML += '' +
+            '<link rel="stylesheet" href="/views/main_css/css/sub/dark.css?ver=1">' +
+            '<link rel="stylesheet" href="/views/marisa/css/dark.css?ver=6">' +
+        '';
     }
 }