diff options
| author | Sashi20 | 2019-09-16 15:23:21 +0530 |
|---|---|---|
| committer | GitHub | 2019-09-16 15:23:21 +0530 |
| commit | ff54a0e14c1d686e5564a883a121ac30c1cda911 (patch) | |
| tree | 791606140840584d60c301f39abe88765434be5d | |
| parent | 3c724e5336f9bb3d1b899e675254a294564362f6 (diff) | |
| parent | 2a5e987aea9960d909ddb476ccd5f95da414b501 (diff) | |
| download | SciPy2019-ff54a0e14c1d686e5564a883a121ac30c1cda911.tar.gz SciPy2019-ff54a0e14c1d686e5564a883a121ac30c1cda911.tar.bz2 SciPy2019-ff54a0e14c1d686e5564a883a121ac30c1cda911.zip | |
Merge pull request #17 from Sashi20/development
Modify background image on home page
| -rw-r--r-- | static/website/bootstrap-css/assets/css/main.css | 2 | ||||
| -rw-r--r-- | static/website/bootstrap-css/assets/images/backgrounds/header.jpg | bin | 1195325 -> 12141757 bytes | |||
| -rw-r--r-- | static/website/bootstrap-css/assets/images/backgrounds/header1.jpg | bin | 736312 -> 0 bytes | |||
| -rw-r--r-- | static/website/templates/home.html | 9 | ||||
| -rwxr-xr-x | static/website/templates/view-proposals.html | 4 |
5 files changed, 9 insertions, 6 deletions
diff --git a/static/website/bootstrap-css/assets/css/main.css b/static/website/bootstrap-css/assets/css/main.css index 2184ff2..ff52f93 100644 --- a/static/website/bootstrap-css/assets/css/main.css +++ b/static/website/bootstrap-css/assets/css/main.css @@ -398,7 +398,7 @@ background-color: #552505; right: 0; bottom: 0; left: 0; - background-color: rgba(0, 0, 0, 0.5); + background-color: rgba(0, 0, 0, 0.4); } .site-header .intro { color: #fff; diff --git a/static/website/bootstrap-css/assets/images/backgrounds/header.jpg b/static/website/bootstrap-css/assets/images/backgrounds/header.jpg Binary files differindex 8facd28..8508d55 100644 --- a/static/website/bootstrap-css/assets/images/backgrounds/header.jpg +++ b/static/website/bootstrap-css/assets/images/backgrounds/header.jpg diff --git a/static/website/bootstrap-css/assets/images/backgrounds/header1.jpg b/static/website/bootstrap-css/assets/images/backgrounds/header1.jpg Binary files differdeleted file mode 100644 index 0a6c1b6..0000000 --- a/static/website/bootstrap-css/assets/images/backgrounds/header1.jpg +++ /dev/null diff --git a/static/website/templates/home.html b/static/website/templates/home.html index cf69f25..7bec6a5 100644 --- a/static/website/templates/home.html +++ b/static/website/templates/home.html @@ -4,10 +4,10 @@ <div id="home" data="home"></div> <header id="site-header" class="site-header valign-center"> <div class="intro"> - <!-- <p>International conference on Python for education and scientific computing</p><br> --> + <p>International conference on Python for education and scientific computing</p> <img alt="" class="img-responsive center-block img-logo" src="{% static 'website/bootstrap-css/assets/images/backgrounds/SciPy_logo.png' %}"><br> <h1>SciPy India 2019</h1> - <h2>29 & 30 November, 2019 / IIT Bombay</h2> + <h2>29 & 30 November, 2019 / IIT Bombay</h2><br> <a href="#registration" data-scroll class="btn btn-white">Register now</a> </div> </header> @@ -153,6 +153,9 @@ <li> If you are a group of 5 or more, write to us at <strong><a href="mailto:scipy@fossee.in" style="color: red;">scipy[at]fossee[dot]in</a></strong> to know the discounted rate. </li> + <li> + If you are an IIT Bombay student or staff, write to us at <strong><a href="mailto:scipy@fossee.in" style="color: red;">scipy[at]fossee[dot]in</a></strong> to know the discounted rate. + </li> </ul></span> </div> </div> @@ -386,7 +389,7 @@ <center> <div class="col-md-12"> <a data-flickr-embed="true" href="https://www.flickr.com/photos/138717104@N02/albums/72157710765977263" title="SciPy2019"> - <img src="https://live.staticflickr.com/65535/48705266592_0e70bb04a4_z.jpg" width="100%" height="360" alt="SciPy2019"></a><script async src="//embedr.flickr.com/assets/client-code.js" charset="utf-8"></script> + <img src="https://live.staticflickr.com/65535/48705266592_0e70bb04a4_z.jpg" width="80%" height="360" alt="SciPy2019"></a><script async src="//embedr.flickr.com/assets/client-code.js" charset="utf-8"></script> </div> </center> </div> diff --git a/static/website/templates/view-proposals.html b/static/website/templates/view-proposals.html index b37d546..cc07a1c 100755 --- a/static/website/templates/view-proposals.html +++ b/static/website/templates/view-proposals.html @@ -111,11 +111,11 @@ {% endfor %} </table> </div> - <br><!-- + <br> <div> <a href="{% url 'website:submitcfp' %}" class ="btn btn-info" role="button"> Submit paper </a> <a href="{% url 'website:submitcfw' %}" class ="btn btn-info" role="button">Submit workshop </a> - </div> --> + </div> {% if user.is_staff %} <!-- <input type="submit" id="delete" class ="btn btn-info" value="Delete" name="delete"/> --> |
