Skip to content

Commit 2c50424

Browse files
liuyxppliuyxpp
committed
Refractor Homepage and Group page to split data into YAML files.
1 parent 999119e commit 2c50424

32 files changed

+1327
-2633
lines changed

‎_config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
title: Yi-Xin Liu
1+
title: Polyorder
22
description: "Polyorder Lab at Fudan University."
33
url: //www.yxliu.group
44
urlimg: '/images/'

‎_data/group.yml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
principle_investigator:
2+
- name: "Prof. Yi-Xin Liu"
3+
image: "images/me3.jpg"
4+
bio: "Dr. Yi-Xin Liu is currently an associated professor at Fudan University."
5+
bio_link: "/about/"
6+
7+
graduate_students:
8+
- name: "Mr. Yu-Chen Zhang"
9+
period: "Sep. 2022 - Present"
10+
description: "Yu-Chen Zhang is working on developing novel algorithms for computing scattering behaviors of polymer assemblies and nanoparticle clusters. He is now pursuing a MSc."
11+
12+
- name: "Ms. Wei-Ling Huang"
13+
period: "Sep. 2022 - Present"
14+
description: "Wei-Ling Huang is working on the phase separation kinetics of polymer thin films under solvent evaporation. She is now pursuing a MSc."
15+
16+
- name: "Mr. Jun-Yang Liu"
17+
period: "Sep. 2024 - Present"
18+
description: "Jun-Yang Liu is developing highly efficient algorithms for solving SCFT equations of block copolymers. He is now pursuing a MSc."
19+
20+
undergraduate_students:
21+
- name: "Ms. Xi-Yue Zhang"
22+
period: "Mar. 2024 - Present"
23+
description: "Xi-Yue Zhang is working on a Xi-Yuan Project (2021) to develop **Machine Learning** methods for predicting the phase behavior of block copolymers. She is now pursuing a BSc."
24+
25+
- name: "Mr. Shuai Tian"
26+
description: "Shuai Tian's project is yet to be determined. He is now pursuing a BSc."
27+
28+
alumni:
29+
- name: "Mr. Xu-Chen Gan"
30+
period: "Mar. 2021 - Jun. 2022"
31+
description: "Xu-Chen Gan ([github](https://github.com/vvmbvy)) was working on a *Xi-Yuan Project (2021)* to develop efficient and reliable algorithms for computing phase diagrams of polymer blends. He graduated at 2022 with BSc. He is now pursuing a PhD at UMass."
32+
33+
- name: "Dr. Jun-Qing Song"
34+
period: "Sep. 2013 - Jun. 2018"
35+
description: "Dr. Jun-Qing Song graduated at 2018 with PhD. He is working in a government department at Guangxi Province (as of 2018)."

‎_data/news.yml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
- title: "YC Zhang Publishes in Communication Materials"
2+
date: 2024-12-18
3+
description: "Automated chain architecture screening for discovery of block copolymer assembly with graph enhanced self-consistent field theory"
4+
url: "https://rdcu.be/d334W"
5+
image: "/images/news/toc-small-cm-2024.png"
6+
category: publication
7+
8+
- title: "WL Huang Publishes in Polymer Bulletin"
9+
date: 2024-04-07
10+
description: "Teaching of modern polymer physics: phase equilibrium of polymer blends"
11+
url: "https://www.gfztb.com/zh/article/doi/10.14028/j.cnki.1003-3726.2024.23.377/"
12+
image: "/images/news/toc-small-pb-2024.png"
13+
category: publication
14+
15+
- title: "YC Zhang Publishes in Chinese Journal of Polymer Science"
16+
date: 2024-02-17
17+
description: "Automated Identification of Ordered Phases for Simulation Studies of Block Copolymers"
18+
url: "https://doi.org/10.1007/s10118-024-3084-x"
19+
image: "/images/news/toc-small-cjps-2024.png"
20+
category: publication

‎_includes/news-list.html

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<div class="news-list">
2+
{% assign sorted_news = site.data.news | sort: 'date' | reverse %}
3+
{% for item in sorted_news %}
4+
<article class="news-item">
5+
<div class="news-content">
6+
<h3>{{ item.title }}</h3>
7+
<p class="news-meta">{{ item.date | date: "%Y.%m.%d" }} | {{ item.category | capitalize }}</p>
8+
<p>{{ item.description }}</p>
9+
<a href="{{ item.url }}" class="read-more">Read more</a>
10+
</div>
11+
{% if item.image %}
12+
<div class="news-image">
13+
<img src="{{ item.image }}" alt="{{ item.title }}">
14+
</div>
15+
{% endif %}
16+
</article>
17+
{% endfor %}
18+
</div>

‎_includes/scripts.html

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818

1919
<script src="{{ site.url }}/assets/js/scripts.min.js"></script>
2020

21+
<!-- Nav Scroll JavaScript -->
22+
<script src="{{ site.url }}/assets/js/nav-scroll.js"></script>
23+
2124
{% if site.google_analytics %}
2225
<!-- Asynchronous Google Analytics snippet -->
2326
<script>

‎_layouts/home.html

+50-95
Original file line numberDiff line numberDiff line change
@@ -13,109 +13,64 @@
1313

1414
{% include nav_cleanblog.html %}
1515

16-
{% include header-home.html %}
17-
1816
<div id="main" role="main">
19-
20-
{% comment %}
21-
*
22-
* First check, if widget is empty or not by checking if there is a title
23-
*
24-
{% endcomment %}
25-
<div class="row t60 widget">
26-
{% if page.widget1.title %}
27-
{% include frontpage-widget.html widget=page.widget1 %}
28-
{% endif %}
29-
30-
31-
{% if page.widget2.title %}
32-
{% include frontpage-widget.html widget=page.widget2 %}
33-
{% endif %}
34-
35-
36-
{% if page.widget3.title %}
37-
{% include frontpage-widget.html widget=page.widget3 %}
38-
{% endif %}
39-
</div><!-- /.row -->
40-
41-
<div class="row t30 b20 homepage">
42-
<div class="small-12 columns">
43-
<h2>News</h2>
44-
</div>
45-
</div>
46-
47-
<div class="row announcement-content">
48-
<div class="medium-6 columns">
49-
<!--
50-
<p>
51-
诚招博士/博士后：欢迎对软物质物理、高分子场论、数值计算、机器学习、Julia或Python等感兴趣的同学/博士加盟本课题组。请直接发简历至lyx@fudan.edu.cn咨询。
52-
</p>-->
53-
<p>
54-
2024.12.18 YC Zhang published a paper on <a href="https://rdcu.be/d334W">Communication Materials</a> on Automated chain architecture screening for discovery of block copolymer assembly with graph enhanced self-consistent field theory. Congratulations! 🎉🎉🎉
55-
</p>
56-
<p>
57-
2024.4.7 WL Huang published a paper on <a href="https://www.gfztb.com/zh/article/doi/10.14028/j.cnki.1003-3726.2024.23.377/">Polymer Bulletin （《高分子通报》）</a> on the teaching of modern polymer physics: phase equilibrium of polymer blends. Congratulations! 🎉🎉🎉
58-
</p>
59-
<p>
60-
2024.2.17 YC Zhang published a paper on <a href="https://doi.org/10.1007/s10118-024-3084-x">Chinese Journal of Polymer Science</a> on Automated Identification of Ordered Phases for Simulation Studies of Block Copolymers. Congratulations! 🎉🎉🎉
61-
</p>
62-
</div>
63-
</div>
64-
65-
{% comment %}
66-
*
67-
* First check, if there are any posts at all
68-
*
69-
{% endcomment %}
70-
71-
{% unless site.posts == empty %}
72-
<div class="row t30 b20 homepage">
73-
<div class="small-12 columns">
74-
{% for post in site.posts limit:1 %}
75-
{% if post.image.homepage %}
76-
<p>
77-
<a href="{{ site.baseurl }}{{ post.url }}" title="{{ post.title | escape_once }}">
78-
<img width="970" src="{{ site.urlimg }}{{ post.image.homepage }}" alt="{{ page.title | escape_once }}" />
79-
</a>
80-
</p>
81-
82-
{% if post.image.caption_url and post.image.caption %}
83-
<p class="text-right caption">
84-
<a href="{{ post.image.caption_url }}">{{ post.image.caption }}</a>
85-
</p>
86-
{% endif %}
87-
{% else %}
88-
<h2>{{ site.data.language.new_blog_entries }}</h2>
89-
{% endif %}
90-
{% endfor %}
91-
</div>
17+
<!-- Hero Section -->
18+
<section class="hero-section">
19+
<div class="hero-content">
20+
<h1 class="hero-title">Welcome to Polyorder Lab @Fudan</h1>
21+
<p class="hero-subtitle">Exploring the Frontiers of Polymer Physics and Computational Materials Science</p>
22+
<div class="hero-cta">
23+
<a href="/research" class="button primary">Our Research</a>
24+
<a href="/publications" class="button secondary">Recent Publications</a>
25+
</div>
9226
</div>
93-
94-
95-
<div class="row blog-articles">
96-
<div class="medium-6 columns">
97-
{% for post in site.posts limit:1 %}
98-
{% if post.subheadline %}<p class="subheadline">{{ post.subheadline }}</p>{% endif %}
99-
<h2>{% include snippets/post_link.html post=post %}</h2>
100-
<p>
101-
{% if post.description %}{{ post.description | strip_html | escape }}{% elsif post.teaser %}{{ post.teaser | strip_html | escape }}{% endif %}
102-
<a href="{{ site.baseurl }}{{ post.url }}" title="{{ site.data.language.read }} {{ post.title | escape_once }}"><strong>{{ site.data.language.read_more }}</strong></a>
103-
</p>
104-
{% endfor %}
27+
</section>
28+
29+
<!-- Featured Content Section -->
30+
<section class="featured-section">
31+
<div class="grid-container">
32+
<div class="featured-card">
33+
<h2>Latest Blogs</h2>
34+
<p>Read our latest blog posts about polymer physics, scientific computing, and software development.</p>
35+
<a href="/blog" class="button">Learn More</a>
36+
</div>
37+
38+
<div class="featured-card">
39+
<h2>Join Our Team</h2>
40+
<p>We're always looking for talented researchers to join our group.</p>
41+
<a href="/group" class="button">Opportunities</a>
42+
</div>
43+
</div>
44+
</section>
45+
46+
<!-- News Section -->
47+
<section class="news-section">
48+
<h2 class="section-title">Latest News</h2>
49+
<div class="news-grid">
50+
{% assign sorted_news = site.data.news | sort: 'date' | reverse %}
51+
{% for item in sorted_news limit:3 %}
52+
<article class="news-card">
53+
<div class="news-content">
54+
<h3>{{ item.title }}</h3>
55+
<p class="news-meta">{{ item.date | date: "%Y.%m.%d" }} | {{ item.category | capitalize }}</p>
56+
<p>{{ item.description }}</p>
57+
<a href="{{ item.url }}" class="read-more">Read more</a>
10558
</div>
106-
107-
<div class="medium-6 columns">
108-
<h4>{{ site.data.language.more_articles }}</h4>
109-
{% assign moreLink = site.baseurl | append: '/blog/' %}
110-
{% include list-posts.html entries='3' offset='1' more=moreLink %}
59+
</article>
60+
{% endfor %}
61+
62+
<!-- More News Card -->
63+
<article class="news-card more-news">
64+
<div class="news-content">
65+
<a href="/news" class="read-more">View All News</a>
11166
</div>
67+
</article>
11268
</div>
113-
{% endunless %}
114-
69+
</section>
11570

11671
{% comment %}
11772
*
118-
* Finally, if there is content, spit it out.
73+
* Main content section
11974
*
12075
{% endcomment %}
12176

‎_sass/_elements.scss

+23-12
Original file line numberDiff line numberDiff line change
@@ -122,15 +122,15 @@ svg:not(:root) {
122122
}
123123
}
124124
.btn-success {
125-
background-color: $success;
125+
background-color: $success-color;
126126
color: $white;
127-
border-color: $success;
127+
border-color: $success-color;
128128
&:visited {
129129
color: $white;
130130
}
131131
&:hover {
132132
background-color: $white;
133-
color: $success;
133+
color: $success-color;
134134
}
135135
}
136136
.btn-warning {
@@ -202,8 +202,8 @@ ul#markdown-toc {
202202

203203
.border-dotted {
204204
border: 1px dotted $grey-5;
205-
padding: rem-calc(20);
206-
border-radius: $global-radius;
205+
padding: 1.25rem;
206+
border-radius: 4px;
207207
}
208208

209209

@@ -243,18 +243,26 @@ ul#markdown-toc {
243243
border-bottom: 1px solid #fff;
244244
}
245245
&.terminal {
246-
@include alert-style($terminal-color);
246+
background-color: $terminal-color;
247+
border-color: darken($terminal-color, 10%);
248+
color: #fff;
247249
font-family: $font-family-monospace;
248250
}
249251
&.text {
250-
@include alert-style($grey-2);
252+
background-color: $grey-2;
253+
border-color: darken($grey-2, 10%);
254+
color: #000;
251255
text-shadow: none;
252256
}
253257
&.tip {
254-
@include alert-style($info-color);
258+
background-color: $info-color;
259+
border-color: darken($info-color, 10%);
260+
color: #fff;
255261
}
256262
&.todo {
257-
@include alert-style($todo-color);
263+
background-color: $todo-color;
264+
border-color: darken($todo-color, 10%);
265+
color: #000;
258266
text-shadow: none;
259267
}
260268
&.alert {
@@ -297,7 +305,7 @@ ul#markdown-toc {
297305
}
298306

299307
@media print {
300-
border: 3px solid $aluminum !important;
308+
border: 3px solid #999 !important;
301309
}
302310
}
303311

@@ -379,12 +387,15 @@ button, .button {
379387
$tag-size-base: 12;
380388
$tag-size-count: 10;
381389
$tag-size-height-max: $tag-size-base + $tag-size-count * $tag-size-count / $tag-size-count;
382-
@include label($bg: $grey-11, $radius: true);
390+
display: inline-block;
391+
padding: 0.25em 0.5em;
392+
background-color: $grey-11;
393+
border-radius: 4px;
383394
font-weight: bold;
384395
font-size: rem-calc($tag-size-base + 0 * 0 / $tag-size-count);
385396
margin-top: rem-calc(($tag-size-height-max - $tag-size-base) / 2);
386397
margin-bottom: rem-calc(($tag-size-height-max - $tag-size-base) / 2);
387-
background-color: $body-bg;
398+
background-color: #fff;
388399
color: $text-color;
389400
border: 2px solid $grey-11;
390401
&:visited {

0 commit comments

Comments
 (0)