디자인 조금 수정

route/tool/func.py

@@ -542,7 +542,7 @@ def other2(data):
         data += ['']
 
     req_list = ''
-    main_css_ver = 47
+    main_css_ver = 48
 
     if  not 'main_css_load' in flask.session or \
         not 'main_css_ver' in flask.session or \

version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.9-master-35",
+        "r_ver" : "v3.1.9-master-36",
         "c_ver" : "3193200",
         "s_ver" : "9"
     }, "stable" : {

views/main_css/css/main.css

@@ -2,7 +2,7 @@ body, html, video, table, div, iframe, input, textarea, img, hr, blockquote, pre
 textarea { width: 100%; }
 input { width: 100%; box-sizing: border-box; }
 #last { margin-top: 30px; }
-#toc { border: 1px solid; padding: 20px; width: fit-content; clear: both; margin-top: 10px; }
+#toc { border: 1px solid; padding: 20px; width: fit-content; width: -moz-fit-content; clear: both; margin-top: 10px; }
 #toc-name { font-size: 18px; }
 table { border-collapse: collapse; }
 td { border: 1px solid; padding: 5px; }

views/marisa/css/dark.css

@@ -57,6 +57,6 @@ button#save {
 }
 
 blockquote {
-    background: black;
+    background-color: black;
     border-left: 5px solid #eee;
 }

views/marisa/css/main.css

@@ -79,18 +79,15 @@ li {
 #tool {
     float: right;
     border: none;
+    margin-top: -95px;
 }
 
-@media (min-width: 780px) and (max-width: 1350px) {
+@media (min-width: 780px) and (max-width: 1180px) {
     #main {
         width: calc(100% - 45px);
     }
 
-    #top_main {
-        width: 90%;
-    }
-
-    #bottom_main {
+    #top_main, #bottom_main {
         width: 90%;
     }
 
@@ -100,34 +97,18 @@ li {
 }
 
 
-@media (min-width: 1350px) and (max-width: 1590px) {
-    #main {
-        width: 70%;
-    }
-
-    #top_main {
-        width: 70%;
-    }
-
-    #bottom_main {
-        width: 70%;
+@media (min-width: 1180px) and (max-width: 1590px) {
+    #main, #top_main, #bottom_main {
+        width: 1000px;
     }
-
+    
     .is_mobile {
         display: none;
     }
 }
 
 @media (min-width: 1590px) {
-    #main {
-        width: 55%;
-    }
-
-    #top_main {
-        width: 55%;
-    }
-
-    #bottom_main {
+    #main, #top_main, #bottom_main {
         width: 55%;
     }
 
@@ -143,11 +124,7 @@ li {
         border-right: none;
     }
 
-    #top_main {
-        width: 90%;
-    }
-
-    #bottom_main {
+    #top_main, #bottom_main {
         width: 90%;
     }
 
@@ -158,6 +135,7 @@ li {
     #tool {
         float: none;
         width: 90%;
+        margin-top: 0px;
         margin-bottom: 10px;
     }
 }
@@ -359,7 +337,7 @@ textarea, input {
 blockquote {
     padding: 1em calc(2em + 25px) 1em 1em;
     margin: 1em 0em 0em;
-    background: #eeeeee;
+    background-color: #eeeeee;
     border: 1px dashed #ccc;
     border-left: 5px solid black;
 }

views/marisa/index.html

@@ -8,7 +8,7 @@
             <title>{{imp[0]}} - {{imp[1][0]}}</title>
         {% endif %}
         {{imp[3][3]|safe}}
-        <link rel="stylesheet" href="/views/marisa/css/main.css?ver=14">
+        <link rel="stylesheet" href="/views/marisa/css/main.css?ver=15">
         <script src="/views/marisa/js/skin_set.js?ver=4"></script>
         <script src="/views/marisa/js/main.js?ver=3"></script>
         <script>main_load(); window.addEventListener('DOMContentLoaded', function() { skin_set(); });</script>
@@ -117,22 +117,6 @@
             </div>
             <div id="main">
                 <div id="main_top">
-                    {% if menu != 0 %}
-                        <div id="tool" class="not_mobile">
-                            {% for sub_d in menu %}
-                                <div id="tool_cel">
-                                    {% if sub_d|length > 2 and sub_d[2] == 1 %}
-                                        <a class="menu-item" href="/{{sub_d[0]}}" id="topic_color">{{sub_d[1]}}</a>
-                                    {% else %}
-                                        <a class="menu-item" href="/{{sub_d[0]}}">{{sub_d[1]}}</a>
-                                    {% endif %}
-                                </div>
-                                {% if menu[loop.index] %}
-                                    |
-                                {% endif %}
-                            {% endfor %}
-                        </div>
-                    {% endif %}
                     <h1 id="title">
                         <a id="titlt_a" href="#"><span class="change_space">{{imp[0]}}</span></a>
                         {% if imp[3][0] != 0 %}
@@ -145,7 +129,7 @@
                         {% endif %}
                     </div>
                     {% if menu != 0 %}
-                        <div id="tool" class="is_mobile">
+                        <div id="tool">
                             {% for sub_d in menu %}
                                 <div id="tool_cel">
                                     {% if sub_d|length > 2 and sub_d[2] == 1 %}