Просмотр исходного кода

CSS 안 쓰는 코드 삭제, max-width: 100% 고정

Surplus_Up (2DU) 6 лет назад
Родитель
Сommit
3b292bf912
5 измененных файлов с 10 добавлено и 13 удалено
  1. 1 1
      route/tool/func.py
  2. 6 10
      views/main_css/css/main.css
  3. 1 0
      views/marisa/css/main.css
  4. 1 1
      views/marisa/index.html
  5. 1 1
      views/marisa/info.json

+ 1 - 1
route/tool/func.py

@@ -476,7 +476,7 @@ def other2(data):
         data += ['']
         data += ['']
 
 
     req_list = ''
     req_list = ''
-    main_css_ver = 35
+    main_css_ver = 36
 
 
     if not 'main_css_load' in flask.session or not 'main_css_ver' in flask.session or flask.session['main_css_ver'] != main_css_ver:
     if not 'main_css_load' in flask.session or not 'main_css_ver' in flask.session or flask.session['main_css_ver'] != main_css_ver:
         for i_data in os.listdir(os.path.join("views", "main_css", "css")):
         for i_data in os.listdir(os.path.join("views", "main_css", "css")):

+ 6 - 10
views/main_css/css/main.css

@@ -1,7 +1,8 @@
+body, html, video, table, div, iframe, input, textarea, img, hr, blockquote, pre { max-width: 100%;}
 textarea { width: 100%; }
 textarea { width: 100%; }
-input { width: 100%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; }
+input { width: 100%; box-sizing: border-box; }
 #last { margin-top: 30px; }
 #last { margin-top: 30px; }
-#toc { border: 1px solid; padding: 20px; width: fit-content; width: -moz-fit-content; clear: both; margin-top: 10px; }
+#toc { border: 1px solid; padding: 20px; width: fit-content; clear: both; margin-top: 10px; }
 #toc-name { font-size: 18px; }
 #toc-name { font-size: 18px; }
 table { border-collapse: collapse; }
 table { border-collapse: collapse; }
 td { border: 1px solid; padding: 5px; }
 td { border: 1px solid; padding: 5px; }
@@ -10,7 +11,6 @@ a { text-decoration: none; }
 #inside, #out_link, #open { color: green; }
 #inside, #out_link, #open { color: green; }
 #out_link::before { background: green; color: white; content: "E"; }
 #out_link::before { background: green; color: white; content: "E"; }
 input[type="checkbox"], input[type="radio"] { width: auto; }
 input[type="checkbox"], input[type="radio"] { width: auto; }
-.popup { position: fixed; bottom: 0; padding: 10px; left: 0; background: lightgray; width: 100%; }
 #list { padding: 10px; }
 #list { padding: 10px; }
 #toron { width: 100%; }
 #toron { width: 100%; }
 #toron_color_green { background: lightgreen; }
 #toron_color_green { background: lightgreen; }
@@ -32,22 +32,18 @@ s:hover, strike:hover, del:hover { color: gray; background-color: gainsboro; tex
 #main_table_width_quarter { width: 25%; }
 #main_table_width_quarter { width: 25%; }
 #redirect { border: 1px solid; padding: 10px; }
 #redirect { border: 1px solid; padding: 10px; }
 body { word-break: break-all; overflow: auto; }
 body { word-break: break-all; overflow: auto; }
-hr.main_hr { border: none; margin-top: 8px; margin-bottom: 8px; }
+.main_hr { border: none; margin-top: 8px; margin-bottom: 8px; }
 #include_link { display: none; }
 #include_link { display: none; }
-.foot_plus { background: white; border: 5px solid gainsboro; padding: 5px; width: 300px; height: 300px; position: fixed; top: calc(50% - 150px); right: calc(50% - 150px); display: none; z-index: 100; }
 #toc_title { font-size: 18px; }
 #toc_title { font-size: 18px; }
 blockquote { background-image: url(/views/main_css/file/quote.png); background-position: calc(100% - 10px) 10px; background-repeat: no-repeat; background-size: 25px; }
 blockquote { background-image: url(/views/main_css/file/quote.png); background-position: calc(100% - 10px) 10px; background-repeat: no-repeat; background-size: 25px; }
 #admin_log_search { width: 100px; }
 #admin_log_search { width: 100px; }
 @media (max-width: 768px) { table { min-width: 100%; } .table_safe { min-width: 100%; }}
 @media (max-width: 768px) { table { min-width: 100%; } .table_safe { min-width: 100%; }}
-@media (max-width: 400px) { .foot_plus { width: 80%; right: calc(100% - 92%); }}
-@media (max-height: 400px) { .foot_plus { height: 80%; top: calc(100% - 92%); }}
-.foot_in { overflow-y: scroll; height: calc(100% - 20px); }
 #origin { display: none; }
 #origin { display: none; }
 .all_in_data { display: block; width: 100%; white-space: pre-wrap; }
 .all_in_data { display: block; width: 100%; white-space: pre-wrap; }
 .table_safe { max-width: 100%; }
 .table_safe { max-width: 100%; }
 .change_space { white-space: pre-line; }
 .change_space { white-space: pre-line; }
-div#topic_scroll { max-height: 500px; overflow: scroll; -ms-overflow-style: none; scrollbar-width: none; }
-div#topic_scroll::-webkit-scrollbar { display: none; }
+#topic_scroll { max-height: 500px; overflow: scroll; -ms-overflow-style: none; scrollbar-width: none; }
+#topic_scroll::-webkit-scrollbar { display: none; }
 .hidden_link { filter: blur(3px); }
 .hidden_link { filter: blur(3px); }
 .hidden_link:hover { filter: none; }
 .hidden_link:hover { filter: none; }
 .content { height: 500px; }
 .content { height: 500px; }

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

@@ -349,6 +349,7 @@ textarea, input {
     border: 1px solid #4a4a4a;
     border: 1px solid #4a4a4a;
     background: #4a4a4a;
     background: #4a4a4a;
     text-align: center;
     text-align: center;
+    height: 45px;
 }
 }
 
 
 #nav_bar a {
 #nav_bar a {

+ 1 - 1
views/marisa/index.html

@@ -8,7 +8,7 @@
             <title>{{imp[0]}} - {{imp[1][0]}}</title>
             <title>{{imp[0]}} - {{imp[1][0]}}</title>
         {% endif %}
         {% endif %}
         {{imp[3][3]|safe}}
         {{imp[3][3]|safe}}
-        <link rel="stylesheet" href="/views/marisa/css/main.css?ver=13">
+        <link rel="stylesheet" href="/views/marisa/css/main.css?ver=14">
         <script src="/views/marisa/js/skin_set.js?ver=4"></script>
         <script src="/views/marisa/js/skin_set.js?ver=4"></script>
         <script src="/views/marisa/js/main.js?ver=3"></script>
         <script src="/views/marisa/js/main.js?ver=3"></script>
         <script>main_load(); window.addEventListener('DOMContentLoaded', function() { skin_set(); });</script>
         <script>main_load(); window.addEventListener('DOMContentLoaded', function() { skin_set(); });</script>

+ 1 - 1
views/marisa/info.json

@@ -1,5 +1,5 @@
 {
 {
     "name" : "Marisa",
     "name" : "Marisa",
-    "skin_ver" : "v1.2.5",
+    "skin_ver" : "v1.2.6",
     "require_ver" : "8"
     "require_ver" : "8"
 }
 }