summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJayaram R Pai2014-10-04 13:23:31 +0530
committerJayaram R Pai2014-10-04 13:23:31 +0530
commitb989c61391a9f9508fdf37c8face09fb2d60e2ee (patch)
treec442bf0de1b1b2adf74cf9dfdc4483668e04d1ac
parentbb6a483593de3cc3e1f86295befd9edfde840aa7 (diff)
downloadscipy2014-b989c61391a9f9508fdf37c8face09fb2d60e2ee.tar.gz
scipy2014-b989c61391a9f9508fdf37c8face09fb2d60e2ee.tar.bz2
scipy2014-b989c61391a9f9508fdf37c8face09fb2d60e2ee.zip
fixed new speaker alignment, added favicon
Diffstat
-rw-r--r--static/website/css/main.css4
-rw-r--r--static/website/images/ajith.jpegbin40474 -> 0 bytes
-rw-r--r--static/website/images/ajith.jpgbin0 -> 20272 bytes
-rw-r--r--static/website/images/favicon.icobin55614 -> 3654 bytes
-rw-r--r--static/website/images/maciej.jpgbin0 -> 7290 bytes
-rw-r--r--static/website/images/maciej.pngbin36743 -> 0 bytes
-rw-r--r--static/website/images/romain.jpgbin63599 -> 8555 bytes
-rwxr-xr-xstatic/website/templates/base.html1
-rwxr-xr-xstatic/website/templates/home.html23
9 files changed, 15 insertions, 13 deletions
diff --git a/static/website/css/main.css b/static/website/css/main.css
index 9d1293b..977b33c 100644
--- a/static/website/css/main.css
+++ b/static/website/css/main.css
@@ -187,7 +187,7 @@ body {
margin-top: 0;
}
#speakers .thumbnail {
- height: 265px;
+ height: 250px;
}
#speakers hr {
margin-top: 10px;
@@ -214,7 +214,7 @@ body {
margin-top: 10px;
}
#twitter-widget-0 {
- height: 265px;
+ height: 250px;
}
/* form section */
.errorlist {
diff --git a/static/website/images/ajith.jpeg b/static/website/images/ajith.jpeg
deleted file mode 100644
index 620c38d..0000000
--- a/static/website/images/ajith.jpeg
+++ /dev/null
Binary files differ
diff --git a/static/website/images/ajith.jpg b/static/website/images/ajith.jpg
new file mode 100644
index 0000000..b5976dc
--- /dev/null
+++ b/static/website/images/ajith.jpg
Binary files differ
diff --git a/static/website/images/favicon.ico b/static/website/images/favicon.ico
index 7a37af8..0525024 100644
--- a/static/website/images/favicon.ico
+++ b/static/website/images/favicon.ico
Binary files differ
diff --git a/static/website/images/maciej.jpg b/static/website/images/maciej.jpg
new file mode 100644
index 0000000..7033eba
--- /dev/null
+++ b/static/website/images/maciej.jpg
Binary files differ
diff --git a/static/website/images/maciej.png b/static/website/images/maciej.png
deleted file mode 100644
index 2710d7e..0000000
--- a/static/website/images/maciej.png
+++ /dev/null
Binary files differ
diff --git a/static/website/images/romain.jpg b/static/website/images/romain.jpg
index 16b1c52..0f14b2a 100644
--- a/static/website/images/romain.jpg
+++ b/static/website/images/romain.jpg
Binary files differ
diff --git a/static/website/templates/base.html b/static/website/templates/base.html
index cc0220c..9d02164 100755
--- a/static/website/templates/base.html
+++ b/static/website/templates/base.html
@@ -6,6 +6,7 @@
<head>
<meta charset="UTF-8">
<title>SciPy India 2014</title>
+ <link rel="shortcut icon" type="image/png" href="{% static 'website/images/favicon.ico'%}"/>
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
<link rel="stylesheet" href="{% static 'website/css/main.css'%}">
{% dajaxice_js_import %}
diff --git a/static/website/templates/home.html b/static/website/templates/home.html
index edbbeed..6ac8603 100755
--- a/static/website/templates/home.html
+++ b/static/website/templates/home.html
@@ -5,6 +5,7 @@
<head>
<meta charset="UTF-8">
<title>SciPy India 2014</title>
+ <link rel="shortcut icon" type="image/png" href="{% static 'website/images/favicon.ico'%}"/>
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
<link rel="stylesheet" href="{% static 'website/css/main.css'%}">
</head>
@@ -60,14 +61,14 @@
<div class="container-fluid">
<div id="speakers">
<div class="row">
- <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
+ <div class="col-lg-8 col-md-8 col-sm-8 col-xs-8">
<h4 class="garmond" align="center"><u>Speakers</u></h4>
<div class="row">
- <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
+ <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
<div class="thumbnail">
- <img src="{% static 'website/images/maciej.png' %}">
+ <img src="{% static 'website/images/maciej.jpg' %}">
<div class="caption">
- Maciej Fijałkowski (<span class="garmond">Keynote</span>)
+ Maciej Fijałkowski
<hr>
<div class="extras garmond">
<div class="row">
@@ -82,11 +83,11 @@
</div>
</div>
</div> <!-- /.col -->
- <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
+ <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
<div class="thumbnail">
- <img src="{% static 'website/images/ajith.jpeg' %}">
+ <img src="{% static 'website/images/ajith.jpg' %}">
<div class="caption">
- Ajith Kumar (<span class="garmond">Keynote</span>)
+ Ajith Kumar
<hr>
<div class="extras garmond">
<div class="row">
@@ -101,16 +102,16 @@
</div>
</div>
</div> <!-- /.col -->
- <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
+ <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
<div class="thumbnail">
<img src="{% static 'website/images/romain.jpg' %}">
<div class="caption">
- Romain Guillebert (<span class="garmond">Invited</span>)
+ Romain Guillebert
<hr>
<div class="extras garmond">
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 bio">
- <a href="{% url 'website:invited_speakers' %}"></a>
+ <a href="{% url 'website:invited_speakers' %}">View Bio</a>
</div>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
<a href="https://twitter.com/rguillebert" target="_blank">Twitter</a>
@@ -123,7 +124,7 @@
</div> <!-- /.row -->
</div> <!-- /.col -->
- <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
+ <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
<h4 class="garmond" align="center"><u>News and Updates</u></h4>
<a class="twitter-timeline" href="https://twitter.com/SciPyIndia" data-widget-id="404921110312910848">Tweets by @SciPyIndia</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
generated by cgit (git 2.34.1) at 2025-03-12 20:00:29 +0000