From b989c61391a9f9508fdf37c8face09fb2d60e2ee Mon Sep 17 00:00:00 2001
From: Jayaram R Pai
Date: Sat, 4 Oct 2014 13:23:31 +0530
Subject: fixed new speaker alignment, added favicon

---
 static/website/css/main.css        |   4 ++--
 static/website/images/ajith.jpeg   | Bin 40474 -> 0 bytes
 static/website/images/ajith.jpg    | Bin 0 -> 20272 bytes
 static/website/images/favicon.ico  | Bin 55614 -> 3654 bytes
 static/website/images/maciej.jpg   | Bin 0 -> 7290 bytes
 static/website/images/maciej.png   | Bin 36743 -> 0 bytes
 static/website/images/romain.jpg   | Bin 63599 -> 8555 bytes
 static/website/templates/base.html |   1 +
 static/website/templates/home.html |  23 ++++++++++++-----------
 9 files changed, 15 insertions(+), 13 deletions(-)
 delete mode 100644 static/website/images/ajith.jpeg
 create mode 100644 static/website/images/ajith.jpg
 create mode 100644 static/website/images/maciej.jpg
 delete mode 100644 static/website/images/maciej.png
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
Binary files a/static/website/images/ajith.jpeg and /dev/null differ
diff --git a/static/website/images/ajith.jpg b/static/website/images/ajith.jpg
new file mode 100644
index 0000000..b5976dc
Binary files /dev/null and b/static/website/images/ajith.jpg differ
diff --git a/static/website/images/favicon.ico b/static/website/images/favicon.ico
index 7a37af8..0525024 100644
Binary files a/static/website/images/favicon.ico and b/static/website/images/favicon.ico differ
diff --git a/static/website/images/maciej.jpg b/static/website/images/maciej.jpg
new file mode 100644
index 0000000..7033eba
Binary files /dev/null and b/static/website/images/maciej.jpg differ
diff --git a/static/website/images/maciej.png b/static/website/images/maciej.png
deleted file mode 100644
index 2710d7e..0000000
Binary files a/static/website/images/maciej.png and /dev/null differ
diff --git a/static/website/images/romain.jpg b/static/website/images/romain.jpg
index 16b1c52..0f14b2a 100644
Binary files a/static/website/images/romain.jpg and b/static/website/images/romain.jpg 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>
-- 
cgit 

