Skip to content

Commit

Permalink
update website css
Browse files Browse the repository at this point in the history
  • Loading branch information
JEFworks committed Dec 8, 2024
1 parent e10c66e commit 2e06214
Show file tree
Hide file tree
Showing 114 changed files with 3,183 additions and 20,243 deletions.
3 changes: 0 additions & 3 deletions _data/carousel.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
images:
- image: /assets/news/bmes_group1.jpg
- image: /assets/news/lab_retreat_09292024.jpg
- image: /assets/news/farewell_gohta_06282024.jpg
- image: /assets/news/lab_bbq_05032024.jpg
- image: /assets/news/csh_single_cell_analysis_2023-2.jpg
- image: /assets/news/lab_retreat_fall2023.gif
- image: /assets/news/farewell_brendan_041423.gif
- image: /assets/news/PTD_2022.jpg
- image: /assets/news/lab_retreat_summer2022.jpg
- image: /assets/news/bioeng22_team.jpeg
- image: /assets/news/lab_event_062022.jpg
- image: /assets/news/lab_hike_D3S6934.jpg

37 changes: 19 additions & 18 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
<footer class="footer">
<footer class="footer" align="center">
<div class="container">
<div class="row" align="center">
<!-- © {{ site.title }} 2015-{{ site.time | date: '%Y' }} --->
<div class="row">
© {{ site.title }} {{ site.time | date: '%Y' }}
<br/>
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br /><br />This work by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Jean Fan and team</span> is licensed under a <br/><a rel="license" href="http://creativecommons.org/licenses/by/4.0/" target="_blank">Creative Commons Attribution 4.0 International License</a><br />
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><br><img alt="Creative Commons License" style="padding:8px" src="https://i.creativecommons.org/l/by/4.0/88x31.png"/></a>
<br/>
This work by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Jean Fan and team</span> is licensed under a <br/><a rel="license" href="http://creativecommons.org/licenses/by/4.0/" target="_blank">Creative Commons Attribution 4.0 International License</a>
</div>
<hr style="height:1px;border-width:0;background-color:#fff;">

<!---
<div class="row"><div align="center">
<p>We are a part of</p>
<div class="col-xs-4 col-sm-4">
Expand All @@ -25,7 +28,6 @@
</div>
</div></div>
<!---
<div class="row"><div align="center">
<div class="col-xs-4 col-sm-4" align="center">
<a href="https://www.cis.jhu.edu/" target="_blank">
Expand All @@ -45,18 +47,17 @@
</div></div>
--->

<hr style="height:1px;border-width:0;background-color:#fff;">
<div class="row"><div align="center">
<br>

<div class="row">
<p>Our work is made possible thanks to the following publicly funded programs</p>
<div class="col-xs-4 col-sm-4">
<img src="/assets/logo/nsf-career.png" width=30%/>
</div>
<div class="col-xs-4 col-sm-4">
<img src="/assets/logo/nih-nigms.png" width=30%/>
</div>
<div class="col-xs-4 col-sm-4">
<img src="/assets/logo/HuBMAP_logo.png" width=60%/>
</div>
</div></div>
<img src="/assets/logo/nsf-career.png" height="100px"/>

<img src="/assets/logo/nih-nigms.png" height="100px"/>

<img src="/assets/logo/HuBMAP_logo.png" height="100px"/>

</div>

</div>
</footer>
6 changes: 2 additions & 4 deletions _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">

<!-- <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
<title>JEFworks Lab - {% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
-->

<title>JEFworks Lab</title>

<meta name="description" content="Welcome to the JEFworks Lab where Prof. Jean Fan and team work on computational software and statistical approaches to address questions in developmental and cancer biology. We are a bioinformatics research lab in the Department of Biomedical Engineering at Johns Hopkins University. We develop methods for analyzing single-cell spatially resolved transcriptomic sequencing and imaging data. We apply these methods to better understand the impact of cellular heterogeneity on cancer pathogenesis and prognosis.">
<meta name="keywords" content="bioinformatics, single cell, spatial transcriptomics, spatially resolved transcriptomics, merfish, computational biology, research lab, JHU research opportunities">

Expand Down
17 changes: 11 additions & 6 deletions _includes/image-gallery.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
.image-gallery {overflow: auto; margin-left: -5%!important;}
.image-gallery li {float: left; display: block; margin: 0 0 1% 1%; width: 32%;}
.image-gallery img {
width: 300px;
height: 300px;
align: center;
object-fit: cover;
border-radius: 9px;
width: 300px;
height: 300px;
align: center;
object-fit: cover;
border-radius: 9px;
}
.image-gallery li a {text-align: center; text-decoration: none!important; color: #777;}
.image-gallery li a img {width: 100%; display: block;}
Expand All @@ -17,8 +17,13 @@
{% for item in site.data.carousel.images %}
<li>
<a href="{{ item.image }}">
<img src="{{ item.image }}"/>
<img src="{{ item.image }}">
</a>
</li>
{% endfor %}
</ul>


<!-- lightbox -->
<script type="text/javascript" src="/js/lightbox.js"></script>
<link rel="stylesheet" href="/css/lightbox.css">
147 changes: 65 additions & 82 deletions _includes/topnav.html
Original file line number Diff line number Diff line change
@@ -1,103 +1,86 @@
<nav class="navbar navbar-default navbar-fixed-top">
<header class="navbar navbar-fixed-top" role="navigation">
<div class="container navbar-container">

<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>

<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar" style="color:#fff">
<i class="fa fa-bars"></i>
</button>

<a class="navbar-brand" href="{{ site.baseurl }}/">
<span><img src="{{site.baseurl}}/img/logonav.png"></span> {{ site.title }}
<span><img src="{{site.baseurl}}/assets/logo/jefworks_logo_white.svg"></span> {{ site.title }}
</a>

</div>
<div id="navbar" class="collapse navbar-collapse">
<ul class="nav navbar-nav navbar-right">
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
About Us
</a>
<ul class="dropdown-menu" role="menu" aria-labelledby="navbarDropdown">
<li {% if page.sectionid=='mission' %} class="active" {% endif %}>
<a class="dropdown-item" href="{{ site.baseurl }}/mission">
Our Mission

<!-- Collect the nav links, forms, and other content for toggling -->
<div id="navbar" class="collapse navbar-collapse navbar-right navbar-main-collapse">
<ul class="nav navbar-nav">

<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
About Us <b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li align="right">
<a href="{{ site.baseurl }}/mission">
Our Mission
</a>
<a href="{{ site.baseurl }}/team">
Meet the Team
</a>
<a href="{{ site.baseurl }}/lab">
Lab Resources
</a>
</li>
</ul>
</li>
<li {% if page.sectionid=='team' %} class="active" {% endif %}>
<a class="dropdown-item" href="{{ site.baseurl }}/team">
Our Team

<li>
<a href="{{ site.baseurl }}/publications">
Publications
</a>
</li>
<li {% if page.sectionid=='lab' %} class="active" {% endif %}>
<a class="dropdown-item" href="{{ site.baseurl }}/lab">
Our Lab
</a>
</li>

<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
Contributions <b class="caret"></b>
</a>
<ul class="dropdown-menu" role="menu" aria-labelledby="navbarDropdown">
<li align="right">
<a class="dropdown-item" href="{{ site.baseurl }}/software">
Software
</a>
<a class="dropdown-item" href="{{ site.baseurl }}/teaching">
Courses
</a>
<a class="dropdown-item" href="{{ site.baseurl }}/talks">
Talks
</a>
</li>
</ul>
</li>

<li {% if page.sectionid=='publications' %} class="active" {% endif %}>
<a href="{{ site.baseurl }}/publications">
Our Publications
</a>
</li>

<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Our Contributions
<li>
<a href="{{ site.baseurl }}/join">
Join
</a>
<ul class="dropdown-menu" role="menu" aria-labelledby="navbarDropdown">
<li {% if page.sectionid=='software' %} class="active" {% endif %}>
<a class="dropdown-item" href="{{ site.baseurl }}/software">
Our Software
</a>
</li>
<li {% if page.sectionid=='teaching' %} class="active" {% endif %}>
<a class="dropdown-item" href="{{ site.baseurl }}/teaching">
Our Courses
</a>
</li>
<li {% if page.sectionid=='talks' %} class="active" {% endif %}>
<a class="dropdown-item" href="{{ site.baseurl }}/talks">
Our Talks
</a>
</li>
</ul>
</li>

<li {% if page.sectionid=='blog' %} class="active" {% endif %}>
<a href="{{ site.posts.first.url | prepend: site.baseurl }}">Blog</a>
</li>

<li {% if page.sectionid=='contact' %} class="active" {% endif %}>
<li>
<a href="{{ site.baseurl }}/contact">
Contact
</a>
</li>

<li style="margin:-13px 0px">
<a href="{{ site.baseurl }}/join">
<button type="button"
{% if page.sectionid=='join' %}
class="btn btn-primary"
{% elsif page.section != 'join' %}
class="btn btn-warning"
{% endif %}
>Join Us</button>
</a>
</li>

</ul>
<!---
<div class="navbar-right">
<form class="navbar-form navbar-left">
<div class="form-group has-feedback">
<input id="search-box" type="text" class="form-control" placeholder="Search...">
<i class="fa fa-search form-control-feedback"></i>
</div>
</form>
</div>
--->

<li>
<a href="{{ site.posts.first.url | prepend: site.baseurl }}">
Blog
</a>
</li>

</ul>
</div>
</div>
</nav>
</div>
</header>

18 changes: 7 additions & 11 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{% if page.image != null %}
<div class='banner' style="
background: url('/img/pattern.png') top left repeat,
url( {{ page.image }}) top center / cover no-repeat;
url( {{ page.image }}) center center / cover no-repeat;
position: relative;
">
{% if page.desc != null %}
Expand All @@ -20,22 +20,18 @@
top: 50%;
transform: translateY(-50%);
">
<div class="container"><div class="row"><div class="col-sm-12">
<h1 class="display-1">{{ page.desc }}</h1>
</div></div></div>
<div class="container center-container">
<div class="col-xs-12 col-md-9">
<h1>{{ page.desc }}</h1>
</div>
</div>
</div>
{% endif %}
</div>
{% endif %}

<div class="page-content">
<div class="wrapper">
<div class="container">
<div class="row"><div class="col-sm-12">
{{ content }}
</div></div>
</div>
</div>
{{ content }}
</div>

{% include footer.html %}
Expand Down
46 changes: 46 additions & 0 deletions _layouts/default2.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<!DOCTYPE html>
<html>

{% include head.html %}

<body>

{% include topnav.html %}

{% if page.image != null %}
<div class='banner' style="
background: url('/img/pattern.png') top left repeat,
url( {{ page.image }}) center center / cover no-repeat;
position: relative;
">
{% if page.desc != null %}
<div align="center" style="color: #ffffff; text-shadow: 0px 0px 8px #000000;
position: absolute;
width: 100%;
top: 50%;
transform: translateY(-50%);
">
<div class="container center-container">
<div class="col-xs-12 col-md-9">
<h1>{{ page.desc }}</h1>
</div>
</div>
</div>
{% endif %}
</div>
{% endif %}

<div class="page-content">
<div class="container page-pad">
<div class="row">
{{ content }}
</div>
</div>
</div>

{% include footer.html %}
{% include js_files.html %}

</body>

</html>
6 changes: 6 additions & 0 deletions _layouts/news.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
layout: default
---

<div class="container">
<div class="row">

<h1>{{ page.date | date: "%b %-d, %Y" }}</h1>
<p>{{ page.title }}</p>
<div id="markdown-content-container">{{ content }}</div>

</div>
</div>
Loading

0 comments on commit 2e06214

Please sign in to comment.