Fix | #19

FlyingSky-CN · Feb 7, 2020 · e381e5c · e381e5c
1 parent 091dc07
commit e381e5c
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 115 deletions.
diff --git a/header.php b/header.php
@@ -25,53 +25,14 @@
         <!-- MDUI STR -->
         <link rel="stylesheet" href="//<?php if ($this->options->mdrMDUICDN == 'bootcss'): ?>cdn.bootcss.com/mdui/0.4.2/css/mdui.min.css<?php elseif ($this->options->mdrMDUICDN == 'cdnjs'): ?>cdnjs.cloudflare.com/ajax/libs/mdui/0.4.3/css/mdui.min.css<?php else: ?>cdnjs.loli.net/ajax/libs/mdui/0.4.3/css/mdui.min.css<?php endif; ?>"></script>
         <!-- MDUI END -->
-        <?php if (!$this->options->mdrCornertool) { ?>
+        <?php if (!$this->options->mdrCornertool): ?>
         <!-- mdr | Cornertool -->
         <style>
             *::-webkit-scrollbar {
                 width:0px!important;
                 height:0px!important
             }
         </style>
-        <?php } ?>
-        <?php if ($this->options->DarkMode): ?>
-        <style>
-            /* Dark mode */
-            .mdui-theme-layout-dark .post-meta li {
-                border-left: 1px solid #444;
-            }
-            .mdui-theme-layout-dark #secondary a, .mdui-theme-layout-dark .post-content .more a, .mdui-theme-layout-dark .post-meta, .mdui-theme-layout-dark .widget-tile li {
-                color: #aaa;
-            }
-            .mdui-theme-layout-dark .ajaxload a, .mdui-theme-layout-dark .ajaxload .loading:hover, .mdui-theme-layout-dark .ajaxload .loading, .mdui-theme-layout-dark .mdui-row a {
-                color: #aaa;
-            }
-            .mdui-theme-layout-dark .ajaxload a:hover {
-                border-color: #bbb;
-            }
-            .mdui-theme-layout-dark blockquote {
-                background: none;
-                color: #fff;
-            }
-            .mdui-theme-layout-dark .textbutton {
-                box-shadow: none;
-            }
-            .mdui-theme-layout-dark .textbutton input, .mdui-theme-layout-dark .respond #textarea {
-                background: #424242;
-                box-shadow: none;
-                border: none;
-                color: #fff;
-            }
-            .mdui-theme-layout-dark .comment-list li, .mdui-theme-layout-dark .whisper .comment-list li, .mdui-theme-layout-dark .comment-list .respond {
-                border-color: #424242;
-            }
-            .mdui-theme-layout-dark .whisper .comment-child {
-                background: none;
-            }
-            .mdui-theme-layout-dark .whisper .comment-body, .mdui-theme-layout-dark .whisper .comment-list li.comment-parent {
-                border: 1px solid #424242;
-            }*/
-        </style>
         <?php endif; ?>
         <link rel="stylesheet" href="<?php cjUrl('mdr.css?v=2') ?>" />
         <link rel="stylesheet" href="<?php cjUrl('style.css?v=20') ?>" />

diff --git a/mdr.css b/mdr.css
@@ -9,15 +9,19 @@ table {
     border-radius: 2px;
     border-spacing: 0;
     border-collapse: separate;
-    border: 1px solid rgba(0,0,0,.12);
-    border-bottom: none;
-    border-right: none
+    border: 1px solid rgba(0,0,0,.12)
 }
 table td, table th {
     padding:6px 13px;
     border-bottom: 1px solid rgba(0,0,0,.12);
     border-right: 1px solid rgba(0,0,0,.12)
 }
+table tr th:last-child, table tr td:last-child {
+    border-right: none
+}
+table tr:last-child td {
+    border-bottom: none
+}
 .mdui-theme-layout-dark table, .mdui-theme-layout-dark table td, .mdui-theme-layout-dark table th {
     border-color: rgba(255,255,255,.12);
 }
@@ -69,8 +73,7 @@ button, input[type=submit] {
 button, input[type=submit], .menu-parent a {
     cursor:pointer
 }
-
-/** Scrollbar **/
+/* Scrollbar */
 body::-webkit-scrollbar {
     width: 8px;
     height: 8px;
@@ -97,6 +100,9 @@ body.mdui-theme-layout-dark::-webkit-scrollbar-thumb {
 .avatar {
     border-radius: 50%
 }
+#post img, #post video, .comment-content img, .comment-content video, .whisper img, .whisper video {
+    max-width: 100%
+}
 /* Pray */
 html.pray {
     -webkit-filter: grayscale(100%); 
@@ -122,6 +128,34 @@ html {
 }
 
 /** Widget **/
+/* Sidebar */
+.widget {
+    margin-bottom: 30px;
+    padding-left: 16px;
+    padding-right: 16px;
+    white-space: normal!important
+}
+.widget-list li {
+    margin: 5px 0;
+    line-height: 1.6
+}
+.widget-list, .widget-tile {
+    list-style: none;
+    padding: 0
+}
+.widget-list li ul {
+    margin-left: 15px
+}
+.widget-tile {
+    margin-left: -5px;
+    margin-right: -5px
+}
+.widget-tile li {
+    display: inline-block;
+    margin: 5px;
+    line-height: 1.6;
+    color:#666
+}
 /* SidebarFix */
 @media(min-width: 1024px){
     .mdui-drawer#mdrDrawerR.fixed {

diff --git a/style.css b/style.css
@@ -134,7 +134,7 @@
     background:#444;
     border:0
 }
-.whisper .post-title a, .post-content .links a {
+.whisper .post-title a {
     transition:.3s;
     -webkit-transition:.3s
 }
@@ -156,9 +156,6 @@
     line-height:1.5;
     word-wrap:break-word
 }
-.post-content img, .post-content video, .comment-content img, .comment-content video, .whisper img, .whisper video {
-    max-width:100%
-}
 .post-content hr, .comment-content hr {
     margin:2em auto;
     width:100px;
@@ -265,65 +262,20 @@
 .more {
     margin-bottom:0
 }
-.widget {
-    margin-bottom:30px;
-    padding-left:16px;
-    padding-right:16px;
-    white-space:normal!important;
-}
-.widget-list, .widget-tile, .links {
-    list-style:none;
-    padding:0
-}
-.widget-list li, #catalog-col li {
+#catalog-col li {
     margin:5px 0;
     line-height:1.6
 }
-.widget-list li ul {
-    margin-left:15px
-}
-.widget-tile {
-    margin-left:-5px;
-    margin-right:-5px
-}
-.widget-tile li {
-    display:inline-block;
-    margin:5px;
-    line-height:1.6;
-    color:#666
-}
 #footer {
     font-size:.875em;
     padding:2em 0;
     line-height:1.5;
     text-align:center;
     border-top:1px solid #eee
 }
-#footer, #footer .links a, .icpnum {
+#footer, .icpnum {
     color:#999
 }
-.post-content .links {
-    letter-spacing:-9em
-}
-.post-content .links li {
-    display:inline-block;
-    width:33.33333333333%;
-    letter-spacing:0
-}
-.post-content .links a {
-    display:block;
-    margin:5px 10px;
-    padding:5px 10px;
-    text-align:center;
-    color:#444;
-    background:#fcfcfc;
-}
-.post-content .links a:hover {
-    box-shadow:0 2px 5px rgba(0, 0, 0, .3)
-}
-.post-content .links .l_logo {
-    padding-left:40px
-}
 .l_logo img, .l_logo i {
     position:absolute;
     top:0;
@@ -337,14 +289,6 @@
 .l_logo i {
     font:16px/1 Segoe UI Symbol
 }
-#footer .links {
-    margin:0;
-    text-align:center
-}
-#footer .links li {
-    display:inline-block;
-    margin:0 3px 2px
-}
 #music span {
     position:absolute;
     display:block;
@@ -372,9 +316,6 @@
     transform:rotate(30deg);
     -webkit-transform:rotate(30deg)
 }
-#archives li {
-    margin:5px 0
-}
 @media(min-width:601px) {
     .menu-parent .menu-parent .menu-child {
         top:5px;
@@ -418,24 +359,46 @@
     .menu-parent .menu-parent .menu-child:before {
         border-bottom:7px solid rgba(221, 221, 221, .95)
     }
-    .post-content .links li {
-        width:50%
-    }
     .comment-form .textarea {
         width:58%
     }
     .comment-form .textbutton {
         width:40%
     }
 }
-@media(max-width:420px) {
-    .post-content .links li {
-        width:100%
-    }
-}
 .comment-body, .respond #textarea, .textbutton, .thumb img, .mdui-typo img, .avatar, .notie, .l_logo i {
     box-shadow:0 2px 2px 0 rgba(0, 0, 0, .14), 0 3px 1px -2px rgba(0, 0, 0, .2), 0 1px 5px 0 rgba(0, 0, 0, .12)
 }
 .textbutton, .l_logo i {
     border-radius:3px
+}
+
+/* Dark mode */
+.mdui-theme-layout-dark .post-meta li {
+    border-left: 1px solid #444;
+}
+.mdui-theme-layout-dark .post-content .more a, .mdui-theme-layout-dark .post-meta, .mdui-theme-layout-dark .widget-tile li, .mdui-theme-layout-dark .mdui-row a  {
+    color: #aaa;
+}
+.mdui-theme-layout-dark blockquote {
+    background: none;
+    color: #fff;
+}
+.mdui-theme-layout-dark .textbutton {
+    box-shadow: none;
+}
+.mdui-theme-layout-dark .textbutton input, .mdui-theme-layout-dark .respond #textarea {
+    background: #424242;
+    box-shadow: none;
+    border: none;
+    color: #fff;
+}
+.mdui-theme-layout-dark .comment-list li, .mdui-theme-layout-dark .whisper .comment-list li, .mdui-theme-layout-dark .comment-list .respond {
+    border-color: #424242;
+}
+.mdui-theme-layout-dark .whisper .comment-child {
+    background: none;
+}
+.mdui-theme-layout-dark .whisper .comment-body, .mdui-theme-layout-dark .whisper .comment-list li.comment-parent {
+    border: 1px solid #424242;
 }