From 1d293c0fc70d7324c7c01b80698ae1881db4fd33 Mon Sep 17 00:00:00 2001
From: Jerry <16351105+jerryc127@users.noreply.github.com>
Date: Sat, 20 Jun 2020 22:05:39 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20aplayer=E7=9A=84=E9=96=93=E8=B7=9D?=
=?UTF-8?q?=E8=AA=BF=E6=95=B4=20:bug:=20=E4=BF=AE=E5=BE=A9tabs=E5=A4=96?=
=?UTF-8?q?=E6=8C=82=E6=A8=99=E7=B0=BD=E8=88=87aplayer=E6=8F=92=E4=BB=B6?=
=?UTF-8?q?=E8=A1=9D=E7=AA=81=E8=80=8C=E7=95=B0=E5=B8=B8=E7=9A=84bugs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
scripts/tags/tabs.js | 38 ++++++++++++++---------------
source/css/_layout/third-party.styl | 5 ++++
source/css/_mode/darkmode.styl | 6 ++---
source/css/_mode/readmode.styl | 10 ++------
source/css/_tags/tabs.styl | 11 ++++-----
source/js/main.js | 15 ++++++------
6 files changed, 41 insertions(+), 44 deletions(-)
diff --git a/scripts/tags/tabs.js b/scripts/tags/tabs.js
index db6389b..c5db8fa 100644
--- a/scripts/tags/tabs.js
+++ b/scripts/tags/tabs.js
@@ -7,17 +7,17 @@
'use strict'
function postTabs (args, content) {
- var tabBlock = /\n([\w\W\s\S]*?)/g
+ const tabBlock = /\n([\w\W\s\S]*?)/g
args = args.join(' ').split(',')
- var tabName = args[0]
- var tabActive = Number(args[1]) || 0
+ const tabName = args[0]
+ const tabActive = Number(args[1]) || 0
- var matches = []
- var match
- var tabId = 0
- var tabNav = ''
- var tabContent = ''
+ const matches = []
+ let match
+ let tabId = 0
+ let tabNav = ''
+ let tabContent = ''
!tabName && hexo.log.warn('Tabs block must have unique name!')
@@ -26,12 +26,12 @@ function postTabs (args, content) {
matches.push(match[2])
}
- for (var i = 0; i < matches.length; i += 2) {
- var tabParameters = matches[i].split('@')
- var postContent = matches[i + 1]
- var tabCaption = tabParameters[0] || ''
- var tabIcon = tabParameters[1] || ''
- var tabHref = ''
+ for (let i = 0; i < matches.length; i += 2) {
+ const tabParameters = matches[i].split('@')
+ let postContent = matches[i + 1]
+ let tabCaption = tabParameters[0] || ''
+ let tabIcon = tabParameters[1] || ''
+ let tabHref = ''
postContent = hexo.render.renderSync({ text: postContent, engine: 'markdown' }).trim()
@@ -40,14 +40,14 @@ function postTabs (args, content) {
((tabCaption.length === 0) && (tabIcon.length === 0)) && (tabCaption = tabName + ' ' + tabId)
- var isOnlyicon = tabIcon.length > 0 && tabCaption.length === 0 ? ' style="text-align: center;"' : ''
- var icon = tabIcon.trim()
+ const isOnlyicon = tabIcon.length > 0 && tabCaption.length === 0 ? ' style="text-align: center;"' : ''
+ const icon = tabIcon.trim()
tabIcon.length > 0 && (tabIcon = ``)
- var toTop = ''
+ const toTop = ''
- var isActive = (tabActive > 0 && tabActive === tabId) || (tabActive === 0 && tabId === 1) ? ' active' : ''
- tabNav += `${tabIcon + tabCaption.trim()}`
+ const isActive = (tabActive > 0 && tabActive === tabId) || (tabActive === 0 && tabId === 1) ? ' active' : ''
+ tabNav += ``
tabContent += `${postContent + toTop}
`
}
diff --git a/source/css/_layout/third-party.styl b/source/css/_layout/third-party.styl
index 35f5e9c..b31f940 100644
--- a/source/css/_layout/third-party.styl
+++ b/source/css/_layout/third-party.styl
@@ -85,3 +85,8 @@ if hexo-config('beautify.enable')
.has-jax
overflow: auto
+
+//aplayer
+#article-container
+ .aplayer
+ margin: 0 0 1rem
\ No newline at end of file
diff --git a/source/css/_mode/darkmode.styl b/source/css/_mode/darkmode.styl
index ef56932..7b9ab69 100644
--- a/source/css/_mode/darkmode.styl
+++ b/source/css/_mode/darkmode.styl
@@ -288,19 +288,19 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
> .nav-tabs
background: #2c2c2c
- a
+ button
border-top: 2px solid #2c2c2c
background: #2c2c2c
color: alpha(#FFFFFF, .6)
.tab:not(.active)
- a
+ button
&:hover
border-top: 2px solid lighten(#121212, 20)
background: lighten(#121212, 20)
.active
- a
+ button
background: #121212
// 第三方
diff --git a/source/css/_mode/readmode.styl b/source/css/_mode/readmode.styl
index bd60d88..c39cea6 100644
--- a/source/css/_mode/readmode.styl
+++ b/source/css/_mode/readmode.styl
@@ -143,12 +143,6 @@ if hexo-config('readmode')
.tabs
border: 2px solid rgba(255, 255, 255, .6)
- > .nav-tabs
- filter: none
-
- a
- color: rgba(255, 255, 255, .6)
-
.read-mode
#body-wrap
padding-left: 0 !important
@@ -236,7 +230,7 @@ if hexo-config('readmode')
> .tab
border-bottom: 0
- a
+ button
border-top: none !important
background: transparent
@@ -244,7 +238,7 @@ if hexo-config('readmode')
background: none !important
&.active
- a
+ button
text-decoration: underline
> .tab-contents .tab-item-content.active
diff --git a/source/css/_tags/tabs.styl b/source/css/_tags/tabs.styl
index c5f9324..770bc40 100644
--- a/source/css/_tags/tabs.styl
+++ b/source/css/_tags/tabs.styl
@@ -20,26 +20,25 @@
@media screen and (max-width: 768px)
flex-grow: 1
- a
+ button
display: block
- padding: .5rem .8rem
- outline: 0
+ padding: .5rem 1rem
border-top: 2px solid $tab-border-color
background: $tab-botton-bg
color: $font-color
- text-align: center
+ width 100%
+ line-height: 2
transition: all .4s
&:hover
border-top: 2px solid $tab-button-hover-bg
background: $tab-button-hover-bg
- text-decoration: none
i
width: 1.5em
&.active
- a
+ button
border-top: 2px solid $tab-active-border-color
background: $card-bg
cursor: default
diff --git a/source/js/main.js b/source/js/main.js
index e4252c4..58ab1c4 100644
--- a/source/js/main.js
+++ b/source/js/main.js
@@ -760,20 +760,19 @@ $(function () {
})
}
- var $tab = $('#article-container .tabs')
- $tab.find('.tab a').on('click', function (e) {
- e.preventDefault()
- var $this = $(this)
- var $tabItem = $this.parent()
+ const $tab = $('#article-container .tabs')
+ $tab.find('.tab button').on('click', function (e) {
+ const $this = $(this)
+ const $tabItem = $this.parent()
if (!$tabItem.hasClass('active')) {
- var $tacbContent = $this.parents('.nav-tabs').next()
+ const $tacbContent = $this.parents('.nav-tabs').next()
$tabItem.siblings('.active').removeClass('active')
$tabItem.addClass('active')
- var tabId = $this.attr('href')
+ const tabId = $this.attr('data-href')
$tacbContent.find('> .tab-item-content').removeClass('active')
$tacbContent.find(`> ${tabId}`).addClass('active')
- var $isTabJustifiedGallery = $tacbContent.find(tabId).find('.justified-gallery')
+ const $isTabJustifiedGallery = $tacbContent.find(tabId).find('.justified-gallery')
if (isJustifiedGallery && $isTabJustifiedGallery.length > 0) {
initJustifiedGallery($isTabJustifiedGallery)
}