summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSharanya A2019-09-08 08:54:52 +0530
committerGitHub2019-09-08 08:54:52 +0530
commitb6e0618518852d478a7d4917e1086978a7988406 (patch)
tree86aa41128aae9c7a3a47673c06a88eaf9891d8df
parente175b147cf38a7963b2fbb11dec4638d7b512d92 (diff)
parentd67af101820a9d96ab40492cf33e36db57e34f6a (diff)
downloadFOSSEE_animations-b6e0618518852d478a7d4917e1086978a7988406.tar.gz
FOSSEE_animations-b6e0618518852d478a7d4917e1086978a7988406.tar.bz2
FOSSEE_animations-b6e0618518852d478a7d4917e1086978a7988406.zip
Merge branch 'master' into aboutexp
-rw-r--r--fossee_manim/static/img/carousel1.pngbin630660 -> 690969 bytes
-rw-r--r--fossee_manim/static/img/carousel2.pngbin260716 -> 412936 bytes
-rw-r--r--fossee_manim/templates/fossee_manim/index.html67
3 files changed, 34 insertions, 33 deletions
diff --git a/fossee_manim/static/img/carousel1.png b/fossee_manim/static/img/carousel1.png
index 7e7eb9a..487843e 100644
--- a/fossee_manim/static/img/carousel1.png
+++ b/fossee_manim/static/img/carousel1.png
Binary files differ
diff --git a/fossee_manim/static/img/carousel2.png b/fossee_manim/static/img/carousel2.png
index 11c0aca..8e6ac59 100644
--- a/fossee_manim/static/img/carousel2.png
+++ b/fossee_manim/static/img/carousel2.png
Binary files differ
diff --git a/fossee_manim/templates/fossee_manim/index.html b/fossee_manim/templates/fossee_manim/index.html
index 611f282..a598513 100644
--- a/fossee_manim/templates/fossee_manim/index.html
+++ b/fossee_manim/templates/fossee_manim/index.html
@@ -15,43 +15,44 @@
</ol>
<div class="carousel-inner">
- <div class="carousel-item active">
- <img class="d-block w-100" src="{{ URL_ROOT }}/static/img/carousel1.png" alt="First slide" height=550>
- <div class="carousel-caption col-md-4" style="float:left; font-family: 'Lato', sans-serif; text-align: left; margin-left: -20px; margin-bottom:15px">
- <h3><a style="font-family: 'Montserrat', sans-serif; font-weight: 500;">FOSSEE Animations</a></h3>
- <h5>endeavors to be an extensive library
- of community-curated videos on STEM topics
- </h5>
- </div>
- </div>
- <div class="carousel-item">
- <img class="d-block w-100" src="{{ URL_ROOT }}/static/img/carousel3.png" alt="Second slide" height=550>
- <div class="carousel-caption col-md-3" style="float:right; font-family: 'Lato', sans-serif;">
- <h3><a style="font-family: 'Montserrat', sans-serif; font-weight: 500;">Anyone can contribute to the project</a></h3>
- <h5> The only requirement is that the video should be made using <i>OpenSource</i> tools</h5>like Blender, Manim, Mayavi, etc.
+
+ <div class="carousel-item active">
+ <img class="d-block w-100" src="{{ URL_ROOT }}/static/img/carousel1.png" alt="First slide" style= "height:550px;">
+ <div class="carousel-caption col-md-4" style="float:left; font-family: 'Lato', sans-serif; text-align: left; margin-left: -20px; margin-bottom:15px">
+ <h3><a style="font-family: 'Montserrat', sans-serif; font-weight: 500;">FOSSEE Animations</a></h3>
+ <h5>endeavors to be an extensive library
+ of community-curated videos on STEM topics
+ </h5>
+ </div>
+ </div>
+ <div class="carousel-item">
+ <img class="d-block w-100" src="{{ URL_ROOT }}/static/img/carousel3.png" alt="Second slide" style= "height:550px;">
+ <div class="carousel-caption col-md-3" style="float:right; font-family: 'Lato', sans-serif;">
+ <h3><a style="font-family: 'Montserrat', sans-serif; font-weight: 500;">Anyone can contribute to the project</a></h3>
+ <h5> The only requirement is that the video should be made using <i>OpenSource</i> tools</h5>like Blender, Manim, Mayavi, etc.
+ </div>
+ </div>
+
+ <div class="carousel-item">
+ <img class="d-block w-100" src="{{ URL_ROOT }}/static/img/carousel2.png" alt="Third slide" style= "height:550px; ">
+ <div class="carousel-caption col-md-4" style="margin-left:560px; margin-bottom:250px;float:right; font-family: 'Lato', sans-serif; text-align:right">
+ <h3><a style="font-family: 'Montserrat', sans-serif; font-weight: 500;">On successful submission</a></h3>
+ <h5>you receive a certificate and an<br>
+ honorarium from FOSSEE,<br>IIT-Bombay</h5>
+ </div>
+ </div>
</div>
+ <a class="carousel-control-prev" href="#carouselExampleIndicators" role="button" data-slide="prev">
+ <span class="carousel-control-prev-icon" aria-hidden="true"></span>
+ <span class="sr-only">Previous</span>
+ </a>
+ <a class="carousel-control-next" href="#carouselExampleIndicators" role="button" data-slide="next">
+ <span class="carousel-control-next-icon" aria-hidden="true"></span>
+ <span class="sr-only">Next</span>
+ </a>
</div>
- <div class="carousel-item">
- <img class="d-block w-100" src="{{ URL_ROOT }}/static/img/carousel2.png" alt="Third slide" height=550>
- <div class="carousel-caption col-md-4" style="margin-left:560px; margin-bottom:250px;float:right; font-family: 'Lato', sans-serif; text-align:right">
- <h3><a style="font-family: 'Montserrat', sans-serif; font-weight: 500;">On successful submission</a></h3>
- <h5>you receive a certificate and an<br>
- honorarium from FOSSEE,<br>IIT-Bombay</h5>
- </div>
- </div>
- </div>
- <a class="carousel-control-prev" href="#carouselExampleIndicators" role="button" data-slide="prev">
- <span class="carousel-control-prev-icon" aria-hidden="true"></span>
- <span class="sr-only">Previous</span>
- </a>
- <a class="carousel-control-next" href="#carouselExampleIndicators" role="button" data-slide="next">
- <span class="carousel-control-next-icon" aria-hidden="true"></span>
- <span class="sr-only">Next</span>
- </a>
- </div>
</div>
-
<!--Infographics-->
<div class="jumbotron row text-center" id= "infg" style="background-color: white; margin: 10px; font-family:'Lato', sans-serif; font-weight:400">