Skip to content

Commit

Permalink
Merge pull request #58 from 18010032728/idec2024
Browse files Browse the repository at this point in the history 
Idec2024
  • Loading branch information
@18010032728
18010032728 authored Mar 29, 2024
2 parents f93ba9f + 7440da2 commit 4d7a3e7
Show file tree
Hide file tree
Showing 16 changed files with 438 additions and 674 deletions.
57 changes: 33 additions & 24 deletions css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,14 @@ ol.text-list li ul li::marker {

/* JUMBOTRON (Home)
–––––––––––––––––––––––––––––––––––––––––––––––––– */
.title-jumbo {
background-image: url("../img/picture1.jpg");
.title-jumbo {
background-image: url("../img/background.jpg");
background-size: 100%;
background-repeat: no-repeat;
}
.text-left {
color: #f0f0f0;
}

.jumbo-quote {
background-color: rgba(233, 236, 239, 0.6);
Expand All @@ -106,24 +109,24 @@ ol.text-list li ul li::marker {
}

@media (max-width: 1024px) {
.title-jumbo {
background-image: url("../img/picture1.jpg");
.title-jumbo {
background-image: url("../img/background.jpg");
background-size: 130%;
background-repeat: no-repeat;
background-position: top center;
}
}
@media (max-width: 980px) {
.title-jumbo {
background-image: url("../img/picture_phone.jpg");
background-size: 100%;
background-repeat: no-repeat;
}
.title-jumbo {
background-image: url("../img/background-2.jpg");
background-size: 100%;
background-repeat: no-repeat;
}
}

@media (max-width: 500px) {
.title-jumbo {
background-image: url("../img/picture_phone.jpg");
.title-jumbo {
background-image: url("../img/background-2.jpg");
background-size: 100%;
background-repeat: no-repeat;
}
Expand All @@ -138,7 +141,6 @@ ol.text-list li ul li::marker {
padding: 5px;
margin: 2px;
}

}
/* JUMBOTRON BUTTONS (Home)
–––––––––––––––––––––––––––––––––––––––––––––––––– */
Expand Down Expand Up @@ -746,7 +748,7 @@ ol.text-list li ul li::marker {
.prize-content h3 {
position: relative;
top: 0.8em;
font-weight: bold ;
font-weight: bold;
}

.prize-content h3 span {
Expand All @@ -773,25 +775,23 @@ ol.text-list li ul li::marker {
color: var(--idec_primary_green);
}


@media (max-width: 768px) {

h3 {
font-size: 100%;
}

.prize-content > div {
border: 2px dashed #2a206a;
border-radius: 4em;
}
border: 2px dashed #2a206a;
border-radius: 4em;
}

.prize-content h3 {
top: 1.2em;
}
.prize-content div div p {
font-size: 1em;
margin-bottom: 1em;
}
top: 1.2em;
}
.prize-content div div p {
font-size: 1em;
margin-bottom: 1em;
}
}

/* BLOCKQUOTES (EBB Page)
Expand All @@ -808,3 +808,12 @@ ol.text-list li ul li::marker {
text-decoration: underline !important;
cursor: pointer !important;
}

/*
–––––––––––––––––––––––––––––––––––––––––––––––––– */
.imageList {
white-space: nowrap;
img {
margin-right: 5px;
}
}
Binary file added img/background-2.jpg
View file
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 img/background.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
116 changes: 37 additions & 79 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@

<body>
<!-- NEB advert for postdocs -->
<div class="ad-banner fixed-bottom neb-colors text-center">
<!-- <div class="ad-banner fixed-bottom neb-colors text-center">
<div></div>
<div></div>
<div class="ad-banner-text"> Our sponsor New England Biolabs® is inviting applicants for Post-Doctoral
Fellowships!<span class="responsive-nbsp">&nbsp;</span> <br class="responsive-br" /><a
href="assests/Post-Doc Ad 8.5x11.pdf" target="_blank"><button class="info-btn">Learn more</button></a> </div>
<div> <button type="button" class="ml-2 mb-1 mr-3 close" aria-label="Close" onclick="dismissBanner(this)"> <span
aria-hidden="true"><span class="ad-timer"></span> &times;</span> </button> </div>
</div>
</div> -->
<nav class="navbar navbar-expand-lg navbar-light bg-light"> <a class="navbar-brand" href="index.html"><img
src="img/logo.png" alt="idec-logo" style="width: 40px" /></a> <button class="navbar-toggler" type="button"
data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
Expand All @@ -67,15 +67,15 @@
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="color: #2a206a"> Registration </a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown"> <a class="dropdown-item"
href="pages/details_for_registration.html" style="color: #2a206a">Details you need</a>
<div class="dropdown-divider"></div> <a class="dropdown-item" href="https://reg.idec.io/"
style="color: #2a206a">Register for iDEC 2023</a>
<div class="dropdown-divider"></div> <a class="dropdown-item" href="pages/registration.html"
style="color: #2a206a">Register for iDEC 2024</a>
</div>
</li>
<li class="nav-item"> <a class="nav-link" href="pages/about_us.html" style="color: #2a206a">About us</a> </li>
<li class="nav-item"> <a class="nav-link" href="pages/calendar.html" style="color: #2a206a">iDEC calendar</a>
</li>
<li class="nav-item"> <a class="nav-link" href="pages/results2023.html" style="color: #2a206a;">Results</a>
</li>
<!-- <li class="nav-item"> <a class="nav-link" href="pages/results2023.html" style="color: #2a206a;">Results</a>
</li> -->
<li class="nav-item"> <a class="nav-link" href="https://wiki.idec.io/resources/introduction/" target="_blank"
style="color: #2a206a">Resources</a> </li>
<li class="nav-item"> <a class="nav-link" href="https://arxiv.idec.io/" target="_blank"
Expand All @@ -90,8 +90,10 @@
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="color: #2a206a"> History </a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown"> <a class="dropdown-item"
href="https://2021.idec.io" style="color: #2a206a">iDEC 2021</a>
<div class="dropdown-divider"></div> <a class="dropdown-item" href="https://idechq.github.io/2022-idec-home/"
<div class="dropdown-divider"></div> <a class="dropdown-item" href="https://2022.idec.io"
style="color: #2a206a">iDEC 2022</a>
<div class="dropdown-divider"></div> <a class="dropdown-item"
href="https://idechq.github.io/2023-idec-home/" style="color: #2a206a">iDEC 2023</a>
</div>
</li>
</ul>
Expand All @@ -108,101 +110,51 @@
<h1 class="text-left"><strong>International </strong></h1>
<h1 class="text-left"><strong>Directed Evolution</strong></h1>
<h1 class="text-left"><strong>Competition</strong></h1>
<h1 class="text-left"><strong>2023</strong></h1>
<h1 class="text-left"><strong>2024·Cambridge</strong></h1>
<p class="nsp">&nbsp;</p>
<h4 class="text-center text-muted"> <span class="jumbo-quote">This is the way the life begins. Not with a
plan but a competition. - Dr. Martin Borch Jensen</span> </h4>
<p class="nsp">&nbsp;</p>
<p class="text-center"> <a class="btn btn-green btn-outline-primary font-weight-bolder btn-huge"
href="https://reg.idec.io/" role="button">Register Now</a><span class="btn-divider"></span><a
class="btn btn-outline-primary font-weight-bolder btn-huge"
href="pages/details_for_registration.html" role="button">Registration Details</a> </p>
class="btn btn-outline-primary font-weight-bolder btn-huge" href="pages/details_for_registration.html"
role="button">Registration Details</a> </p>
</div>
</div>
</div>
</div>
</header>
<section style="padding-bottom: 1em">
<section style="padding-bottom: 1em">
<div class="container">
<div class="row">
<div class="col-sm-12 mt-4 mb-2 text-center">
<h2>News and Announcements</h2>
</div>
</div>

<div class="row">
<div class="col-xs-12 col-sm-6 col-md-6 col-lg-4 mt-2 mb-2">
<div class="card">
<div class="card-body">
<h5 class="card-title"> <a class="news-card-hyperlink" href="pages/news.html#news18">iDEC Results 2023</a>
</h5>
<p class="card-subtitle text-muted mt-1 mb-1">Oct 30 2023</p>
<p class="card-text" style="margin-bottom: 0">Congratulations! Click <a href="https://idec.io/pages/results2023.html" target="_blank">results</a> to view nominees and winners</p>
<p> <a href="pages/news.html#news18">Read more »</a> </p>
</div>
</div>
</div>
<div class="col-xs-12 col-sm-6 col-md-6 col-lg-4 mt-2 mb-2">
<div class="card">
<div class="card-body">
<h5 class="card-title"> <a class="news-card-hyperlink" href="pages/news.html#news17">Free bus tickets for
on-site teams</a>
</h5>
<p class="card-subtitle text-muted mt-1 mb-1">Oct 25 2023</p>
<p class="card-text" style="margin-bottom: 0">Teams visiting Cambridge will receive group day tickets for
bus</p>
<p> <a href="pages/news.html#news17">Read more »</a> </p>
</div>
</div>
</div>
<div class="col-xs-12 col-sm-6 col-md-6 col-lg-4 mt-2 mb-2">
<div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 mt-2 mb-2">
<div class="card">
<div class="card-body">
<h5 class="card-title"> <a class="news-card-hyperlink" href="pages/news.html#news16">iDEC 2023 Medals
Arrive in Cambridge</a>
<h5 class="card-title"> <a class="news-card-hyperlink" href="pages/news.html#news2">Registeration fee for
iDEC 2024</a>
</h5>
<p class="card-subtitle text-muted mt-1 mb-1">Oct 25 2023</p>
<p class="card-text" style="margin-bottom: 0">Every medal is one of a kind!</p>
<p> <a href="pages/news.html#news16">Read more »</a> </p>
<p class="card-subtitle text-muted mt-1 mb-1">March 28 2024</p>
<p class="card-text" style="margin-bottom: 0">Registeration fee for iDEC 2024 is as friendly as ever
</p>
<p> <a href="pages/news.html#news2">Read more »</a> </p>
</div>
</div>
</div>
<div class="col-xs-12 col-sm-6 col-md-6 col-lg-4 mt-2 mb-2">
<div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 mt-2 mb-2">
<div class="card">
<div class="card-body">
<h5 class="card-title"> <a class="news-card-hyperlink" href="pages/news.html#news15">Dr. Florian
Hollfelder will deliver a lecture</a>
<h5 class="card-title"> <a class="news-card-hyperlink" href="pages/news.html#news3">Registeration fee for
iDEC Festival</a>
</h5>
<p class="card-subtitle text-muted mt-1 mb-1">Oct 25 2023</p>
<p class="card-text" style="margin-bottom: 0">Dr. Florian Hollfelder from Cambridge Univeristy will
deliver a lecture on iDEC opening Ceremony</p>
<p> <a href="pages/news.html#news15">Read more »</a> </p>
</div>
</div>
</div>
<div class="col-xs-12 col-sm-6 col-md-6 col-lg-4 mt-2 mb-2">
<div class="card">
<div class="card-body">
<h5 class="card-title"> <a class="news-card-hyperlink" href="pages/news.html#news14">Dr. Philipp Holliger
will deliver a lecture</a>
</h5>
<p class="card-subtitle text-muted mt-1 mb-1">Oct 20 2023</p>
<p class="card-text" style="margin-bottom: 0">Dr. Philipp Holliger from the MRC Laboratory of Molecular
Biology (LMB) will deliver a lecure on iDEC Awards Ceremony</p>
<p> <a href="pages/news.html#news13">Read more »</a> </p>
</div>
</div>
</div>
<div class="col-xs-12 col-sm-6 col-md-6 col-lg-4 mt-2 mb-2">
<div class="card">
<div class="card-body">
<h5 class="card-title"> <a class="news-card-hyperlink" href="pages/news.html#news13">Dr. Ella
Watkins-Dulaney will deliver a lecture</a>
</h5>
<p class="card-subtitle text-muted mt-1 mb-1">Oct 20 2023</p>
<p class="card-text" style="margin-bottom: 0">Dr. Ella Watkins-Dulaney from the Aralez Bio will deliver a
lecure on iDEC Awards Ceremony</p>
<p> <a href="pages/news.html#news13">Read more »</a> </p>
<p class="card-subtitle text-muted mt-1 mb-1">March 28 2024</p>
<p class="card-text" style="margin-bottom: 0">A new situation for iDEC Festival online participation</p>
<p> <a href="pages/news.html#news3">Read more »</a> </p>
</div>
</div>
</div>
Expand Down Expand Up @@ -466,7 +418,12 @@ <h3>Special Awards</h3>
</div>
</section>
<section>
<div class="container">
<div class="row mb-4 mt-4">
<div class="col-lg-12 text-center">
<h2>Welcome to be a sponsor of iDEC 2024!</h2>
</div>
</div>
<!-- <div class="container">
<div class="row mb-4 mt-4">
<div class="col-lg-12 text-center">
<h2>Our Sponsors</h2>
Expand Down Expand Up @@ -496,7 +453,7 @@ <h2>We work together with</h2>
height="100px" width="auto" /></a>
</div>
</div>
</div>
</div> -->
</section>
<section id="contact-us">
<div class="container">
Expand Down Expand Up @@ -597,7 +554,7 @@ <h5 class="modal-title" id="exampleModalLongTitle"> Who to contact </h5> <button
</div>
<p class="text-white-50"> The International Directed Evolution Competition (iDEC) is a Scottish Charitable
Incorporate Organisation (SCIO), registered in Scotland, with charity number：SC050826 </p>
<p class="text-white-50"> Copyright &copy;2023 iDEC. All rights reserved. </p>
<p class="text-white-50"> Copyright &copy;2024 iDEC. All rights reserved. </p>
</div>
</div>
</div>
Expand All @@ -610,10 +567,11 @@ <h5 class="modal-title" id="exampleModalLongTitle"> Who to contact </h5> <button
<script src="js/popper.min.js"></script>
<script src="js/bootstrap-4.4.1.js"></script>
<script src="js/main.js"></script>
<script src="js/banner.js"></script>
<!-- <script src="js/banner.js"></script> -->
<script src="js/2a0c96cd0e.js" crossorigin="anonymous"></script>
<script src="js/timeline.js"></script>
<script src="https://hammerjs.github.io/dist/hammer.js"></script>
<!-- <script src="js/autoScroll.js"></script> -->

</body>

Expand Down
21 changes: 21 additions & 0 deletions js/autoScroll.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@

var currentScroll = 0;
function autoScroll(elementId, interval) {
var element = document.getElementById(elementId);
var scrollWidth = element.scrollWidth;
console.log(scrollWidth);
auto = setInterval(function() {
if (currentScroll < scrollWidth) {
console.log(currentScroll);
currentScroll ++;
element.scrollLeft = currentScroll;
} else {
currentScroll = 0;
element.scrollLeft = currentScroll;
}
}, interval);
}
autoScroll("imageListScroll", 30);
function over() {
clearInterval(auto);
}
Loading

0 comments on commit 4d7a3e7

Please sign in to comment.