diff --git a/.gitignore b/.gitignore
index 10b7057..063b0e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,7 @@
-#file
-public
-node_modules
-yarn.lock
-dist
-footprint
-
-# doc
-.deploy_git
+.DS_Store
+Thumbs.db
+db.json
+*.log
+node_modules/
+public/
+.deploy*/
\ No newline at end of file
diff --git a/_config.yml b/_config.yml
old mode 100755
new mode 100644
index c6003ad..c70e2e0
--- a/_config.yml
+++ b/_config.yml
@@ -1,85 +1,94 @@
-# Hexo Configuration
-## Docs: https://hexo.io/docs/configuration.html
-## Source: https://github.com/hexojs/hexo/
-
-# Site
-title: Jzxer's Blog
-subtitle:
-description: web全栈工程师,摇滚,vue,vuex,react,webpack,git,koa2
-author: Jzxer
-language: zh-CN
-timezone:
-
-# URL
-## If your site is put in a subdirectory, set url as 'http://yoursite.com/child' and root as '/child/'
-url: /
-root: /
-permalink: :title.html
-permalink_defaults:
-
-# Directory
-source_dir: source
-public_dir: public
-tag_dir: tags
-archive_dir: archives
-category_dir: categories
-code_dir: downloads/code
-i18n_dir: :lang
-skip_render:
-
-# Writing
-new_post_name: :title.md # File name of new posts
-default_layout: post
-titlecase: false # Transform title into titlecase
-external_link: true # Open external links in new tab
-filename_case: 0
-render_drafts: false
-post_asset_folder: false
-relative_link: false
-future: true
-highlight:
- enable: false
- line_number: true
- auto_detect: false
- tab_replace:
-
-# Category & Tag
-default_category: uncategorized
-category_map:
-tag_map:
-
-prism_plugin:
- mode: 'preprocess' # realtime/preprocess
- theme: 'default'
- line_number: false # default false
-
-# Date / Time format
-## Hexo uses Moment.js to parse and display date
-## You can customize the date format as defined in
-## http://momentjs.com/docs/#/displaying/format/
-date_format: YYYY-MM-DD
-time_format: HH:mm:ss
-
-search:
- path: search.xml
- field: all
-
-# Pagination
-## Set per_page to 0 to disable pagination
-per_page: 10
-pagination_dir: page
-
-# Extensions
-## Plugins: https://hexo.io/plugins/
-## Themes: https://hexo.io/themes/
-theme: material
-
-# Deployment
-## Docs: https://hexo.io/docs/deployment.html
-deploy:
-- type: git
- repo: https://git.coding.net/jzxer/jzxer.git
- branch: master
-- type: git
- repo: https://github.com/j710328466/j710328466.github.io.git
+# Hexo Configuration
+## Docs: https://hexo.io/docs/configuration.html
+## Source: https://github.com/hexojs/hexo/
+
+# Site
+title: Jzxer's Blog
+subtitle:
+description: web全栈工程师,摇滚,vue,vuex,react,webpack,git,koa2
+author: Jzxer
+language: zh-CN
+timezone:
+
+# URL
+## If your site is put in a subdirectory, set url as 'http://yoursite.com/child' and root as '/child/'
+url: /
+root: /
+permalink: :title.html
+permalink_defaults:
+
+# Directory
+source_dir: source
+public_dir: public
+tag_dir: tags
+archive_dir: archives
+category_dir: categories
+code_dir: downloads/code
+i18n_dir: :lang
+skip_render:
+
+# Writing
+new_post_name: :title.md # File name of new posts
+default_layout: post
+titlecase: false # Transform title into titlecase
+external_link: true # Open external links in new tab
+filename_case: 0
+render_drafts: false
+post_asset_folder: false
+relative_link: false
+future: true
+highlight:
+ enable: false
+ line_number: true
+ auto_detect: false
+ tab_replace:
+
+# Category & Tag
+default_category: uncategorized
+category_map:
+tag_map:
+
+prism_plugin:
+ mode: 'preprocess' # realtime/preprocess
+ theme: 'default'
+ line_number: false # default false
+
+# Date / Time format
+## Hexo uses Moment.js to parse and display date
+## You can customize the date format as defined in
+## http://momentjs.com/docs/#/displaying/format/
+date_format: YYYY-MM-DD
+time_format: HH:mm:ss
+
+search:
+ path: search.xml
+ field: all
+
+# Pagination
+## Set per_page to 0 to disable pagination
+per_page: 10
+pagination_dir: page
+
+# Extensions
+## Plugins: https://hexo.io/plugins/
+## Themes: https://hexo.io/themes/
+theme: material
+
+feed:
+ type: atom
+ path: atom.xml
+ limit: 20
+ hub:
+ content:
+ content_limit: 140
+ content_limit_delim: ' '
+
+# Deployment
+## Docs: https://hexo.io/docs/deployment.html
+deploy:
+- type: git
+ repo: https://git.coding.net/jzxer/jzxer.git
+ branch: master
+- type: git
+ repo: https://github.com/j710328466/j710328466.github.io.git
branch: master
\ No newline at end of file
diff --git a/package.json b/package.json
old mode 100755
new mode 100644
index 7a7e4f7..d77968e
--- a/package.json
+++ b/package.json
@@ -3,27 +3,24 @@
"version": "0.0.0",
"private": true,
"hexo": {
- "version": "3.5.0"
+ "version": "3.7.1"
},
"dependencies": {
- "dplayer": "^1.4.0",
- "ftpsync": "^0.2.0",
"hexo": "^3.2.0",
- "hexo-deployer-ftpsync": "^0.1.1",
- "hexo-deployer-git": "^0.3.0",
+ "hexo-deployer-git": "^0.3.1",
"hexo-generator-archive": "^0.1.4",
"hexo-generator-category": "^0.1.3",
+ "hexo-generator-feed": "^1.2.2",
"hexo-generator-index": "^0.2.0",
- "hexo-generator-search": "^2.1.1",
+ "hexo-generator-search": "^2.2.5",
"hexo-generator-tag": "^0.2.0",
"hexo-helper-post-top": "^0.0.1",
"hexo-helper-qrcode": "^1.0.2",
- "hexo-prism-plugin": "^2.1.2",
- "hexo-renderer-ejs": "^0.2.0",
- "hexo-renderer-marked": "^0.2.10",
+ "hexo-renderer-ejs": "^0.3.0",
+ "hexo-renderer-marked": "^0.3.0",
"hexo-renderer-stylus": "^0.3.1",
"hexo-server": "^0.2.0",
- "hexo-tag-aplayer": "^2.0.1",
- "hexo-tag-dplayer": "^0.1.7"
+ "hexo-tag-aplayer": "^3.0.3",
+ "hexo-tag-dplayer": "^0.3.3"
}
}
diff --git a/public/Amani-间奏-1.html b/public/Amani-间奏-1.html
index 2fc0937..c5de5b9 100644
--- a/public/Amani-间奏-1.html
+++ b/public/Amani-间奏-1.html
@@ -22,6 +22,8 @@
+
+
@@ -55,7 +57,7 @@
-
+
@@ -105,7 +107,7 @@
}
a {
- color: #0098A6;
+ color: #679cc5;
}
.mdl-card__media,
@@ -115,13 +117,13 @@
#scheme-Paradox .sidebar_archives-count,
#scheme-Paradox .sidebar-colored .sidebar-header,
#scheme-Paradox .sidebar-colored .sidebar-badge{
- background-color: #0b203a !important;
+ background-color: #785470 !important;
}
/* Sidebar User Drop Down Menu Text Color */
#scheme-Paradox .sidebar-colored .sidebar-nav>.dropdown>.dropdown-menu>li>a:hover,
#scheme-Paradox .sidebar-colored .sidebar-nav>.dropdown>.dropdown-menu>li>a:focus {
- color: #0b203a !important;
+ color: #785470 !important;
}
#post_entry-right-info,
@@ -134,29 +136,29 @@
.sidebar-colored .sidebar-nav > .open > a:hover,
.sidebar-colored .sidebar-nav > .open > a:focus,
#ds-reset #ds-ctx .ds-ctx-entry .ds-ctx-head a {
- color: #0b203a !important;
+ color: #785470 !important;
}
.toTop {
- background: #0b203a !important;
+ background: #1a1d3a !important;
}
.material-layout .material-post>.material-nav,
.material-layout .material-index>.material-nav,
.material-nav a {
- color: #0b203a;
+ color: #1a1d3a;
}
#scheme-Paradox .MD-burger-layer {
- background-color: #0b203a;
+ background-color: #1a1d3a;
}
#scheme-Paradox #post-toc-trigger-btn {
- color: #0b203a;
+ color: #1a1d3a;
}
.post-toc a:hover {
- color: #0098A6;
+ color: #679cc5;
text-decoration: underline;
}
@@ -216,7 +218,7 @@
-
+
@@ -224,7 +226,7 @@
-
+
@@ -270,7 +272,7 @@
"@type": "ImageObject",
"url": "/img/avatar.png"
},
- "description": "对的，坚持！错的，放弃！"
+ "description": "对的，坚持！,,错的，放弃！"
},
"publisher": {
"@type": "Organization",
@@ -305,7 +307,7 @@
-
+
@@ -419,7 +421,7 @@
@@ -445,6 +447,16 @@
