diff --git a/_config.yml b/_config.yml
index 4b7101b..8001945 100755
--- a/_config.yml
+++ b/_config.yml
@@ -357,6 +357,9 @@ style:
codeblock:
scrollbar: 4px
highlightjs_theme: https://fastly.jsdelivr.net/gh/highlightjs/cdn-release@11.5.0/build/styles/atom-one-dark.min.css
+ loading:
+ loading: 正在加载
+ error: 加载失败,请稍后重试。
default:
avatar: https://fastly.jsdelivr.net/gh/cdn-x/placeholder@1.0.1/avatar/round/3442075.svg
diff --git a/scripts/tags/about.js b/scripts/tags/about.js
index 352eac2..c30fbdc 100644
--- a/scripts/tags/about.js
+++ b/scripts/tags/about.js
@@ -18,8 +18,7 @@ hexo.extend.tag.register('about', function(args, content) {
el += '
';
if (args.back) {
el += '
';
- el += '';
- el += 'Back';
+ el += '';
el += '';
}
// avatar
diff --git a/source/css/_common/loading.styl b/source/css/_common/loading.styl
index 46f1778..f16b050 100644
--- a/source/css/_common/loading.styl
+++ b/source/css/_common/loading.styl
@@ -15,6 +15,19 @@ svg.loading
transform:rotate(360deg)
.loading-wrap
- min-height: 50px
- margin: 2rem 0
- text-align: center
\ No newline at end of file
+ margin: 0.5rem 0
+ text-align: center
+ background: var(--block)
+ border-radius: $border-card
+ position relative
+ padding: 2rem
+ svg
+ margin: 4px
+ &:after
+ content: hexo-config('style.loading.loading')
+ color: var(--text-p1)
+ display: block
+ font-size: 14px
+ &.error
+ &:after
+ content: hexo-config('style.loading.error')
\ No newline at end of file
diff --git a/source/css/_layout/sidebar/footer.styl b/source/css/_layout/sidebar/footer.styl
index 167ddbf..10f6b13 100644
--- a/source/css/_layout/sidebar/footer.styl
+++ b/source/css/_layout/sidebar/footer.styl
@@ -1,5 +1,5 @@
.l_left .footer
- margin-top: .5rem
+ margin: 0.5rem var(--gap-l) 0
@media screen and (max-width: $device-tablet)
margin-bottom: 1rem
diff --git a/source/css/_layout/tag-plugins/about.styl b/source/css/_layout/tag-plugins/about.styl
index 04e370e..0af7111 100644
--- a/source/css/_layout/tag-plugins/about.styl
+++ b/source/css/_layout/tag-plugins/about.styl
@@ -4,30 +4,18 @@
padding: 2rem
position: relative
.nav-back
+ display: none
position: absolute
line-height: 1
overflow: hidden
- left: 1rem
- top: 1rem
- display: flex
+ left: 0.75rem
+ top: 0.75rem
align-items: center
- background: var(--site-bg)
- border-radius: 40px
- border: 1px solid var(--block-border)
- padding: 2px 0
- svg,span
- trans1 transform
- width: 36px
- span
- position: absolute
- text-align: center
- left: 100%
- &:hover
- background: var(--card)
- svg
- transform: translateX(-36px)
- span
- transform: translateX(-100%)
+ @media screen and (max-width: $device-mobile-max)
+ display: flex
+ svg
+ width: 1rem
+ height: 1rem
.about-header
display flex
justify-content: center
diff --git a/source/js/plugins/friends.js b/source/js/plugins/friends.js
index 4c0a4a2..72e81f0 100644
--- a/source/js/plugins/friends.js
+++ b/source/js/plugins/friends.js
@@ -44,7 +44,7 @@ const friendsjs = {
},
layout: (cfg) => {
const el = $(cfg.el)[0];
- $(el).append('
');
+ $(el).append('
');
friendsjs.requestAPI(cfg.api, function(data) {
$(el).find('.loading-wrap').remove();
const arr = data.content || data;
@@ -60,7 +60,8 @@ const friendsjs = {
});
}, function() {
$(el).find('.loading-wrap svg').remove();
- $(el).find('.loading-wrap p').text('加载失败,请稍后重试。');
+ $(el).find('.loading-wrap').append('
');
+ $(el).find('.loading-wrap').addClass('error');
});
},
}
diff --git a/source/js/plugins/sites.js b/source/js/plugins/sites.js
index 57091ef..0d3e348 100644
--- a/source/js/plugins/sites.js
+++ b/source/js/plugins/sites.js
@@ -44,7 +44,7 @@ const sitesjs = {
},
layout: (cfg) => {
const el = $(cfg.el)[0];
- $(el).append('
');
+ $(el).append('
');
sitesjs.requestAPI(cfg.api, function(data) {
$(el).find('.loading-wrap').remove();
const arr = data.content;
@@ -63,7 +63,8 @@ const sitesjs = {
});
}, function() {
$(el).find('.loading-wrap svg').remove();
- $(el).find('.loading-wrap p').text('加载失败,请稍后重试。');
+ $(el).find('.loading-wrap').append('
');
+ $(el).find('.loading-wrap').addClass('error');
});
},
}
diff --git a/source/js/plugins/timeline.js b/source/js/plugins/timeline.js
index b9defc8..736b36d 100644
--- a/source/js/plugins/timeline.js
+++ b/source/js/plugins/timeline.js
@@ -54,7 +54,7 @@ const StellarTimeline = {
},
layoutDiv: (cfg) => {
const el = $(cfg.el)[0];
- $(el).append('
');
+ $(el).append('
');
StellarTimeline.requestAPI(cfg.api, function(data) {
$(el).find('.loading-wrap').remove();
const arr = data.content || data;
@@ -127,7 +127,8 @@ const StellarTimeline = {
});
}, function() {
$(el).find('.loading-wrap svg').remove();
- $(el).find('.loading-wrap p').text('加载失败,请稍后重试。');
+ $(el).find('.loading-wrap').append('
');
+ $(el).find('.loading-wrap').addClass('error');
});
},
}