Merge pull request #525 from mirai-mamori/preview

渚のバカンス「Seaside Vacation」　Update　Fix　Pack　1
mirai-mamori · May 10, 2022 · 1b3979e · 1b3979e
2 parents 8d8a87c + 7a9548b
commit 1b3979e
Show file tree

Hide file tree

Showing 14 changed files with 63 additions and 58 deletions.
diff --git a/css/theme/sakura.css b/css/theme/sakura.css
@@ -152,7 +152,7 @@ body.dark .entry-content tr:nth-child(even){background-color: unset}
     background-color: transparent !important;
 }
 
-.highlight-wrap:before {
+.entry-content .highlight-wrap:before {
     content: " ";
     position: absolute;
     -webkit-border-radius: 50%;
@@ -167,7 +167,7 @@ body.dark .entry-content tr:nth-child(even){background-color: unset}
     z-index: 2
 }
 
-.highlight-wrap {
+.entry-content .highlight-wrap {
     position: relative;
     background: #21252b;
     border-radius: 5px;
@@ -182,7 +182,7 @@ body.dark .entry-content tr:nth-child(even){background-color: unset}
     box-shadow: 0 10px 30px 0 rgba(0, 0, 0, .4)
 }
 
-.highlight-wrap .copy-code {
+.entry-content .highlight-wrap .copy-code {
     color: #fff;
     position: absolute;
     float: right;
@@ -194,7 +194,7 @@ body.dark .entry-content tr:nth-child(even){background-color: unset}
     font-size: 16px;
 }
 
-.highlight-wrap .copy-code:hover {
+.entry-content .highlight-wrap .copy-code:hover {
     color: rgba(255,255,255,.5);
 }
 
@@ -210,7 +210,7 @@ body.dark .entry-content tr:nth-child(even){background-color: unset}
     color: #21252b
 }
 
-.highlight-wrap code {
+.entry-content .highlight-wrap code {
     background: #1d1f21;
     color: #fff;
     word-break: break-word;
@@ -220,7 +220,7 @@ body.dark .entry-content tr:nth-child(even){background-color: unset}
     border-radius: 0 0 5px 5px;
 }
 
-.highlight-wrap code[data-rel]:before {
+.entry-content .highlight-wrap code[data-rel]:before {
     color: #fff;
     content: attr(data-rel);
     height: 30px;

diff --git a/functions.php b/functions.php
@@ -10,7 +10,7 @@
 
 
 define('IRO_VERSION', wp_get_theme()->get('Version'));
-define('INT_VERSION', '17.0.0');
+define('INT_VERSION', '17.0.1');
 define('BUILD_VERSION', '2');
 
 //Option-Framework
@@ -1623,6 +1623,9 @@ function change_avatar($avatar)
 // default feature image
 function DEFAULT_FEATURE_IMAGE(string $size='source'):string
 {
+    if (iro_opt('post_cover_options') == 'type_2') {
+        return iro_opt('post_cover').'?'.rand(1,100);
+    }
     if (iro_opt('random_graphs_options') == 'external_api'){
         return iro_opt('random_graphs_link').'?'.rand(1,100);
     }

diff --git a/js/app.js b/js/app.js
diff --git a/js/app.js.LICENSE.txt b/js/app.js.LICENSE.txt
@@ -1,4 +1,4 @@
-/*! build 8be0769 2022/5/9*/
+/*! build c9598d1 2022/5/10*/
 
 /*! loadCSS. [c]2020 Filament Group, Inc. MIT License */
 

diff --git a/js/app.js.map b/js/app.js.map
diff --git a/opt/languages/ja.mo b/opt/languages/ja.mo
diff --git a/opt/languages/ja.po b/opt/languages/ja.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Codestar Framework Modified by Fuukei\n"
-"POT-Creation-Date: 2022-05-09 16:37+0800\n"
-"PO-Revision-Date: 2022-05-09 16:37+0800\n"
+"POT-Creation-Date: 2022-05-10 18:05+0800\n"
+"PO-Revision-Date: 2022-05-10 18:06+0800\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ja\n"
@@ -669,13 +669,10 @@ msgid "News+"
 msgstr "ニュース+"
 
 #: options/theme-options.php:31
-#, fuzzy
 msgid ""
 "<img src=\"https://news.maho.cc/sakurairo.php\"  alt=\"News_Plus\" width="
 "\"100%\" height=\"100%\" />"
 msgstr ""
-"<img src=\"https://news.maho.cc/sakurairo.php\"  alt=\"News_Plus\" width="
-"\"100%\" height=\"100%\" />"
 
 #: options/theme-options.php:39
 msgid "Preliminary Options"
@@ -2089,18 +2086,14 @@ msgid "Webp Optimization/External API Desktop Side Random Graphics Address"
 msgstr ""
 "Webp 最適化/外部 API デスクトップサイドのランダムなグラフィックアドレス"
 
-#: options/theme-options.php:1609
-msgid "Fill in the address"
-msgstr "住所を入力する"
+#: options/theme-options.php:1609 options/theme-options.php:1620
+msgid "Fill in an URL"
+msgstr "URL を入力する"
 
 #: options/theme-options.php:1618
 msgid "External API Mobile Devices Random Image Address"
 msgstr "外部 API モバイル デバイスのランダム イメージ アドレス"
 
-#: options/theme-options.php:1620
-msgid "fill address"
-msgstr "住所を記入する"
-
 #: options/theme-options.php:1629
 msgid "Cover Random Background Image Cache"
 msgstr "ランダム背景画像キャッシュをカバー"
@@ -3851,8 +3844,9 @@ msgstr ""
 #: options/theme-options.php:3479
 #, php-format
 msgid ""
-"iro 主题版本 / Theme Version %s | <a href=\"https://github.com/mirai-mamori/"
-"Sakurairo\">项目地址 / Project Address</a>"
+"Sakurairo 主题版本 / Theme Version %s | 内部版本 / Internal Version %s | <a "
+"href=\"https://github.com/mirai-mamori/Sakurairo\">项目地址 / Project "
+"Address</a>"
 msgstr ""
 
 #: options/theme-options.php:3484
@@ -4066,3 +4060,9 @@ msgstr ""
 #. Author URI of the plugin/theme
 msgid "https://github.com/Fuukei"
 msgstr ""
+
+#~ msgid "Fill in the address"
+#~ msgstr "住所を入力する"
+
+#~ msgid "fill address"
+#~ msgstr "住所を記入する"
diff --git a/opt/languages/sakurairo_csf.pot b/opt/languages/sakurairo_csf.pot
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Codestar Framework Modified by Fuukei\n"
-"POT-Creation-Date: 2022-05-09 16:36+0800\n"
+"POT-Creation-Date: 2022-05-10 18:05+0800\n"
 "PO-Revision-Date: 2021-06-26 16:15+0800\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -1953,18 +1953,14 @@ msgstr ""
 msgid "Webp Optimization/External API Desktop Side Random Graphics Address"
 msgstr ""
 
-#: options/theme-options.php:1609
-msgid "Fill in the address"
+#: options/theme-options.php:1609 options/theme-options.php:1620
+msgid "Fill in an URL"
 msgstr ""
 
 #: options/theme-options.php:1618
 msgid "External API Mobile Devices Random Image Address"
 msgstr ""
 
-#: options/theme-options.php:1620
-msgid "fill address"
-msgstr ""
-
 #: options/theme-options.php:1629
 msgid "Cover Random Background Image Cache"
 msgstr ""
@@ -3521,8 +3517,8 @@ msgstr ""
 #: options/theme-options.php:3479
 #, php-format
 msgid ""
-"iro 主题版本 / Theme Version %s | <a href=\"https://github.com/mirai-mamori/"
-"Sakurairo\">项目地址 / Project Address</a>"
+"Sakurairo 主题版本 / Theme Version %s | 内部版本 / Internal Version %s | <a href="
+"\"https://github.com/mirai-mamori/Sakurairo\">项目地址 / Project Address</a>"
 msgstr ""
 
 #: options/theme-options.php:3484

diff --git a/opt/languages/zh_CN.mo b/opt/languages/zh_CN.mo
diff --git a/opt/languages/zh_CN.po b/opt/languages/zh_CN.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Codestar Framework Modified by Fuukei\n"
-"POT-Creation-Date: 2022-05-09 16:37+0800\n"
-"PO-Revision-Date: 2022-05-09 16:37+0800\n"
+"POT-Creation-Date: 2022-05-10 18:06+0800\n"
+"PO-Revision-Date: 2022-05-10 18:07+0800\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: zh_CN\n"
@@ -2018,18 +2018,14 @@ msgstr "默认开启，桌面端和移动端会分别使用不同的随机图片
 msgid "Webp Optimization/External API Desktop Side Random Graphics Address"
 msgstr "Webp优化/外部API桌面端随机图片地址"
 
-#: options/theme-options.php:1609
-msgid "Fill in the address"
-msgstr "填写地址"
+#: options/theme-options.php:1609 options/theme-options.php:1620
+msgid "Fill in an URL"
+msgstr "填写URL"
 
 #: options/theme-options.php:1618
 msgid "External API Mobile Devices Random Image Address"
 msgstr "外部API手机端随机图片地址"
 
-#: options/theme-options.php:1620
-msgid "fill address"
-msgstr "填写地址"
-
 #: options/theme-options.php:1629
 msgid "Cover Random Background Image Cache"
 msgstr "封面随机背景图片缓存"
@@ -3679,8 +3675,9 @@ msgstr ""
 #: options/theme-options.php:3479
 #, php-format
 msgid ""
-"iro 主题版本 / Theme Version %s | <a href=\"https://github.com/mirai-mamori/"
-"Sakurairo\">项目地址 / Project Address</a>"
+"Sakurairo 主题版本 / Theme Version %s | 内部版本 / Internal Version %s | <a "
+"href=\"https://github.com/mirai-mamori/Sakurairo\">项目地址 / Project "
+"Address</a>"
 msgstr ""
 
 #: options/theme-options.php:3484
@@ -3887,3 +3884,9 @@ msgstr ""
 #. Author URI of the plugin/theme
 msgid "https://github.com/Fuukei"
 msgstr ""
+
+#~ msgid "Fill in the address"
+#~ msgstr "填写地址"
+
+#~ msgid "fill address"
+#~ msgstr "填写地址"
diff --git a/opt/languages/zh_TW.mo b/opt/languages/zh_TW.mo
diff --git a/opt/languages/zh_TW.po b/opt/languages/zh_TW.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Codestar Framework Modified by Fuukei\n"
-"POT-Creation-Date: 2022-05-09 16:37+0800\n"
-"PO-Revision-Date: 2022-05-09 16:38+0800\n"
+"POT-Creation-Date: 2022-05-10 18:07+0800\n"
+"PO-Revision-Date: 2022-05-10 18:07+0800\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: zh_TW\n"
@@ -2016,18 +2016,14 @@ msgstr "默認開啟，桌面端和行動端會分別使用不同的隨機圖像
 msgid "Webp Optimization/External API Desktop Side Random Graphics Address"
 msgstr "Webp優化/外部API桌面端隨機圖像地址"
 
-#: options/theme-options.php:1609
-msgid "Fill in the address"
-msgstr "填寫地址"
+#: options/theme-options.php:1609 options/theme-options.php:1620
+msgid "Fill in an URL"
+msgstr "填寫URL"
 
 #: options/theme-options.php:1618
 msgid "External API Mobile Devices Random Image Address"
 msgstr "外部API行動端隨機圖像地址"
 
-#: options/theme-options.php:1620
-msgid "fill address"
-msgstr "填寫地址"
-
 #: options/theme-options.php:1629
 msgid "Cover Random Background Image Cache"
 msgstr "封面隨機背景圖像快取"
@@ -3678,8 +3674,9 @@ msgstr ""
 #: options/theme-options.php:3479
 #, php-format
 msgid ""
-"iro 主题版本 / Theme Version %s | <a href=\"https://github.com/mirai-mamori/"
-"Sakurairo\">项目地址 / Project Address</a>"
+"Sakurairo 主题版本 / Theme Version %s | 内部版本 / Internal Version %s | <a "
+"href=\"https://github.com/mirai-mamori/Sakurairo\">项目地址 / Project "
+"Address</a>"
 msgstr ""
 
 #: options/theme-options.php:3484
@@ -3885,3 +3882,9 @@ msgstr ""
 #. Author URI of the plugin/theme
 msgid "https://github.com/Fuukei"
 msgstr ""
+
+#~ msgid "Fill in the address"
+#~ msgstr "填寫地址"
+
+#~ msgid "fill address"
+#~ msgstr "填寫地址"
diff --git a/opt/options/theme-options.php b/opt/options/theme-options.php
@@ -1606,7 +1606,7 @@ function iro_validate_optional_url( $value ) {
         'id' => 'random_graphs_link',
         'type' => 'text',
         'title' => __('Webp Optimization/External API Desktop Side Random Graphics Address','sakurairo_csf'),
-        'desc' => __('Fill in the address','sakurairo_csf'),
+        'desc' => __('Fill in an URL','sakurairo_csf'),
         'default' => 'https://api.maho.cc/random-img/pc.php',
         'sanitize' => false,
         'validate' => 'csf_validate_url',
@@ -1617,7 +1617,7 @@ function iro_validate_optional_url( $value ) {
         'type' => 'text',
         'title' => __('External API Mobile Devices Random Image Address','sakurairo_csf'),
         'dependency' => array( 'random_graphs_mts', '==', 'true' ),
-        'desc' => __('fill address','sakurairo_csf'),
+        'desc' => __('Fill in an URL','sakurairo_csf'),
         'default' => 'https://api.maho.cc/random-img/mobile.php',
         'sanitize' => false,
         'validate' => 'csf_validate_url',

diff --git a/style.css b/style.css
@@ -6,7 +6,7 @@ Theme URI: https://github.com/mirai-mamori/Sakurairo
 Author: Created by Fuukei
 Author URI: https://fuukei.org/
 Description: A colorful, Easy-to-use, Perfect Experience, and Powerful Customizable WordPress Theme (Based on Theme Sakura)
-Version: 2.5.0
+Version: 2.5.0.1
 Tested up to: 6.0
 Requires at least: 5.6
 Requires PHP: 7.2