From b04bb33f25690969aad0bcfcf7d91635959870ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E6=82=A0=E7=84=B6?= Date: Fri, 14 Aug 2020 09:38:49 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A82.0=E7=89=88=E6=9C=AC=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.更新了后台样式表链接 2.修复了部分表情命名问题 3.优化了右下角浮标按钮的显示 4.优化了部分短代码样式 --- CSS/G.css | 18 +++++------ CSS/shortcode.G.css | 76 +++++++++++++-------------------------------- JS/X.js | 3 ++ functions.php | 2 +- lib/shortcode.php | 27 ++-------------- owo.php | 4 +-- 6 files changed, 39 insertions(+), 91 deletions(-) diff --git a/CSS/G.css b/CSS/G.css index 0f4be5d..a52af15 100644 --- a/CSS/G.css +++ b/CSS/G.css @@ -128,6 +128,7 @@ html::-webkit-scrollbar-thumb,html *::-webkit-scrollbar-thumb { } #m_toc{ bottom:150px; + display: none; } #m_top{ bottom:100px; @@ -136,6 +137,9 @@ html::-webkit-scrollbar-thumb,html *::-webkit-scrollbar-thumb { bottom:200px; display: none; } +.m_search_c{ + bottom:150px!important; +} .i{ width: 20px; height: 20px; @@ -786,6 +790,8 @@ table td:hover{ border-left: none; border-left: 3px solid #f5f5f5; text-align: justify; + background: rgba(245,245,245,0.5); + border-radius: 0 5px 5px 0; } #post-content-article blockquote p { font-size: 16px; @@ -2002,15 +2008,6 @@ background : hsla(0,0%,100%,.6); height: 2.5rem; top: 0.45rem; } -/* .article-item { - background: white; - border-radius: 30px; - box-shadow: 0px 0px 70px 6px rgba(0,0,0,0.12); - padding: 20px; - width: 87%; - margin: 20px auto; - float: none; -} */ .article-item p { margin: 5px 0px; } @@ -2055,6 +2052,9 @@ input#url, input#mail, input#author { #m_search { bottom: 180px; } +.m_search_c{ + bottom:125px!important; +} #sliderbar-toc{ backdrop-filter: blur(0px); -webkit-backdrop-filter: blur(0px); diff --git a/CSS/shortcode.G.css b/CSS/shortcode.G.css index 1670dbe..8b369f1 100644 --- a/CSS/shortcode.G.css +++ b/CSS/shortcode.G.css @@ -16,6 +16,9 @@ margin:0!important; border: none!important; } +.ArtinArt h4 a{ + display: block; +} .ArtinArt h4:hover{ letter-spacing: normal!important; border: none!important; @@ -87,49 +90,8 @@ background:#666; color:white!important; } -.post-content-notice{ - margin:15px 0; - border:1.5px solid RGB(121,145,209); - border-radius: 10px; - padding: 1.5rem 1.25rem 1.5rem 3.5rem; - position: relative; - overflow: hidden; -} -.post-content-content{ - position: relative; - z-index:2; -} -.post-content-notice:before{ - content: " "; - position: absolute; - top: -10; - right: 0; - bottom: 0; - left: -50; - background: url(https://cdn.jsdelivr.net/gh/youranreus/R@v1.0.3/G/IMG/notice.svg) no-repeat; - opacity: .1; - z-index:1; -} -.post-content-warn{ - margin:15px 0; - border:1.5px solid RGBA(184,2,51,0.6); - border-radius: 10px; - padding: 1.5rem 1.25rem 1.5rem 3.5rem; - position: relative; - overflow: hidden; -} -.post-content-warn:before{ - content: " "; - position: absolute; - top: -10; - right: 0; - bottom: 0; - left: -50; - background: url(https://cdn.jsdelivr.net/gh/youranreus/R@v1.0.3/G/IMG/warn.svg) no-repeat; - opacity: .1; - z-index:1; -} + .post-content-tag{ display: inline-block; margin: 0 5px; @@ -150,17 +112,23 @@ color: RGBA(184,2,51,0.6); border: 0.0625rem solid RGBA(184,2,51,0.6); } -/* -.post-content-article-photos a{ - display: inline-block; - float:left; - margin:0 2.5%; - width:42.5%; + +.shortcode-notice{ + background: #eef6fd; + padding: 8px 20px; + border-left: 3px solid #38a3fd; + border-radius: 0 5px 5px 0; + margin-bottom: 10px; + color: #777; + font-size:15px; } -.post-content-article-photos a img{ - margin: 1px!important; - height:150px; + +.shortcode-warn{ + background: #fcf1f1; + padding: 8px 20px; + border-left: 3px solid #ed0000; + border-radius: 0 5px 5px 0; + margin-bottom: 10px; + color: #777; + font-size:15px; } -.post-content-article-photos .imageinfo{ - display: none; -} */ diff --git a/JS/X.js b/JS/X.js index 8114343..5e03410 100644 --- a/JS/X.js +++ b/JS/X.js @@ -169,6 +169,7 @@ function sideMenu_toggle(){ function toc_toggle(){ $("#sliderbar-toc").toggleClass("move_left"); $("#sliderbar-toc").toggleClass("move_right"); + $('#m_search').removeClass('m_search_c'); $("#sliderbar-toc-cover").toggle(); } @@ -202,6 +203,7 @@ function toc(){ if(status == true){ $('#sliderbar-toc').show(); $('#m_toc').show(); + $('#m_search').removeClass('m_search_c'); } tocbot.init({ tocSelector: '.toc', @@ -217,6 +219,7 @@ function toc(){ }else{ $('#sliderbar-toc').hide(); $('#m_toc').hide(); + $('#m_search').addClass('m_search_c'); } diff --git a/functions.php b/functions.php index 1f412a4..89d434d 100644 --- a/functions.php +++ b/functions.php @@ -1,7 +1,7 @@ "; + echo ""; echo "

G主题设置

"; $favicon = new Typecho_Widget_Helper_Form_Element_Text('favicon', NULL, NULL, _t('图标') , _t('')); $form->addInput($favicon); diff --git a/lib/shortcode.php b/lib/shortcode.php index 66ccb4e..0d129f9 100644 --- a/lib/shortcode.php +++ b/lib/shortcode.php @@ -61,13 +61,13 @@ function shortcode_button_dl( $atts, $content = '' ) { function shortcode_notice( $atts, $content = '' ) { - return "
".$content."
"; + return "
".$content."
"; } add_shortcode( 'notice' , 'shortcode_notice' ); function shortcode_warn( $atts, $content = '' ) { - return "
".$content."
"; + return "
".$content."
"; } add_shortcode( 'warn' , 'shortcode_warn' ); @@ -110,26 +110,3 @@ function shortcode_bili( $atts, $content = '' ) { return ''; } add_shortcode( 'bili' , 'shortcode_bili' ); - -// function _strip_tags($tagsArr,$str) { -// foreach ($tagsArr as $tag) { -// $p[]="/(<(?:\/".$tag."|".$tag.")[^>]*>)/i"; -// } -// $return_str = preg_replace($p,"",$str); -// return $return_str; -// } -// -// function shortcode_photos( $atts, $content = '' ) { -// $args = shortcode_atts( array( -// '' => '' -// ), $atts ); -// -// $content = _strip_tags(array("br"),$content); -// -// return ' -//
-// '.$content.' -//
-// '; -// } -// add_shortcode( 'photos' , 'shortcode_photos' ); diff --git a/owo.php b/owo.php index f5de6d1..492fbc2 100644 --- a/owo.php +++ b/owo.php @@ -18,7 +18,7 @@
    • -
    • +
    • @@ -31,7 +31,7 @@
    • -
    • +