Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions _includes/themes/lab/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@
<li><a href={{ site.institution.url }}>{{ site.institution.name }}</a></li>
</ul>
<ul class="nav navbar-nav navbar-right navbar-small">
<li><a href='https://drive.google.com/drive/u/0/folders/0B543K-QXbp21WERUMkc5SVhjODg'>For Lab Members</a></li>
<li><a href='/about.html#about-the-site'>About the Site</a></li>
<li><a href='/contact.html#join'>Join</a></li>
<li><a href='/contact.html#contact'>Contact</a></li>
Expand Down
Binary file added assets/images/banners/Picture1a.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/banners/Picture4a.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/banners/Picture6a.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/team/undergrads.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 10 additions & 10 deletions assets/themes/lab/css/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ a.off {
.team-photo {
margin: auto;
display: block;
width: 100%;
height: 250px; /*a replace with auto after adding real photo */
width: 50%;
height: auto; /*a replace with auto after adding real photo */
vertical-align: middle;
}

Expand Down Expand Up @@ -218,10 +218,10 @@ strong {
opacity: 1;
}
.carousel-fade .item {
-moz-transition: opacity ease-in-out .7s;
-o-transition: opacity ease-in-out .7s;
-webkit-transition: opacity ease-in-out .7s;
transition: opacity ease-in-out .7s;
-moz-transition: opacity ease-in-out 3s;
-o-transition: opacity ease-in-out 3s;
-webkit-transition: opacity ease-in-out 3s;
transition: opacity ease-in-out 3s;
left: 0 !important;
opacity: 0;
top:0;
Expand All @@ -236,10 +236,10 @@ strong {
}
.carousel-fade .item.active {
opacity: 1;
-moz-transition: opacity ease-in-out .7s;
-o-transition: opacity ease-in-out .7s;
-webkit-transition: opacity ease-in-out .7s;
transition: opacity ease-in-out .7s;
-moz-transition: opacity ease-in-out 3s;
-o-transition: opacity ease-in-out 3s;
-webkit-transition: opacity ease-in-out 3s;
transition: opacity ease-in-out 3s;
z-index:2;
}

Expand Down
6 changes: 3 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
<!-- See https://bootsnipp.com/tags/carousel for possible approaches -->
<div class="carousel-inner">
<div class="active item">
<img src="/assets/themes/lab/images/banner/pab-30min.png" width='1200px' alt="">
<img src="/assets/images/banners/Picture1a.png" width='1200px' alt="">
</div>
<div class="item">
<img src="/assets/themes/lab/images/banner/hsp104-30min.png" width='1200px' alt="">
<img src="/assets/images/banners/Picture4a.png" width='1200px' alt="">
</div>
<div class="item">
<img src="/assets/themes/lab/images/banner/yeast-dic.png" width='1200px' alt="">
<img src="/assets/images/banners/Picture6a.png" width='1200px' alt="">
</div>
</div>
<!-- Carousel nav -->
Expand Down
18 changes: 12 additions & 6 deletions team/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,20 @@
navorder: 2

undergrads:
- Over Acuna
- Chelsy Fraga
- Kevin Garcia
- Nathaline Germain
- Tiana Lanier
- Abigail Martinez
- Aleymi Perez
- Javier Perez
- Vanessa Rodriguez
- Diego Sanchez
- Ilan Garcia
- Sharieka Savage
- Abigail Martinez
- Javier Perez
- Amelia Vega
- Kathleen Won
- Salman Zubair
- Deborah Pulido

---
{% include JB/setup %}
Expand Down Expand Up @@ -63,10 +69,10 @@
<div class="row">
<div class="col-md-12" align="center">
<!-- team-photo definition in assets/themes/lab/css/style.scss -->
<img class="team-photo" src="/assets/images/placeholder.png"/>
<img class="team-photo" src="/assets/images/team/undergrads.png"/>
</div>
</div>
From left to right: {{ page.undergrads | join: ", "}}.
Undergraduate research assistants (in alphabetical order): {{ page.undergrads | join: ", "}}.

<div class="bigspacer"></div>
<hr/>
Expand Down