From ae4af0896102014209e7620a063b8830a8031568 Mon Sep 17 00:00:00 2001 From: FlyingSky-CN Date: Mon, 31 Jan 2022 12:06:07 +0800 Subject: [PATCH] pre sync; --- .build.php | 66 +++++----- archive.php | 18 +-- core/css/style-petals.css | 248 +++++--------------------------------- core/css/style.css | 196 ++++++++++++++++++++++++++++++ core/functions.php | 139 +++++++++++---------- index.php | 2 +- page-archives.php | 4 +- page-links.php | 4 +- page.php | 6 +- post.php | 10 +- 10 files changed, 346 insertions(+), 347 deletions(-) diff --git a/.build.php b/.build.php index df1f228..3f07915 100644 --- a/.build.php +++ b/.build.php @@ -1,7 +1,31 @@ - need('header.php'); ?>
-
- chevron_right +
+ 首页  »  archiveTitle([ - 'category' => _t('分类 %s 下的文章'), - 'search' => _t('包含关键字 %s 的文章'), - 'tag' => _t('标签 %s 下的文章'), - 'date' => _t('在 %s 发布的文章'), - 'author' => _t('作者 %s 发布的文章') + 'category' => _t('分类「%s」下的文章'), + 'search' => _t('包含关键字「%s」的文章'), + 'tag' => _t('标签「%s」下的文章'), + 'date' => _t('在「%s」发布的文章'), + 'author' => _t('作者「%s」发布的文章') ], '', ''); ?>
have()) : ?> next()) : ?> - hidden) : /* Status Post */ ?> + hidden) : /* Status Post */ ?>
-
message
+
date(); ?>
diff --git a/core/css/style-petals.css b/core/css/style-petals.css index e27eb03..a135bd2 100644 --- a/core/css/style-petals.css +++ b/core/css/style-petals.css @@ -1,197 +1,65 @@ /** - * MDr 是一套基于 MDUI 开发的 Typecho 模板 + * Page */ -.ajaxload { - height: 36px; -} - -.ajaxload .next { - text-align: center; - width: 160px; - border-radius: 18px; - background: #e8e8e8; -} - -.mdui-theme-layout-dark .ajaxload .next { - background: #424242; -} - -.error-page { - margin: 256px 0!important; - text-align: center -} - -/***** Helper ******/ - -.mdui-container { - max-width: 896px; -} - -#main { - margin-top: -12px; -} - -#main>* { - margin: 24px 0; -} - -@media (max-width: 599px) { - #main { - margin-top: -8px; - } - #main>* { - margin: 12px 0; - } -} - -.hidden { - visibility: hidden; -} - -/***** Material Design 2 ******/ - -.mdr-appbar-title { - font-size: 1.25rem; - line-height: 1.5; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} - -body.mdui-theme-layout-dark, .mdui-theme-layout-dark header, .mdui-theme-layout-dark aside { - background: #121212 !important; -} - -.mdui-theme-layout-dark .mdui-card { - background-color: #212121 !important; -} - -.mdui-appbar { - transition: box-shadow .28s cubic-bezier(.4, 0, .2, 1); -} - -footer { - font-size: .75rem !important; - line-height: 1.25rem !important; - opacity: 0.75 !important; -} - -@media (min-width: 1024px) { - .mdui-list-item { - border-top-right-radius: 24px; - border-bottom-right-radius: 24px; - } - .mdui-list-dense .mdui-list-item { - border-top-right-radius: 20px; - border-bottom-right-radius: 20px; - } -} +/** Breadcrumbs */ -.mdui-card, .mdui-menu { - border-radius: 7px !important; -} - -/***** Post ******/ - -/** Breadcrumbs **/ - -.breadcrumbs { +.mdr-breadcrumbs { margin-top: 20px; background-color: rgba(180, 180, 180, 0.25); } -.breadcrumbs .mdui-chip-icon { +.mdr-breadcrumbs .mdui-chip-icon { background: none; } -.breadcrumbs .mdui-chip-icon .mdui-icon { +.mdr-breadcrumbs .mdui-chip-icon .mdui-icon { color: #444; } -.breadcrumbs .mdui-chip-title { +.mdr-breadcrumbs .mdui-chip-title { width: calc(100% - 48px); height: 32px; text-overflow: ellipsis; - -webkit-line-clamp: 1; overflow: hidden; + -webkit-line-clamp: 1; -webkit-box-orient: vertical; } -.mdui-theme-layout-dark .breadcrumbs .mdui-chip-icon .mdui-icon { +.mdui-theme-layout-dark .mdr-breadcrumbs .mdui-chip-icon .mdui-icon { color: #fff; } -/** Status Post **/ - -.post.status { - background-color: #e8e8e8 -} - -.mdui-theme-layout-dark .post.status { - background-color: #424242 -} - -.mdui-theme-layout-dark .post.status .inner { - color: hsla(0, 0%, 100%, .8) !important -} - -.post.status .tag, .post.status .time { - position: absolute; - top: 0; - font-size: 15px -} - -.mdui-theme-layout-dark .post.status .tag { - background-color: #424242; -} +/** + * Post + */ -.mdui-theme-layout-dark .post.status .time { - color: #5a5a5a; -} +/** Tags */ -.post.status .tag { - left: 15px; - padding: 10px; - border-radius: 0 0 5px 5px; - background-color: #dadada; - color: grey +.mdr-tags { + padding: 0 16px 8px; + text-align: center } -.post.status .time { - right: 0; - padding: 14px 12px; - color: #bcbcbc; +.mdr-tags .mdui-chip { + margin: 0 2px 8px; } -.post.status .inner { - font-size: 16px; - padding: 70px 16px 24px -} -.mdr-icon-info { - font-size: 14px; - padding-bottom: 2px; -} +/** License */ -/** License **/ - -.license { +.mdr-license { padding: 24px; overflow: hidden; position: relative; background-color: #f5f5f5; } -body.mdui-theme-layout-dark .license { - background-color: #383838; -} - -.license, .license p { +.mdr-license, .mdr-license p { margin: 0; } -.license svg { +.mdr-license svg { position: absolute; width: 128px; height: 128px; @@ -200,11 +68,15 @@ body.mdui-theme-layout-dark .license { opacity: .25; } -body.mdui-theme-layout-dark .license svg { +body.mdui-theme-layout-dark .mdr-license { + background-color: #383838; +} + +body.mdui-theme-layout-dark .mdr-license svg { filter: invert(1); } -/** Sponsor **/ +/** Sponsor */ .mdr-sponsor { text-align: center; @@ -212,70 +84,4 @@ body.mdui-theme-layout-dark .license svg { .mdr-sponsor .mdui-btn { border-radius: 5px; -} - -/** Tags **/ - -.tags { - margin-bottom: 15px; - padding: 0 10px; - text-align: center -} - -.tags .mdui-chip { - margin: 0 2px; -} - -/* Page Navigator */ - -.page-navigator { - list-style: none; - margin: 20px 0; - padding: 0px -} - -.page-navigator li { - display: inline-block; - margin-right: 8px; - height: 36px; - border-radius: 3px; - line-height: 36px; - color: #000; - font-size: 14px; - background: #e8e8e8; - text-align: center; - -webkit-transition: -webkit-box-shadow .25s cubic-bezier(.4, 0, .2, 1); - transition: -webkit-box-shadow .25s cubic-bezier(.4, 0, .2, 1); - transition: box-shadow .25s cubic-bezier(.4, 0, .2, 1); - transition: box-shadow .25s cubic-bezier(.4, 0, .2, 1), -webkit-box-shadow .25s cubic-bezier(.4, 0, .2, 1); - will-change: box-shadow; -} - -.mdui-theme-layout-dark .page-navigator li { - background: #444; - color: #fff -} - -.page-navigator li:hover, .page-navigator li:focus { - -webkit-box-shadow: 0 5px 5px -3px rgb(0 0 0 / 20%), 0 8px 10px 1px rgb(0 0 0 / 14%), 0 3px 14px 2px rgb(0 0 0 / 12%); - box-shadow: 0 5px 5px -3px rgb(0 0 0 / 20%), 0 8px 10px 1px rgb(0 0 0 / 14%), 0 3px 14px 2px rgb(0 0 0 / 12%); -} - -.page-navigator a, .page-navigator span { - padding: 11px 16px -} - -.page-navigator.ajaxload .next { - width: 100% -} - -/** Links Page **/ - -.link-card { - padding-top: 100%; -} - -.link-card>* { - position: absolute; - bottom: 0; } \ No newline at end of file diff --git a/core/css/style.css b/core/css/style.css index 55b6eee..c373fd9 100644 --- a/core/css/style.css +++ b/core/css/style.css @@ -393,4 +393,200 @@ div.mdui-card-header-avatar img { .pingback { background-color: unset !important; +} + +.ajaxload { + height: 36px; +} + +.ajaxload .next { + text-align: center; + width: 160px; + border-radius: 18px; + background: #e8e8e8; +} + +.mdui-theme-layout-dark .ajaxload .next { + background: #424242; +} + +.error-page { + margin: 256px 0!important; + text-align: center +} + +.mdui-container { + max-width: 896px; +} + +#main { + margin-top: -12px; +} + +#main>* { + margin: 24px 0; +} + +@media (max-width: 599px) { + #main { + margin-top: -8px; + } + #main>* { + margin: 12px 0; + } +} + +.hidden { + visibility: hidden; +} + +/***** Material Design 2 ******/ + +.mdr-appbar-title { + font-size: 1.25rem; + line-height: 1.5; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +body.mdui-theme-layout-dark, .mdui-theme-layout-dark header, .mdui-theme-layout-dark aside { + background: #121212 !important; +} + +.mdui-theme-layout-dark .mdui-card { + background-color: #212121 !important; +} + +.mdui-appbar { + transition: box-shadow .28s cubic-bezier(.4, 0, .2, 1); +} + +footer { + font-size: .75rem !important; + line-height: 1.25rem !important; + opacity: 0.75 !important; +} + +@media (min-width: 1024px) { + .mdui-list-item { + border-top-right-radius: 24px; + border-bottom-right-radius: 24px; + } + .mdui-list-dense .mdui-list-item { + border-top-right-radius: 20px; + border-bottom-right-radius: 20px; + } +} + +.mdui-card, .mdui-menu { + border-radius: 7px !important; +} + +/***** Post ******/ + +/** Status Post **/ + +.post.status { + background-color: #e8e8e8 +} + +.mdui-theme-layout-dark .post.status { + background-color: #424242 +} + +.mdui-theme-layout-dark .post.status .inner { + color: hsla(0, 0%, 100%, .8) !important +} + +.post.status .tag, .post.status .time { + position: absolute; + top: 0; + font-size: 15px +} + +.mdui-theme-layout-dark .post.status .tag { + background-color: #424242; +} + +.mdui-theme-layout-dark .post.status .time { + color: #5a5a5a; +} + +.post.status .tag { + left: 15px; + padding: 10px; + border-radius: 0 0 5px 5px; + background-color: #dadada; + color: grey +} + +.post.status .time { + right: 0; + padding: 14px 12px; + color: #bcbcbc; +} + +.post.status .inner { + font-size: 16px; + padding: 70px 16px 24px +} + +.mdr-icon-info { + font-size: 14px; + padding-bottom: 2px; +} + +/* Page Navigator */ + +.page-navigator { + list-style: none; + margin: 20px 0; + padding: 0px +} + +.page-navigator li { + display: inline-block; + margin-right: 8px; + height: 36px; + border-radius: 3px; + line-height: 36px; + color: #000; + font-size: 14px; + background: #e8e8e8; + text-align: center; + -webkit-transition: -webkit-box-shadow .25s cubic-bezier(.4, 0, .2, 1); + transition: -webkit-box-shadow .25s cubic-bezier(.4, 0, .2, 1); + transition: box-shadow .25s cubic-bezier(.4, 0, .2, 1); + transition: box-shadow .25s cubic-bezier(.4, 0, .2, 1), -webkit-box-shadow .25s cubic-bezier(.4, 0, .2, 1); + will-change: box-shadow; +} + +.mdui-theme-layout-dark .page-navigator li { + background: #444; + color: #fff +} + +.page-navigator li:hover, .page-navigator li:focus { + -webkit-box-shadow: 0 5px 5px -3px rgb(0 0 0 / 20%), 0 8px 10px 1px rgb(0 0 0 / 14%), 0 3px 14px 2px rgb(0 0 0 / 12%); + box-shadow: 0 5px 5px -3px rgb(0 0 0 / 20%), 0 8px 10px 1px rgb(0 0 0 / 14%), 0 3px 14px 2px rgb(0 0 0 / 12%); +} + +.page-navigator a, .page-navigator span { + padding: 11px 16px +} + +.page-navigator.ajaxload .next { + width: 100% +} + +/** Links Page **/ + +.link-card { + padding-top: 100%; +} + +.link-card>* { + position: absolute; + bottom: 0; } \ No newline at end of file diff --git a/core/functions.php b/core/functions.php index db135bc..3932ef5 100644 --- a/core/functions.php +++ b/core/functions.php @@ -405,73 +405,6 @@ function MyLinks($links) } } -/* function 许可协议 */ -function license($license) -{ - $svg = ""; - $licenselist = array( - 'BY' => '署名 4.0 国际 (CC BY 4.0)', - 'BY-SA' => '署名-相同方式共享 4.0 国际 (CC BY-SA 4.0)', - 'BY-ND' => '署名-禁止演绎 4.0 国际 (CC BY-ND 4.0)', - 'BY-NC' => '署名-非商业性使用 4.0 国际 (CC BY-NC 4.0)', - 'BY-NC-SA' => '署名-非商业性使用-相同方式共享 4.0 国际 (CC BY-NC-SA 4.0)', - 'BY-NC-ND' => '署名-非商业性使用-禁止演绎 4.0 国际 (CC BY-NC-ND 4.0)' - ); - $text = (isset($license) && $license != 'NONE') ? - '本篇文章采用 ' . $licenselist[$license] . ' 许可协议进行许可。' : - "本篇文章未指定许可协议。"; - - echo "

$text

转载或引用本文时请遵守许可协议，注明出处。

$svg
"; -} - -/* function Sponsor */ -function mdrSponsor($class) -{ - if (!isset($class->mdrSponsor)) return; - if (!is_array($class->mdrSponsor)) return; - if (count($class->mdrSponsor) < 1) return; - $buttons = ''; - foreach ($class->mdrSponsor as list($name, $color, $link)) - $buttons .= "
$name
"; - - echo '

喜欢这篇文章？为什么不考虑打赏一下作者呢？

' . $buttons . '
'; -} - -/* function 是否为状态 */ -function is_status($post) -{ - $tags = $post->tags; - $is = false; - foreach ($tags as $tag) { - if ($tag['name'] == '状态' || $tag['name'] == 'status' || $tag['name'] == 'Status') { - $is = true; - break; - } - } - return $is; -} - -/* function 输出文章标签 */ -function mdrTags($post) -{ - if ($post->tags) { - $result = ''; - foreach ($post->tags as $tag) { - $result .= '
' - . $tag['name'] . '
'; - } - echo $result; - } else { - echo '
None
'; - } -} - -/* function 公网安备logo */ -function mdrGWABlogo() -{ - return file_get_contents(__DIR__ . '/src/GWABlogo.txt'); -} - /** * 获取静态资源 URL * @@ -539,3 +472,75 @@ function staticUrl($file = '') } else return ''; return isset($links[$which]) ? '//' . $links[$which] : ''; } + +/****************** + * MDr Petals * + ******************/ + +/** + * 判断文章是否为状态文章 + * + * @param $post + * @return bool + */ +function mdrIsStatus($post) +{ + if (!$post->tags) return false; + foreach ($post->tags as $tag) + if (in_array($tag, ['Status', 'status', '状态'])) return true; + return false; +} + +/** + * 输出文章标签 + * + * @param array $tags 标签数组 + * @return string + */ +function mdrTags($tags) +{ + if (!$tags) return; + $result = ''; + foreach ($tags as $tag) + $result .= '
' + . $tag['name'] . '
'; + print "
$result
"; +} + +/** + * 输出文章许可协议模块 + * + * @param string $license 文章许可协议 + * @return string + */ +function mdrLicense($license) +{ + $svg = ""; + $licenses = array( + 'BY' => '署名 4.0 国际 (CC BY 4.0)', + 'BY-SA' => '署名-相同方式共享 4.0 国际 (CC BY-SA 4.0)', + 'BY-ND' => '署名-禁止演绎 4.0 国际 (CC BY-ND 4.0)', + 'BY-NC' => '署名-非商业性使用 4.0 国际 (CC BY-NC 4.0)', + 'BY-NC-SA' => '署名-非商业性使用-相同方式共享 4.0 国际 (CC BY-NC-SA 4.0)', + 'BY-NC-ND' => '署名-非商业性使用-禁止演绎 4.0 国际 (CC BY-NC-ND 4.0)' + ); + $text = (isset($license) && $license != 'NONE') ? + '本篇文章采用 ' . ($licenses[$license] ?? $license) . ' 许可协议进行许可。' : + "本篇文章未指定许可协议。"; + return "

$text

转载或引用本文时请遵守许可协议，注明出处。

$svg
"; +} + +/** + * 输出赞助模块 + * + * @param array $sponsor 赞助信息 + * @return string + */ +function mdrSponsor($sponsor) +{ + if (count($sponsor) < 1) return; + $buttons = ''; + foreach ($sponsor as list($name, $color, $link)) + $buttons .= "
$name
"; + return '

喜欢这篇文章？为什么不考虑打赏一下作者呢？

' . $buttons . '
'; +} diff --git a/index.php b/index.php index 5669178..699a033 100644 --- a/index.php +++ b/index.php @@ -21,7 +21,7 @@
next()) : ?> - hidden) : /* Status Post */ ?> + hidden) : /* Status Post */ ?>
message
diff --git a/page-archives.php b/page-archives.php index 2ddcbf9..5c0b176 100644 --- a/page-archives.php +++ b/page-archives.php @@ -9,8 +9,8 @@ need('header.php'); ?>
options->Breadcrumbs) && in_array('Pageshow', $this->options->Breadcrumbs)) : ?> -
- chevron_right +
+ 首页 » title() ?> diff --git a/page-links.php b/page-links.php index e8e881a..d6d4ce8 100644 --- a/page-links.php +++ b/page-links.php @@ -9,8 +9,8 @@ need('header.php'); ?>
options->Breadcrumbs) && in_array('Pageshow', $this->options->Breadcrumbs)) : ?> -
- chevron_right +
+ 首页 » title() ?> diff --git a/page.php b/page.php index 8c37794..712cf8c 100644 --- a/page.php +++ b/page.php @@ -1,8 +1,8 @@ need('header.php'); ?>
-
- chevron_right +
+ 首页  »  title() ?> @@ -18,7 +18,7 @@
content(); ?>
- fields->linceses); ?> + fields->linceses) ?>
need('comments.php'); ?>
diff --git a/post.php b/post.php index 6eee4fe..5af5b25 100644 --- a/post.php +++ b/post.php @@ -1,8 +1,8 @@ need('header.php'); ?>
-
- chevron_right +
+ 首页  »  category(' & '); ?>  »  @@ -53,9 +53,9 @@ content(); ?>
hidden) : ?> -
- fields->linceses); ?> - options); ?> + tags); ?> + fields->linceses); ?> + options->mdrSponsor); ?>