更改文件夹结构

mirai-mamori · Apr 29, 2021 · 88c04aa · 88c04aa
1 parent fb1f5d5
commit 88c04aa
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 33 deletions.
diff --git a/cdn/do.py → _helper/do.py b/cdn/do.py → _helper/do.py
@@ -17,31 +17,13 @@
 localtime = time.asctime( time.localtime(time.time()) )
 print (localtime)
 
-patchall = './'
-pathJS = patchall + 'js/src/'
-pathJSroot = patchall + 'js/'
+patchall = '../'
 pathCSS = patchall + 'css/src/'
 pathCSSroot = patchall + 'css/'
 
-jsfiles = [f for f in listdir(pathJS) if isfile(join(pathJS, f))]
 cssfiles = [f for f in listdir(pathCSS) if isfile(join(pathCSS, f))]
 
-strJS = '/*! Generate by mirai-mamori. ' + localtime + '*/'
 strCSS = '/*! Generate by mirai-mamori. ' + localtime + '*/'
-
-for f in jsfiles:
-    with codecs.open(pathJS + f, 'r', encoding='utf-8') as file:
-        data = file.read()
-    strJS = strJS + data
-    print(f)
-
-JSminified = jsmin(strJS)
-
-with codecs.open(pathJSroot + "lib.js", "w", encoding='utf-8') as text_file:
-    print(JSminified, file=text_file)
-
-
-print('------------------JS Done------------------')
 
 for f in cssfiles:
     with codecs.open(pathCSS + f, 'r', encoding='utf-8') as file:

diff --git a/cdn/css/src/baguetteBox.min.css b/cdn/css/src/baguetteBox.min.css
diff --git a/cdn/js/src/08.lazyload.min.js b/cdn/js/src/08.lazyload.min.js
diff --git a/cdn/css/lib.css → css/lib.css b/cdn/css/lib.css → css/lib.css
diff --git a/cdn/css/src/font-awesome-animation.min.css → css/src/font-awesome-animation.min.css b/cdn/css/src/font-awesome-animation.min.css → css/src/font-awesome-animation.min.css
diff --git a/cdn/css/src/font-awesome.min.css → css/src/font-awesome.min.css b/cdn/css/src/font-awesome.min.css → css/src/font-awesome.min.css
diff --git a/cdn/css/src/third-part.css → css/src/third-part.css b/cdn/css/src/third-part.css → css/src/third-part.css
diff --git a/cdn/theme/github.css → css/theme/github.css b/cdn/theme/github.css → css/theme/github.css
diff --git a/cdn/theme/sakura.css → css/theme/sakura.css b/cdn/theme/sakura.css → css/theme/sakura.css
diff --git a/functions.php b/functions.php
@@ -257,10 +257,10 @@ function sakura_scripts()
     if (iro_opt('local_global_library')) {
         //wp_enqueue_script('js_lib', get_template_directory_uri() . '/cdn/js/lib.js', array(), SAKURA_VERSION . iro_opt('cookie_version', ''), true);
         if (iro_opt('smoothscroll_option')) {
-            wp_enqueue_script('SmoothScroll', get_template_directory_uri() . '/cdn/js/smoothscroll.js', array(), SAKURA_VERSION . iro_opt('cookie_version', ''), true);
+            wp_enqueue_script('SmoothScroll', get_template_directory_uri() . '/js/smoothscroll.js', array(), SAKURA_VERSION . iro_opt('cookie_version', ''), true);
         }
     } elseif (iro_opt('smoothscroll_option')) {
-        wp_enqueue_script('SmoothScroll',  'https://cdn.jsdelivr.net/combine/gh/mirai-mamori/Sakurairo@' . SAKURA_VERSION . '/cdn/js/smoothscroll.js', array(), SAKURA_VERSION . iro_opt('cookie_version', ''), true);
+        wp_enqueue_script('SmoothScroll',  'https://cdn.jsdelivr.net/combine/gh/mirai-mamori/Sakurairo@' . SAKURA_VERSION . '/js/smoothscroll.js', array(), SAKURA_VERSION . iro_opt('cookie_version', ''), true);
         //wp_enqueue_script('js_lib', 'https://cdn.jsdelivr.net/combine/gh/mirai-mamori/Sakurairo@' . SAKURA_VERSION . '/cdn/js/lib.min.js,gh/mirai-mamori/Sakurairo@' . SAKURA_VERSION . '/cdn/js/smoothscroll.js', array(), SAKURA_VERSION, true);
     }/*  else {
         wp_enqueue_script('js_lib', 'https://cdn.jsdelivr.net/gh/mirai-mamori/Sakurairo@' . SAKURA_VERSION . '/cdn/js/lib.min.js', array(), SAKURA_VERSION, true);

diff --git a/inc/swicher.php b/inc/swicher.php
@@ -55,16 +55,16 @@ function font_end_js_control() { ?>
     clipboardCopyright:<?php echo iro_opt('clipboard_copyright') == "0" ? 'false':'true' ?>,
 
     <?php if(iro_opt('entry_content_style') == "sakurairo"){ ?>
-    entry_content_style_src:"<?php echo get_template_directory_uri() ?>/cdn/theme/sakura.css?<?php echo SAKURA_VERSION.iro_opt('cookie_version', ''); ?>",
+    entry_content_style_src:"<?php echo get_template_directory_uri() ?>/css/theme/sakura.css?<?php echo SAKURA_VERSION.iro_opt('cookie_version', ''); ?>",
     <?php }elseif(iro_opt('entry_content_style') == "github") {?>
-    entry_content_style_src:"<?php echo get_template_directory_uri() ?>/cdn/theme/github.css?<?php echo SAKURA_VERSION.iro_opt('cookie_version', ''); ?>",
+    entry_content_style_src:"<?php echo get_template_directory_uri() ?>/css/theme/github.css?<?php echo SAKURA_VERSION.iro_opt('cookie_version', ''); ?>",
     <?php } ?>
     entry_content_style:"<?php echo iro_opt('entry_content_style'); ?>",
 
     <?php if(iro_opt('local_global_library')){ ?>
-    jsdelivr_css_src:"<?php echo get_template_directory_uri() ?>/cdn/css/lib.css?<?php echo SAKURA_VERSION.iro_opt('cookie_version', ''); ?>",
+    jsdelivr_css_src:"<?php echo get_template_directory_uri() ?>/css/lib.css?<?php echo SAKURA_VERSION.iro_opt('cookie_version', ''); ?>",
     <?php } else { ?>
-    jsdelivr_css_src:"https://cdn.jsdelivr.net/gh/mirai-mamori/Sakurairo@<?php echo SAKURA_VERSION; ?>/cdn/css/lib.min.css",
+    jsdelivr_css_src:"https://cdn.jsdelivr.net/gh/mirai-mamori/Sakurairo@<?php echo SAKURA_VERSION; ?>/css/lib.min.css",
     <?php } ?>
     <?php if (iro_opt('aplayer_server') != 'off'): ?>
     float_player_on:true,

diff --git a/cdn/js/smoothscroll.js → js/smoothscroll.js b/cdn/js/smoothscroll.js → js/smoothscroll.js