update 1.6.0

wehaox · Aug 10, 2022 · 6ae9144 · 6ae9144
1 parent 276da86
commit 6ae9144
Show file tree

Hide file tree

Showing 14 changed files with 335 additions and 120 deletions.
diff --git a/css/custom.css b/css/custom.css
@@ -10,8 +10,8 @@ body {
 	cursor: url(/usr/themes/butterfly/img/default.cur),default
 }
 
-a,button,img {
-	cursor: url(/usr/themes/butterfly/img/pointer.cur),default
+a,button,img{
+	cursor: url(/usr/themes/butterfly/img/pointer.cur),default!important
 }
 
 video {
@@ -1744,6 +1744,17 @@ div.snote.danger:before,div.snote.error:before {
 	background: var(--dark_bg_color)
 }
 
+@media screen and (max-width: 900px){
+    #aside-content .card-widget {
+	    background: var(--card-bg)
+    }
+    [data-theme=dark] #aside-content .card-widget {
+	background: var(--card-bg)
+    }  
+}
+
+
+
 #footer {
 	color: #000;
 	border-top-right-radius: 20px;

diff --git a/css/style.css b/css/style.css
@@ -25,9 +25,12 @@
 .vimg{
     float: left;
     margin: 8px 10px 0px 0px;
+    width: 45px;
+    height: 45px;
     transition: filter 375ms ease-in .2s,transform .3s;
 }
 
+
 .vimg:hover {
     -webkit-transform: rotate(360deg);
     -moz-transform: rotate(360deg);
@@ -450,12 +453,6 @@ code[class*="language-"], pre[class*="language-"] {
 .last{
     padding: .1rem .5rem 0;
 }
-@media screen and (max-width: 900px){
-    #card-toc {
-    background-color: #fff!important;
-}
-}
-
 #footer:before {
     content: none;
 }

diff --git a/css/themedash.css b/css/themedash.css
@@ -8,8 +8,11 @@
     width: 100%;
     box-shadow: 0px -6px 11px -10px rgb(133 133 133 / 60%);
     z-index: 9;
+    transition-duration: .5s;
+}
+.typecho-option-submit:hover{
+    backdrop-filter: blur(.3px);
 }
-
 .typecho-option-submit li {
     display: flex;
     justify-content: center;

diff --git a/edit/edit.css b/edit/edit.css
@@ -32,4 +32,7 @@ textarea {
 }
 .wmd-prompt-dialog{
     top: 36%;
+}
+.artplayer-dialog {
+    top: 26%;
 }
diff --git a/edit/extend.js b/edit/extend.js
@@ -463,16 +463,18 @@ $(".btn-ok").click(function(){
 // 插入视频
 $("#b-wmd-video").on("click",function() {
 $("#ui-datepicker-div").after(`
-    <div class="wmd-prompt-dialog">
+    <div class="wmd-prompt-dialog artplayer-dialog">
     <div><p><b>插入视频</b></p></div>
 <form>
 <p>视频标题：
     <input type="text" name="artplayer-title">
+    视频封面(jpg,png等格式，可留空)：
+    <input type="text" name="artplayer-poster">    
     视频URL链接：
     <input type="text" name="url">
-    字幕链接(推荐srt格式)：
+    字幕链接(推荐srt格式,可留空)：
     <input type="text" name="subtitle">    
-    视频分段(格式: 时间(s)|描述 如: 15|彩蛋)一行一个：    
+    视频分段(格式: 时间(s)|描述 如: 15|彩蛋一行一个,可留空)：    
     <textarea type="text" name="highlight"></textarea>
 </p>
     <input type="text" style="display:none;">
@@ -482,13 +484,13 @@ $("#ui-datepicker-div").after(`
 </div>
 `);
 $(".btn-ok").click(function(){
-    // let color = $('#select-color option:selected').val();
     let title = $('input[name="artplayer-title"]').val();
+    let poster = $('input[name="artplayer-poster"]').val();
     let url = $('input[name="url"]').val();
     let highlight = $('textarea[name="highlight"]').val();
     let subtitle = $('input[name="subtitle"]').val();
-    let artplayer = Math.random().toString(36).substr(2);
-    insertAtCursor('[video title="'+title+' " url="'+url+' " container="'+artplayer+' " subtitle="'+subtitle+' "]'+highlight+' [/video]\n');
+    let artplayer = Math.random().toString(36).substr(3);
+    insertAtCursor('[video title="'+title+' " url="'+url+' " container="b'+artplayer+'" subtitle="'+subtitle+' " poster="'+poster+' "]'+highlight+' [/video]\n');
 });
 });
 // 需要调用dialog样式的容器

diff --git a/footer.php b/footer.php
@@ -93,12 +93,49 @@
 </div>
 <!--搜索end  -->
 <div class="js-pjax">
+<?php if (!empty($this->options->beautifyBlock) && in_array('showButterflyClock',$this->options->beautifyBlock)): ?>
+<script>
+function butterfly_clock_injector_config(){
+var parent_div_git = document.getElementsByClassName('sticky_layout')[0];
+var item_html = '<div class="card-widget card-clock"><div class="card-glass"><div class="card-background"><div class="card-content"><div id="hexo_electric_clock"><img class="entered loading" id="card-clock-loading" src="https://<?php $this->options->jsdelivrLink() ?>/gh/tzy13755126023/BLOG_SOURCE/theme_f/loading.gif" style="height: 120px; width: 100%;" data-ll-status="loading"/></div></div></div></div></div>';
+    console.log('已挂载butterfly_clock')
+    parent_div_git.insertAdjacentHTML("afterbegin",item_html)
+    }
+var elist = 'null'.split(',');
+var cpage = location.pathname;
+var epage = 'all';
+var flag = 0;
+for (var i=0;i<elist.length;i++){
+    if (cpage.includes(elist[i])){
+      flag++;
+    }
+}
+if ((epage ==='all')&&(flag == 0)){
+    butterfly_clock_injector_config();
+}
+else if (epage === cpage){
+    butterfly_clock_injector_config();
+} 
+</script>
+<script src="https://pv.sohu.com/cityjson"></script>
+<?php if($this->options->StaticFile == 'CDN' && $this->options->CDNURL == ''): ?>
+<link rel="stylesheet" href="https://<?php $this->options->jsdelivrLink() ?>/npm/hexo-butterfly-clock/lib/clock.min.css">
+<script src="https://<?php $this->options->jsdelivrLink() ?>/npm/hexo-butterfly-clock/lib/clock.min.js"></script>
+<?php elseif($this->options->StaticFile == 'CDN' && $this->options->CDNURL !== ''): ?>
+<link rel="stylesheet" href="<?php $this->options->CDNURL() ?>/static/css/clock.min.css">
+<script src="<?php $this->options->CDNURL() ?>/static/js/clock.min.js"></script>
+<?php else: ?>
+<link rel="stylesheet" href="<?php $this->options->themeUrl('static/css/clock.min.css'); ?>">
+<script src="<?php $this->options->themeUrl('static/js/clock.min.js'); ?>"></script>
+<?php endif; ?>
+<?php endif ?>
 <?php $this->header('commentReply=1&description=0&keywords=0&generator=0&template=0&pingback=0&xmlrpc=0&wlw=0&rss2=0&rss1=0&antiSpam=0&atom'); ?>
 <?php if ($this->options->NewTabLink == 'on'): ?>
 <script>$(document).ready(function(){var a=document.getElementsByTagName("a");for(let i=0;i<a.length;i++){let domain=document.domain;let url=a[i].href;if(typeof(url)!="undefined"&&url.length!=0&&url.match(domain)==null&&url!="javascript:void(0);"){a[i].setAttribute("target","_BLANK")}}});</script>
 <?php endif; ?>        
 <?php if($this->is('index')): ?>
 <script type="text/javascript" src="<?php $this->options->themeUrl('js/wehao.js?v1.4.0'); ?>"></script>
+<script type="text/javascript" src="<?php $this->options->themeUrl('/js/letterAvatar.js?v1.6.0'); ?>"></script>
 <!--打字-->
 <?php if (is_array($this->options->beautifyBlock) && in_array('ShowTopimg',$this->options->beautifyBlock)): ?>
    <?php if(!empty($this->options->CustomSubtitle)): ?>