Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add myself to lab members page #150

Merged
merged 4 commits into from
May 7, 2024
Merged

Add myself to lab members page #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73d801a
add myself
homework36 May 7, 2024
a09c8fe
resolve merge conflict
homework36 May 7, 2024
cd9aa4a
update image placeholder
homework36 May 7, 2024
e03dbd8
fix merge conflict
homework36 May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lab_members/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ <h3 class="people-title"> PhD </h3>
<li><a href="../lab_members/phd/kun_fang/">Kun Fang</a><a
href="../lab_members/phd/kun_fang/"><img class="member_photo_list"
src="../assets/lab_members/thumbnail/kun_fang.jpg" /></a></li>
<li><a href="../lab_members/phd/hanwen_zhang/">Hanwen Zhang</a><a
href="../lab_members/phd/hanwen_zhang/"><img class="member_photo_list"
src="../assets/lab_members/thumbnail/placeholder.png" /></a></li>
</ul>
<h3 class="people-title"> Masters </h3>
<ul class="member-list">
Expand Down
118 changes: 118 additions & 0 deletions lab_members/phd/hanwen_zhang/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
<!DOCTYPE html>
<html lang="en-us">
<head>
<link href="http://gmpg.org/xfn/11" rel="profile">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<!-- Enable responsiveness on mobile devices-->
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
<meta name="theme-color" content="#1DB2E9">
<!-- Windows Phone -->
<meta name="msapplication-navbutton-color" content="#1DB2E9">
<!-- iOS Safari -->
<meta name="apple-mobile-web-app-status-bar-style" content="#1DB2E9">
<title>
Kyrie Ekaterina Bouressa &middot; DDMAL
</title>
<!-- CSS -->
<link rel="stylesheet" href="../../../assets/css/main.css" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=PT+Serif:400,400italic,700%7CPT+Sans:400">
<link href="https://fonts.googleapis.com/css?family=Montserrat|Raleway:300,400,500" rel="stylesheet">
<!-- Icons -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../../public/mcgill_crest.png">
<link rel="shortcut icon" href="../../../public/mcgill_crest.png">
<!-- RSS -->
<link rel="alternate" type="application/rss+xml" title="RSS" href="/atom.xml">
</head>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<nav class="navbar navbar-light fixed-top navbar-expand-lg bg-white">
<a class="navbar-brand" href="../../../">DDMAL</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav ml-auto" id="nav-items">
<li class="nav-item">
<a class="nav-link" href="../../../">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item">
<a class="nav-link" href="../../../lab_members/">Lab Members</a>
</li>
<li class="dropdown">
<a class="dropdown-toggle" role="button" data-toggle="dropdown" href="#">Activities<span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li><a href='../../../activities/media/' target='_top' >Media</a></li>
<li><a href='../../../activities/posters/' target='_top' >Posters</a></li>
<li><a href='../../../activities/presentations/' target='_top' >Presentations</a></li>
<li><a href='../../../activities/publications/' target='_top' >Publications</a></li>
</ul>
</li>
<li class="nav-item">
<a class="nav-link" href="../../../research/">Research</a>
</li>
<li class="nav-item">
<a class="nav-link" href="../../../software/">Software</a>
</li>
<li class="nav-item">
<a class="nav-link" href="../../../events/">Events</a>
</li>
<li class="nav-item">
<a class="nav-link" href="../../../resources/">Resources</a>
</li>
</ul>
</div>
</nav>
<body id ="Site" class='layout-reverse theme-base-db sidebar-overlay'>
<!-- Wrap is the content to shift when toggling the sidebar. We wrap the
content to avoid any CSS collisions with our real content. -->
<div class="wrap">
<div class="container content">
<div class="member-page container lab_member">
<div class="logo_header">
<h1 style="text-align: left;" class="page-title">Hanwen Zhang</h1>
</div>
<div class="img-wrap">
<img class="profile-photo" src="../../../assets/lab_members/placeholder.png"/>
<div class="social-links">
<a class="social__link" target="_blank" rel="noopener noreferrer" href="https://github.com/homework36">
<svg class="social__icon" viewBox="0 0 18 18" width="22px" height="22px">
<path d="M7.999,0.431c-4.285,0-7.76,3.474-7.76,7.761 c0,3.428,2.223,6.337,5.307,7.363c0.388,0.071,0.53-0.168,0.53-0.374c0-0.184-0.007-0.672-0.01-1.32 c-2.159,0.469-2.614-1.04-2.614-1.04c-0.353-0.896-0.862-1.135-0.862-1.135c-0.705-0.481,0.053-0.472,0.053-0.472 c0.779,0.055,1.189,0.8,1.189,0.8c0.692,1.186,1.816,0.843,2.258,0.645c0.071-0.502,0.271-0.843,0.493-1.037 C4.86,11.425,3.049,10.76,3.049,7.786c0-0.847,0.302-1.54,0.799-2.082C3.768,5.507,3.501,4.718,3.924,3.65 c0,0,0.652-0.209,2.134,0.796C6.677,4.273,7.34,4.187,8,4.184c0.659,0.003,1.323,0.089,1.943,0.261 c1.482-1.004,2.132-0.796,2.132-0.796c0.423,1.068,0.157,1.857,0.077,2.054c0.497,0.542,0.798,1.235,0.798,2.082 c0,2.981-1.814,3.637-3.543,3.829c0.279,0.24,0.527,0.713,0.527,1.437c0,1.037-0.01,1.874-0.01,2.129 c0,0.208,0.14,0.449,0.534,0.373c3.081-1.028,5.302-3.935,5.302-7.362C15.76,3.906,12.285,0.431,7.999,0.431z"/>
</svg>
</a>
</div>
</div>
<div class="lab_member_flex">
<div class="current-focus">
<p><i>PhD Student in Music Technology</i></p>
</div>
<div class=""></div>
<div class=""></div>
</div>

</div>
</div>
<br>
<br>
</div>
</div>
<label for="sidebar-checkbox" class="sidebar-toggle"></label>
<footer id="sticky">
<div class="footer-img-wrap">
<img class="mcgill-img-footer" src="../../../assets/schulich_logo.png" alt="">
<img class="ddmal-img-footer" src="../../../assets/Ddmal_logo_transp-bg_no-border_1600w.png" alt="">
</div>
</footer>
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.6/umd/popper.min.js" integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut" crossorigin="anonymous"></script>
<script src="../../../js/bootstrap.js"></script>
<script type="text/javascript">
$(document).ready(function () {
var url = window.location;
$('ul.navbar-nav a[href="'+ url +'"]').parent().addClass('active');
$('ul.navbar-nav a').filter(function() {
return this.href == url;
}).parent().addClass('active');
});
</script>
</body>
</html>
Loading