Strona główna Odkrywaj Pomoc
Zaloguj się
wiki
/
openNAMU__openNAMU
kopia lustrzana https://github.com/openNAMU/openNAMU.git
2
0
Forkuj 0
Pliki Problemy 0 Wiki
Przeglądaj źródła

fix dark mode

잉여개발기 (SPDV) 3 lat temu
rodzic
2ac94e3522
commit
8b52094adc
8 zmienionych plików z 85 dodań i 53 usunięć
Zunifikowany widok Pokaż statystyki zmian
  1. 1 1
      route/tool/func.py
  2. 1 1
      version.json
  3. 6 6
      views/main_css/css/sub/dark.css
  4. 48 3
      views/ringo/css/main.css
  5. 19 21
      views/ringo/index.html
  6. 5 2
      views/tenshi/index.html
  7. 1 1
      views/tenshi/info.json
  8. 4 18
      views/tenshi/js/skin_set.js

+ 1 - 1
route/tool/func.py
Wyświetl plik 

@@ -1008,7 +1008,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 = '150'
 
+    data_css_ver = '151'
 
     
     
     # Func JS + Defer
 
     # Func JS + Defer
 
     data_css += '<script defer src="/views/main_css/js/func/func.js?ver=' + data_css_ver + '"></script>'
 
     data_css += '<script defer src="/views/main_css/js/func/func.js?ver=' + data_css_ver + '"></script>'

+ 1 - 1
version.json
Wyświetl plik 

@@ -1,6 +1,6 @@
 
 {
 
 {
 
     "beta" : {
 
     "beta" : {
 
-        "r_ver" : "v3.4.5 (stable2) (beta3) (dev45)",
 
+        "r_ver" : "v3.4.5 (stable2) (beta3) (dev46)",
 
         "c_ver" : "3500113",
 
         "c_ver" : "3500113",
 
         "s_ver" : "3500110"
 
         "s_ver" : "3500110"
 
     }
 
     }

+ 6 - 6
views/main_css/css/sub/dark.css
Wyświetl plik 

@@ -12,27 +12,27 @@ input::placeholder, textarea::placeholder, select::placeholder {
 
     color: white;
 
     color: white;
 
 }
 
 }
 
 
 
-#toc, #cate, #redirect {
 
+#toc, .opennamu_TOC, #cate, #redirect {
 
     background: #1f2023;
 
     background: #1f2023;
 
 }
 
 }
 
 
 
-#toron_color_grey {
 
+.opennamu_comment_color_gray {
 
     background: #4a4a4a;
 
     background: #4a4a4a;
 
 }
 
 }
 
 
 
-#toron_color_green {
 
+.opennamu_comment_color_green {
 
     background: #2e4a2e;
 
     background: #2e4a2e;
 
 }
 
 }
 
 
 
-#toron_color_red {
 
+.opennamu_comment_color_red {
 
     background: #803737;
 
     background: #803737;
 
 }
 
 }
 
 
 
-#toron_color_normal {
 
+.opennamu_comment_color_default {
 
     background: #38340e;
 
     background: #38340e;
 
 }
 
 }
 
 
 
-#toron_color_blue {
 
+.opennamu_comment_color_blue {
 
     background: #314c56;
 
     background: #314c56;
 
 }
 
 }

+ 48 - 3
views/ringo/css/main.css
Wyświetl plik 

@@ -7,6 +7,18 @@ html {
 
     background: #eee;
 
     background: #eee;
 
 }
 
 }
 
 
 
+h1, h2, h3, h4, h5, h6 {
 
+    border-bottom: 1px solid gainsboro;
 
+    
+    padding-bottom: 10px;
 
+}
 
+
 
+h1.blank, h2.blank, h3.blank, h4.blank, h5.blank, h6.blank {
 
+    border-bottom: none;
 
+
 
+    padding-bottom: 0px;
 
+}
 
+
 
 header#main {
 
 header#main {
 
     border-bottom: 0;
 
     border-bottom: 0;
 
     
     
@@ -36,17 +48,40 @@ header#main form.not_mobile {
 
     display: inline-block;
 
     display: inline-block;
 
 }
 
 }
 
 
 
+header a#logo {
 
+    height: 52px;
 
+
 
+    display: inline-block;
 
+
 
+    padding-left: 20px;
 
+    padding-right: 20px;
 
+
 
+    margin-left: -20px;
 
+}
 
+
 
+header a#logo:hover {
 
+    background-color: #95c3df;
 
+}
 
+
 
 div#menu {
 
 div#menu {
 
     margin-top: 10px;
 
     margin-top: 10px;
 
+
 
+    margin-left: 6px;
 
 }
 
 }
 
 
 
-.menu_item {
 
+.menu_item_link {
 
     border: 0;
 
     border: 0;
 
     background-color: white;
 
     background-color: white;
 
     
     
     padding: 10px;
 
     padding: 10px;
 
     
     
     display: inline-block;
 
     display: inline-block;
 
+
 
+    margin-left: -6px;
 
+}
 
+
 
+.menu_item_link:hover {
 
+    background-color: #eee;
 
 }
 
 }
 
 
 
 input.search {
 
 input.search {
 
@@ -78,29 +113,39 @@ button.search_button {
 
     vertical-align: middle;
 
     vertical-align: middle;
 
     
     
     margin-top: -5px;
 
     margin-top: -5px;
 
-    margin-left: -5px;
 
+    margin-left: -6px;
 
     
     
     border: 0;
 
     border: 0;
 
     
     
     font-size: 20px;
 
     font-size: 20px;
 
     
     
     line-height: 0px;
 
     line-height: 0px;
 
+
 
+    cursor: pointer;
 
 }
 
 }
 
 
 
 button.search_button#goto {
 
 button.search_button#goto {
 
     background-color: #ccffbb;
 
     background-color: #ccffbb;
 
 }
 
 }
 
 
 
+button.search_button#goto:hover {
 
+    background-color: #99bf8c;
 
+}
 
+
 
 button.search_button#search {
 
 button.search_button#search {
 
     background-color: #ffeecc;
 
     background-color: #ffeecc;
 
 }
 
 }
 
 
 
+button.search_button#search:hover {
 
+    background-color: #bcb097;
 
+}
 
+
 
 aside {
 
 aside {
 
     width: 250px;
 
     width: 250px;
 
     
     
     float: left;
 
     float: left;
 
     
     
-    display: inline-block;
 
+    display: block;
 
     
     
     padding-top: 10px;
 
     padding-top: 10px;
 
     padding-left: 20px;
 
     padding-left: 20px;

+ 19 - 21
views/ringo/index.html
Wyświetl plik 

@@ -27,7 +27,7 @@
 
     <body>
 
     <body>
 
         <header id="main">
 
         <header id="main">
 
             <span id="left">
 
             <span id="left">
 
-                <span id="logo"><a href="/">{{imp[1][4]|safe}}</a></span>
 
+                <a id="logo" href="/">{{imp[1][4]|safe}}</a>
 
             </span>
 
             </span>
 
             <span id="right">
 
             <span id="right">
 
                 <span class="top_cel" id="">
 
                 <span class="top_cel" id="">
 
@@ -76,28 +76,26 @@
 
         <section>
 
         <section>
 
             <header id="section">
 
             <header id="section">
 
                 <article class="main" id="title">
 
                 <article class="main" id="title">
 
-                    <h1><span class="change_space">{{imp[0]}}</span></h1>
 
+                    <h1 class="blank"><span class="change_space">{{imp[0]}}</span></h1>
 
                     {% if menu != 0 %}
 
                     {% if menu != 0 %}
 
                         <div id="menu">
 
                         <div id="menu">
 
-                            {% for menu_data in menu %}<!--
 
-                             --><div class="menu_item">
 
-                                    {% if menu[0] == 1 %}
 
-                                        {% set menu_data_2 = menu_data[0] %}
 
-                                    {% else %}
 
-                                        {% set menu_data_2 = '/' + menu_data[0] %}
 
-                                    {% endif %}
 
-                                    
-                                    {% if menu_data|length > 2 and menu_data[2] == 1 %}
 
-                                        {% set menu_topic = 'topic_color' %}
 
-                                    {% else %}
 
-                                        {% set menu_topic = '' %}
 
-                                    {% endif %}
 
-                                    
-                                    <a class="menu_item_link" href="{{menu_data_2}}" id="{{menu_topic}}">
 
-                                        {{menu_data[1]}}
 
-                                    </a>
 
-                                </div><!--
 
-                         -->{% endfor %}
 
+                            {% for menu_data in menu %}
 
+                                {% if menu[0] == 1 %}
 
+                                    {% set menu_data_2 = menu_data[0] %}
 
+                                {% else %}
 
+                                    {% set menu_data_2 = '/' + menu_data[0] %}
 
+                                {% endif %}
 
+                                
+                                {% if menu_data|length > 2 and menu_data[2] == 1 %}
 
+                                    {% set menu_topic = 'topic_color' %}
 
+                                {% else %}
 
+                                    {% set menu_topic = '' %}
 
+                                {% endif %}
 
+                                
+                                <a class="menu_item_link" href="{{menu_data_2}}" id="{{menu_topic}}">
 
+                                    {{menu_data[1]}}
 
+                                </a>
 
+                            {% endfor %}
 
                         </div>
 
                         </div>
 
                     {% endif %}
 
                     {% endif %}
 
                 </article>
 
                 </article>

+ 5 - 2
views/tenshi/index.html
Wyświetl plik 

@@ -9,7 +9,10 @@
 
         {% endif %}
 
         {% endif %}
 
         {{imp[3][3]|safe}}
 
         {{imp[3][3]|safe}}
 
         <link rel="stylesheet" href="/views/tenshi/css/main.css?ver=20">
 
         <link rel="stylesheet" href="/views/tenshi/css/main.css?ver=20">
 
-        <script src="/views/tenshi/js/skin_set.js?ver=8"></script>
 
+        {% if request.cookies.get('main_css_darkmode', '') == '1' %}
 
+            <link rel="stylesheet" href="/views/tenshi/css/dark.css?ver=8">
 
+        {% endif %}
 
+        <script src="/views/tenshi/js/skin_set.js?ver=9"></script>
 
         <script src="/views/tenshi/js/main.js?ver=3"></script>
 
         <script src="/views/tenshi/js/main.js?ver=3"></script>
 
         <script src="https://code.iconify.design/1/1.0.3/iconify.min.js"></script>
 
         <script src="https://code.iconify.design/1/1.0.3/iconify.min.js"></script>
 
         <link rel="shortcut icon" href="/views/main_css/file/favicon.ico?ver=1">
 
         <link rel="shortcut icon" href="/views/main_css/file/favicon.ico?ver=1">
 
@@ -217,6 +220,6 @@
 
                 </a>
 
                 </a>
 
             </div>
 
             </div>
 
         </div>
 
         </div>
 
-        <script>main_load(); window.addEventListener('DOMContentLoaded', skin_set);</script>
 
+        <script>window.addEventListener('DOMContentLoaded', skin_set);</script>
 
     </body>
 
     </body>
 
 </html>
 
 </html>

+ 1 - 1
views/tenshi/info.json
Wyświetl plik 

@@ -1,5 +1,5 @@
 
 {
 
 {
 
     "name" : "Tenshi",
 
     "name" : "Tenshi",
 
-    "skin_ver" : "v2.0.1",
 
+    "skin_ver" : "v2.0.2",
 
     "require_ver" : "12"
 
     "require_ver" : "12"
 
 }
 
 }

+ 4 - 18
views/tenshi/js/skin_set.js
Wyświetl plik 

@@ -1,3 +1,7 @@
 
+function regex_data(data) {
 
+    return new RegExp('(?:^|; )' + data + '=([^;]*)');
 
+}
 
+
 
 function get_post() {
 
 function get_post() {
 
     check = document.getElementById('invert');
 
     check = document.getElementById('invert');
 
     if(check.checked === true) {
 
     if(check.checked === true) {
 
@@ -9,24 +13,6 @@ function get_post() {
 
     history.go(0);
 
     history.go(0);
 
 }
 
 }
 
 
 
-function main_load() {
 
-    var head_data = document.querySelector('head');
 
-    if(
 
-        cookies.match(regex_data('main_css_darkmode')) &&
 
-        cookies.match(regex_data('main_css_darkmode'))[1] === '1'
 
-    ) {
 
-        head_data.innerHTML += '' +
 
-            '<link rel="stylesheet" href="/views/tenshi/css/dark.css?ver=8">' +
 
-        '';
 
-    }
 
-}
 
-
 
-function regex_data(data) {
 
-    return new RegExp('(?:^|; )' + data + '=([^;]*)');
 
-}
 
-
 
-var cookies = document.cookie;
 
-
 
 function skin_set() {
 
 function skin_set() {
 
     if(window.location.pathname === '/skin_set') {
 
     if(window.location.pathname === '/skin_set') {
 
         var set_language = {
 
         var set_language = {