diff options
author | Prashant S | 2017-10-27 13:27:07 +0000 |
---|---|---|
committer | GitHub | 2017-10-27 13:27:07 +0000 |
commit | 051ff63be9747c7858e97defb217a6ea90ee255e (patch) | |
tree | ed36e9ac21b1267650f69a9ada84cc5d44d26c8b | |
parent | f3619f083e33741690eb049d07f8698ffbb1a9a4 (diff) | |
parent | e2547a5f015e860adbf46fa2c7f9f37e02d8f3b1 (diff) | |
download | SciPy2017-051ff63be9747c7858e97defb217a6ea90ee255e.tar.gz SciPy2017-051ff63be9747c7858e97defb217a6ea90ee255e.tar.bz2 SciPy2017-051ff63be9747c7858e97defb217a6ea90ee255e.zip |
Merge pull request #27 from Sashi20/devel
Changes made to Keynote speaker and Poster
-rw-r--r-- | website/static/img/SciPy_2017_Poster.jpg | bin | 0 -> 153038 bytes | |||
-rw-r--r-- | website/static/img/Th_SciPy_2017_Poster.jpg | bin | 0 -> 16350 bytes | |||
-rw-r--r-- | website/static/pdf/SciPy_2017_Poster.pdf | bin | 0 -> 354223 bytes | |||
-rw-r--r-- | website/templates/footer.html | 2 | ||||
-rw-r--r-- | website/templates/home.html | 38 | ||||
-rw-r--r-- | website/templates/navbar.html | 10 |
6 files changed, 25 insertions, 25 deletions
diff --git a/website/static/img/SciPy_2017_Poster.jpg b/website/static/img/SciPy_2017_Poster.jpg Binary files differnew file mode 100644 index 0000000..d5b3d81 --- /dev/null +++ b/website/static/img/SciPy_2017_Poster.jpg diff --git a/website/static/img/Th_SciPy_2017_Poster.jpg b/website/static/img/Th_SciPy_2017_Poster.jpg Binary files differnew file mode 100644 index 0000000..6c9b12b --- /dev/null +++ b/website/static/img/Th_SciPy_2017_Poster.jpg diff --git a/website/static/pdf/SciPy_2017_Poster.pdf b/website/static/pdf/SciPy_2017_Poster.pdf Binary files differnew file mode 100644 index 0000000..7598fec --- /dev/null +++ b/website/static/pdf/SciPy_2017_Poster.pdf diff --git a/website/templates/footer.html b/website/templates/footer.html index 0423ed2..7f2de0b 100644 --- a/website/templates/footer.html +++ b/website/templates/footer.html @@ -69,7 +69,7 @@ <p class="m-0 text-center text-white"> <center style="color:white;font-size: 10px;"> This work is licensed under a <a target="_blank" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>. - <center> + </center> </p> </div> <!-- /.container --> diff --git a/website/templates/home.html b/website/templates/home.html index 24d875d..b3c9bae 100644 --- a/website/templates/home.html +++ b/website/templates/home.html @@ -95,7 +95,7 @@ <h6>Keynote Speaker</h6> <img class="img-fluid d-block mx-auto" src="{% static 'img/me_pro.png' %}" alt=""> <p align="justify"> - <center>Nelle Varoquaux<br> + <center>Dr. Nelle Varoquaux<br> <span style="font-size: 10px;">(a postdoctoral fellow at the Department of Statistics at UC Berkeley and a BIDS data science fellow.) </span> </center> @@ -150,7 +150,7 @@ <tr> <td bgcolor="#01c3d9"> <h9 style="color:#000000;">Early Bird</h9> - <h2 style="color:#000000;" style ="font-size: 25px;">₹1200</h2> + <h2 style="color:#000000;font-size: 25px;">₹1200</h2> <h9 style="color:#000000;">(Till 25<sup>th</sup> Oct 2017)</h9> </td> <td> @@ -160,7 +160,7 @@ <tr> <td bgcolor = "#5cd8e7"> <h9 style="color:#000000;">Lite</h9> - <h2 style="color:#000000;"style ="font-size: 25px;">₹600</h2> + <h2 style="color:#000000;font-size: 25px;">₹600</h2> <h9 style="color:#000000;">(Till 20<sup>th</sup> Nov 2017)</h9> </td> <td> @@ -170,7 +170,7 @@ <tr> <td bgcolor="#8cc9f0"> <h9 style="color:#000000;">Regular</h9> - <h2 style="color:#000000;" style ="font-size: 25px;">₹1400</h2> + <h2 style="color:#000000;font-size: 25px;">₹1400</h2> <h9 style="color:#000000;">(26<sup>th</sup> Oct - 25<sup>th</sup> Nov 2017)</h9> </td> <td> @@ -180,23 +180,23 @@ <tr> <td bgcolor ="#9de8f1"> <h9 style="color:#000000;">Accomodation</h9> - <h2 style="color:#000000;" style ="font-size: 25px;">₹600</h2> + <h2 style="color:#000000;font-size: 25px;">₹600</h2> <h9 style="color:#000000;">Add On</h9> </td> <td> Accommodation is provided on a shared basis (twin sharing) inside IIT-B campus (Boys/Girls hostel). Accommodation will be provided for 2 days, i.e, 28-29 and 29-30 November. Accommodation does not include other amenities like dinner, etc. Extension of period of stay is not available. This is a non-refundable ticket. </td> + </tr> <tr> <td bgcolor= "#cef3f8"> <h9 style="color:#000000;">T-Shirt</h9> - <h2 style="color:#000000;" style ="font-size: 25px;">₹350</h2> + <h2 style="color:#000000;font-size: 25px;">₹350</h2> <h9 style="color:#000000;">Add On</h9> </td> <td> Change of size, exchange at the venue is not available. This is a non-refundable ticket. </td> </tr> - </tr> </table> <p id="demo"></p> <center> @@ -249,7 +249,7 @@ </h4> </span> </center> - <div class="row align-items-center" style="margin-left: 4%;"> + <div class="row align-items-center" style="margin-left: 3%;margin-right:3%;"> <div class="col-sm-4" style="background-color: #5cd8e7;" ><br> <p> Call for proposals opens:<br> <b>15<sup>th</sup> Sept. 2017</b> @@ -349,8 +349,8 @@ </div> </div> </section> -<!--------------------------> -<!------------ schedule------------- --> +<!-- ---------------------- --> +<!-- ---------- schedule-------- --> <section id="schedule"> <br> <br> @@ -536,8 +536,8 @@ </div> </div> </section> -<!--------------------------> -<!------------ about ------------- --> +<!-- ---------------------------- --> +<!-- ---------- instructions ---------- --> <section id="instructions"> <br> <br> @@ -586,8 +586,8 @@ </div> </div> </section> -<!--------------------------> -<!------------ venue ------------- --> +<!-- ---------------------- --> +<!-- ---------- venue ------------ --> <section id="venue"> <br> <br> @@ -614,8 +614,8 @@ </div> </div> </section> -<!--------------------------> -<!------------ venue ------------- --> +<!-- ---------------------- --> +<!-- ---------- sponsors ------------ --> <section id="sponsors"> <br> <br> @@ -674,8 +674,8 @@ </p> </div> <div class="col-lg-4 col-sm-4 text-center mb-4" align="justify"> - <a href="{% static 'pdf/scipy_poster.pdf'%}" target="_blank"> - <img src="{% static 'img/Th_Scipy2017.png'%}" /> + <a href="{% static 'pdf/SciPy_2017_Poster.pdf'%}" target="_blank"> + <img src="{% static 'img/Th_SciPy_2017_Poster.jpg'%}" /> </a> </div> </div> @@ -753,5 +753,5 @@ </div> </div> </section> -<!--------------------------> +<!-- ---------------------- --> diff --git a/website/templates/navbar.html b/website/templates/navbar.html index de71433..56eed85 100644 --- a/website/templates/navbar.html +++ b/website/templates/navbar.html @@ -12,7 +12,7 @@ <div class="collapse navbar-collapse" id="navbarResponsive"> <ul class="navbar-nav"> <li class="nav-item"> - <a class="nav-link" href="/#home" class="nav-link js-scroll-trigger" > + <a href="/#home" class="nav-link js-scroll-trigger" > Home <span class="sr-only">(current)</span> </a> @@ -21,7 +21,7 @@ <a class="nav-link" href="#about" class="nav-link js-scroll-trigger" >About</a> </li> --> <li class="nav-item"> - <a class="nav-link" href="/#speakers" class="nav-link js-scroll-trigger" >Speakers</a> + <a href="/#speakers" class="nav-link js-scroll-trigger" >Speakers</a> </li> <!-- <li class="nav-item"> @@ -34,16 +34,16 @@ <a class="nav-link" href="/#submit">Submit</a> </li> <li class="nav-item"> - <a class="nav-link" href="/#schedule" class="nav-link js-scroll-trigger" >Schedule</a> + <a href="/#schedule" class="nav-link js-scroll-trigger" >Schedule</a> </li> <!-- <li class="nav-item"> <a class="nav-link" href="#instructions" class="nav-link js-scroll-trigger" >Instructions</a> </li> --> <li class="nav-item"> - <a class="nav-link" href="/#venue" class="nav-link js-scroll-trigger" >Venue</a> + <a href="/#venue" class="nav-link js-scroll-trigger" >Venue</a> </li> <li class="nav-item"> - <a class="nav-link" href="/#sponsors" class="nav-link js-scroll-trigger" >Sponsor</a> + <a href="/#sponsors" class="nav-link js-scroll-trigger" >Sponsor</a> </li> <!-- <li class="nav-item"> <a class="nav-link" href="#" class="nav-link js-scroll-trigger" >Satellite Conference</a> |