Skip to content

Commit

Permalink
Scicop Demo conflicts fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
NanaharaShuya committed Mar 8, 2024
2 parents b56a6d6 + a0b3186 commit 65bc4ad
Show file tree
Hide file tree
Showing 2 changed files with 96 additions and 0 deletions.
81 changes: 81 additions & 0 deletions _includes/team-LAPTOP-960C2HBK.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
<!-- Team Section -->
<section id="team" class="bg-light-gray">
<div class="container">
<div class="row">
<div class="col-lg-12 text-center">
<h2 class="section-heading">Team</h2>
<p class="small text-muted"> The AI CrossX team, based at <a href="https://hic.zju.edu.cn/hicenglish/main.htm" target="_blank"> Hangzhou Innovation Center of Zhejiang University </a>,
is composed of cross-disciplinary members from <a href="http://www.en.cs.zju.edu.cn/" target="_blank">
College of Computer Science of Zhejiang University </a>,
Institute for Intelligent Bio/Chem Manufacturing of Hangzhou Innovation Center, and College of Pharmacy Science of Zhejiang University.
</p>
<div class="team-member">
<a href="https://person.zju.edu.cn/en/huajun">
<img src="img/team/huajun.jpg" class="img-responsive img-circle" alt="" width='200' height='200'>
<h4 class="col-lg-12">Prof. Huajun Chen</h4>
</a>
<p class="small"> Full Professor, College of Computer Science and Technology, Zhejiang University <br>
Director, AI CrossX Lab, Hangzhou Innovation Center, Zhejiang University <br>
</p>
</div>
<!-- <h3 class="section-subheading text-muted">.</h3>-->
</div>
</div>
<div class="row">
{% for member in site.people-pi %}
<div class="col-sm-4-p">
<div class="team-member">
<a href="{{ member.url }}">
<img src="img/team/{{ member.pic }}.jpg" class="img-responsive img-circle" alt="" width='180' height='180'>
<h5>{{ member.name }}</h5>
</a>
<p class="small">{{ member.position }}</p>
</div>
</div>
{% endfor %}
</div>
<div class="row">
<div class="col-lg-8 col-lg-offset-2 text-center">
<h4>Students</h4>
</div>
</div>
<div class="row">
{% for member in site.people-student%}
<div class="col-sm-4-s">
<div class="team-member">
<img src="img/team/{{ member.pic }}.jpg" class="img-responsive img-circle" alt="" width='160' height='160'>
<h5>{{ member.name }}</h5>
</a>
<p class="small">{{ member.position }}</p>
</div>
</div>
{% endfor %}
</div>
<div class="row">
<div class="col-lg-8 col-lg-offset-2 text-center">
<h4>Research Assistants</h4>
</div>
</div>
<div class="row">
{% for member in site.people-ra %}
<div class="col-sm-4-s">
<div class="team-member">
<img src="img/team/{{ member.pic }}.jpg" class="img-responsive img-circle" alt="" width='160' height='160'>
<h5>{{ member.name }}</h5>
<p class="small">{{ member.position }}</p>
<!-- <ul class="list-inline social-buttons">
{% for network in member.social %}
<li>
<a href="{{ network.url }}">
<i class="fa fa-{{ network.title }}"></i>
</a>
</li>
{% endfor %}
-->
</ul>
</div>
</div>
{% endfor %}
</div>
</div>
</section>
15 changes: 15 additions & 0 deletions _posts/2014-07-18-project-2.markdown
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
title: chatProtein
subtitle: Large Protein Language Model
layout: default
modal-id: 2
date: 2014-07-17
img: escape.png
thumbnail: escape-thumbnail.png
alt: image-alt
project-date: April 2014
client: Start Bootstrap
category: Web Development
description: Lorem ipsum dolor sit amet, usu cu alterum nominavi lobortis. At duo novum diceret. Tantas apeirian vix et, usu sanctus postulant inciderint ut, populo diceret necessitatibus in vim. Cu eum dicam feugiat noluisse.

---

0 comments on commit 65bc4ad

Please sign in to comment.