Skip to content

Commit bf3c7c3

Browse files
committed
[ Fix ] Several detail problems
1 parent 6307795 commit bf3c7c3

File tree

11 files changed

+45
-21
lines changed

11 files changed

+45
-21
lines changed

_config.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ auto_category:
9090

9191
feed:
9292
type: atom
93-
icon: images/FCC-CDC-v1.png
93+
icon: images/FCC-CDC-v1-1.png
9494

9595
pwa:
9696
manifest:
@@ -108,9 +108,12 @@ pwa:
108108
theme_color: rgba(0,0,0,0.5)
109109
background_color: transparent
110110
icons:
111-
- src: images/FCC-CDC-v1.png
111+
- src: images/FCC-CDC-v1-1.png
112112
type: image/png
113113
sizes: 180x180
114+
- src: images/FCC-CDC-v1-0.png
115+
type: image/png
116+
sizes: 1056x697
114117
serviceWorker:
115118
path: /sw.js
116119
preload:

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"hexo-generator-index": "^0.2.1",
2323
"hexo-generator-slidehtml": "0.0.62",
2424
"hexo-generator-tag": "^0.2.0",
25-
"hexo-migrator-web": "^0.4.4",
25+
"hexo-migrator-web": "^0.4.5",
2626
"hexo-permalink-pinyin": "^1.0.0",
2727
"hexo-pwa": "^0.1.3",
2828
"hexo-reference": "^1.0.4",

source

Submodule source updated 38 files

themes/Icarus/_config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Version of the Icarus theme that is currently used
22
version: 2.3.0
33
# Path or URL to the website's icon
4-
favicon: images/FCC-CDC-v1.png
4+
favicon: images/FCC-CDC-v1-1.png
55
# Path or URL to RSS atom.xml
66
rss: atom.xml
77
# Path or URL to the website's logo to be shown on the left of the navigation bar or footer
8-
logo: images/FCC-CDC-v1.png
8+
logo: images/FCC-CDC-v1-0.png
99
# Open Graph metadata
1010
# https://hexo.io/docs/helpers.html#open-graph
1111
open_graph:
@@ -110,7 +110,7 @@ widgets:
110110
# Author's current location to be shown in the profile widget
111111
location: ChengDu, SiChuan, China
112112
# Path or URL to the avatar to be shown in the profile widget
113-
avatar: images/FCC-CDC-v1.png
113+
avatar: images/FCC-CDC-v1-0.png
114114
# Email address for the Gravatar to be shown in the profile widget
115115
gravatar:
116116
# Whether to show avatar image rounded or square

themes/Icarus/includes/helpers/data.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ module.exports = function (hexo) {
5454

5555
const url_for = hexo.extend.helper.get('url_for');
5656

57-
hexo.extend.helper.register('sponsor_list', function (posts) {
57+
hexo.extend.helper.register('partner_list', function (posts) {
5858

5959
return posts.map(({categories, source, title, path, thumbnail}) =>
6060

61-
has_category({ categories }, 'Sponsor') && {
61+
has_category({ categories }, 'Partner') && {
6262
name: source.match( /([^/\\]+)\.\w+$/i )[1],
6363
title,
6464
logo: url_for.call(this, path + thumbnail),

themes/Icarus/layout/activity.ejs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
<%-
2525
partial('widget/marker_map', {
2626
markers: site.posts.map(
27-
({title, permalink, address}) => (address && {title, URL: permalink, address})
27+
({title, permalink, start, address}) =>
28+
(start && address && {title, URL: permalink, address})
2829
).filter( Boolean )
2930
})
3031
%>

themes/Icarus/layout/community.ejs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
<%-
1717
partial('widget/team', {
1818
keyMap: {
19-
sponsors: '赞助'
19+
partners: '合作伙伴'
2020
},
21-
data: sponsor_list(site.posts),
21+
data: partner_list(site.posts),
2222
count: true,
2323
posts: site.posts
2424
})

themes/Icarus/layout/widget/activity.ejs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<%
22
const {
3-
permalink, title, description, start, end, address, links, mentors, workers, sponsors
3+
permalink, title, description, start, end, address, links, mentors, workers, partners
44
} = post;
55
66
const event = eventOf(title, description, start, end, address);
@@ -45,13 +45,13 @@ if (mentors || workers) { %><%-
4545
}) %><%
4646
}
4747
48-
if ( sponsors ) { %><%-
48+
if ( partners ) { %><%-
4949
partial('./team', {
5050
keyMap: {
51-
sponsors: '赞助'
51+
partners: '合作伙伴'
5252
},
53-
data: sponsor_list(site.posts),
53+
data: partner_list(site.posts),
5454
count: false,
55-
posts: { sponsors }
55+
posts: { partners }
5656
}) %><%
5757
} %>

themes/Icarus/layout/widget/marker_map.ejs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@
3838
});
3939
})(function (View, unique, box, template, list) {
4040
41-
list = JSON.parse( list.innerHTML.trim() );
41+
list = unique(JSON.parse( list.innerHTML.trim() ), function (A, B) {
42+
43+
return A.address !== B.address;
44+
});
4245
4346
var map = new AMap.Map(box, {resizeEnable: true}),
4447
coder = new AMap.Geocoder(),
@@ -64,7 +67,7 @@
6467
}
6568
6669
getCoords(
67-
unique( list.map(function (item) { return item.address; }) )
70+
list.map(function (item) { return item.address; })
6871
).then(function (data) {
6972
7073
if (! data.geocodes[0]) return;

themes/Icarus/layout/widget/members.ejs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,16 @@
4040
ol.flow-box > li .card-content {
4141
margin: 0 0 0 1rem;
4242
}
43+
ol.flow-box > li > a {
44+
width: 6rem;
45+
}
46+
ol.flow-box > li .image {
47+
width: 100%;
48+
height: 6rem;
49+
border-radius: 50%;
50+
background-position: center;
51+
background-size: cover;
52+
}
4353
</style>
4454

4555
<ol class="flow-box">
@@ -49,7 +59,7 @@
4959
class="has-text-centered <%= count ? 'count' : '' %>"
5060
data-count="<%= count %>">
5161
52-
<img class="image has-mb-6" src="<%= logo %>">
62+
<div class="image has-mb-6" style="background-image: url(<%= logo %>)"></div>
5363
5464
<div><%= title %></div>
5565
</a>

0 commit comments

Comments
 (0)