summaryrefslogtreecommitdiff
path: root/static
diff options
context:
space:
mode:
authorSashi202019-09-11 11:37:09 +0530
committerGitHub2019-09-11 11:37:09 +0530
commit68842f975b0299e3310de3830adb6d214c5b1535 (patch)
tree9db7428ab05d7f4dd6675250556b00dc12924144 /static
parent7b352b1857c736c2502cc1d02c0d9090fc4ceb6f (diff)
parent8d2f5b4e349af86c0237ec6debb9c2a4dd3fa2df (diff)
downloadSciPy2019-68842f975b0299e3310de3830adb6d214c5b1535.tar.gz
SciPy2019-68842f975b0299e3310de3830adb6d214c5b1535.tar.bz2
SciPy2019-68842f975b0299e3310de3830adb6d214c5b1535.zip
Merge pull request #10 from Sashi20/development
Update speaker bio
Diffstat (limited to 'static')
-rw-r--r--static/website/templates/header.html1
-rw-r--r--static/website/templates/home.html24
2 files changed, 6 insertions, 19 deletions
diff --git a/static/website/templates/header.html b/static/website/templates/header.html
index 045df52..1ec421e 100644
--- a/static/website/templates/header.html
+++ b/static/website/templates/header.html
@@ -11,6 +11,7 @@
<link rel="icon" href="{% static 'website/bootstrap-css/assets/images/logo.png' %}" type="icon">
<title>SciPy India 2019</title>
<script src="{% static 'website/bootstrap-css/bower_components/jquery/dist/jquery.min.js' %}"></script>
+ <script src="{% static 'website/bootstrap-css/assets/js/1.5.2/jquery.min.js' %}"></script>
<script src="{% static 'website/bootstrap-css/assets/js/2.8.2/modernizr.js' %}"></script>
<script src="{% static 'website/bootstrap-css/bower_components/bootstrap/dist/js/bootstrap.min.js' %}"></script>
<!-- css -->
diff --git a/static/website/templates/home.html b/static/website/templates/home.html
index bf10271..fd2578b 100644
--- a/static/website/templates/home.html
+++ b/static/website/templates/home.html
@@ -78,33 +78,19 @@
<img alt="" class="img-responsive center-block img-rounded" style="width:179px;height:198px;" src="{% static 'website/bootstrap-css/assets/images/speakers/keynote_speaker.jpg' %}" data-toggle="modal" data-target="#speaker1">
</figure>
<h4>Michael Droettboom</h4>
- <div class="modal fade spkrmodal" id="speaker1" role="dialog">
- <div class="modal-dialog">
-
- <div class="modal-content">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal">&times;</button>
- <h4 class="modal-title">Michael Droettboom</h4>
- </div>
- <div class="modal-body">
- <p class="text-justify">Michael Droettboom is a Staff Data Engineer at Mozilla. There, he is working with a team that collects data on a massive scale that, unlike most of the big tech companies, respects user agency, privacy and transparency. Prior to that, he has a history of applying machine learning and data science to such diverse as fields as neuroscience, astronomy, medieval manuscripts and 19th century American sheet music. He contributes to many open source projects, was the lead developer of matplotlib, and the original author of airspeed velocity and Pyodide.</p>
- </div>
- <div class="modal-footer">
- <button type="button" class="btn btn-info" data-dismiss="modal">Close</button>
- </div>
- </div>
- </div>
- </div>
-
<ul class="social-block">
<li><a href="http://droettboom.com/" target="_blank"><i class="fa fa-globe"></i></a></li>
<li><a href="http://linkedin.com/in/mdboom" target="_blank"><i class="ion-social-linkedin-outline"></i></a></li>
<li><a href="https://github.com/mdboom" target="_blank"><i class="ion-social-github"></i></a></li>
</ul>
-
</div>
</div>
</div>
+ <div class="row">
+ <div class="col-md-12">
+ <p class="text-justify">Michael Droettboom is a Staff Data Engineer at Mozilla. There, he is working with a team that collects data on a massive scale that, unlike most of the big tech companies, respects user agency, privacy and transparency. Prior to that, he has a history of applying machine learning and data science to such diverse as fields as neuroscience, astronomy, medieval manuscripts and 19th century American sheet music. He contributes to many open source projects, was the lead developer of matplotlib, and the original author of airspeed velocity and Pyodide.</p>
+ </div>
+ </div>
</center>
</div>
</section>