Explorar el Código

버그 수정

Surplus_Up (2DU) hace 6 años
padre
commit
0c92e1694d
Se han modificado 3 ficheros con 19 adiciones y 4 borrados
  1. 1 1
      route/topic.py
  2. 0 1
      views/marisa/css/main.css
  3. 18 2
      views/marisa/index.html

+ 1 - 1
route/topic.py

@@ -142,7 +142,7 @@ def topic_2(conn, topic_num):
         return easy_minify(flask.render_template(skin_check(),
             imp = [name, wiki_set(), custom(), other2(['(' + load_lang('discussion') + ')', 0])],
             data = '''
-                <h2 id="topic_top_title">''' + sub + '''</h2>
+                <h2 id="topic_top_title">''' + html.escape(sub) + '''</h2>
                 ''' + data,
             menu = [['topic/' + url_pas(name), load_lang('list')]]
         ))

+ 0 - 1
views/marisa/css/main.css

@@ -79,7 +79,6 @@ li {
 #tool {
     float: right;
     border: none;
-    margin-top: -95px;
 }
 
 @media (min-width: 780px) and (max-width: 1180px) {

+ 18 - 2
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=15">
+        <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/main.js?ver=3"></script>
         <script>main_load(); window.addEventListener('DOMContentLoaded', function() { skin_set(); });</script>
@@ -117,6 +117,22 @@
             </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 %}
@@ -129,7 +145,7 @@
                         {% endif %}
                     </div>
                     {% if menu != 0 %}
-                        <div id="tool">
+                        <div id="tool" class="is_mobile">
                             {% for sub_d in menu %}
                                 <div id="tool_cel">
                                     {% if sub_d|length > 2 and sub_d[2] == 1 %}