diff options
10 files changed, 34 insertions, 36 deletions
diff --git a/fossee_manim/static/css/custom_base.css b/fossee_manim/static/css/custom_base.css index 7ddc1cd..e2623b1 100644 --- a/fossee_manim/static/css/custom_base.css +++ b/fossee_manim/static/css/custom_base.css @@ -1,33 +1,35 @@ -.navbar{ - font-family: 'Raleway', sans-serif; - font-size: 15px; -} - #basefooter{ font-family: 'Lato', sans-serif; - font-weight: 400; } -h1, -h2, -form, -.btn{ - font-family: 'Raleway', sans-serif; +.navbar{ + font-family: 'Montserrat', sans-serif; + font-size: 15px; } p, h3, h4, h5, h6, -.card-body{ +.card-body, +form{ font-family: 'Lato', sans-serif; } +h1, +h2, +.btn{ + font-family: 'Montserrat', sans-serif; +} .perma_link:hover{ background-color:#d1d2d3; text-decoration: none; } .perma_link a{ text-decoration: none; - font-family: 'Raleway', sans-serif; font-weight: 500; font-size: 18px; } + +#btnblue{ + background-color: #1facb3; + border-color: transparent; +} diff --git a/fossee_manim/templates/fossee_manim/base.html b/fossee_manim/templates/fossee_manim/base.html index 0a43596..f54e373 100644 --- a/fossee_manim/templates/fossee_manim/base.html +++ b/fossee_manim/templates/fossee_manim/base.html @@ -19,7 +19,7 @@ <!-- favicon --> <link rel="shortcut icon" href="{{ URL_ROOT }}/static/img/favicon.ico" /> - <link href="https://fonts.googleapis.com/css?family=Raleway:400,500|Lato&display=swap" rel="stylesheet"> + <link href="https://fonts.googleapis.com/css?family=Montserrat|Lato&display=swap" rel="stylesheet"> <link rel="stylesheet" href="{{ URL_ROOT }}/static/css/custom_base.css" type="text/css" /> </head> @@ -30,7 +30,7 @@ <body> {% block header %} - <nav class="navbar navbar-expand-lg navbar-light row bck_clr fixed-top" style="background-color:#222222; padding-top: 20px; padding-bottom: 20px;"> + <nav class="navbar navbar-expand-lg navbar-light row fixed-top" style="background-color:#222222; padding-top: 20px; padding-bottom: 20px;"> <a class="navbar-brand" href="{% url 'index' %}"> <img src="{{ URL_ROOT }}/static/img/logo_main.png" width="150" height="33.75" alt="" style="margin-right: 50px; margin-left: 20px"> </a> @@ -42,7 +42,7 @@ <form class="form-inline" method="POST" action="/search/" style="margin-left: 10px; margin-top: 10px; "> {% csrf_token %} <input class="form-control mr-sm-2" type="search" id="sbox" name="sbox" placeholder="Search for animations"> - <button class="btn btn-primary my-2 my-sm-0" type="submit" style="background-color: #1facb3; border:0px"> + <button class="btn btn-primary my-2 my-sm-0" id= "btnblue" type="submit"> Search </button> </form> diff --git a/fossee_manim/templates/fossee_manim/edit_profile.html b/fossee_manim/templates/fossee_manim/edit_profile.html index e296522..e5c3bc5 100644 --- a/fossee_manim/templates/fossee_manim/edit_profile.html +++ b/fossee_manim/templates/fossee_manim/edit_profile.html @@ -21,7 +21,7 @@ </table> </center> <br> - <button class="btn btn-primary pull-right" type="submit" style="background-color: #1facb3; border-width:0px;">Save Profile</button> + <button class="btn btn-primary pull-right" type="submit" id="btnblue">Save Profile</button> </form> <br> <br> <br> </div> diff --git a/fossee_manim/templates/fossee_manim/edit_proposal.html b/fossee_manim/templates/fossee_manim/edit_proposal.html index c872a52..cfc2beb 100644 --- a/fossee_manim/templates/fossee_manim/edit_proposal.html +++ b/fossee_manim/templates/fossee_manim/edit_proposal.html @@ -29,7 +29,7 @@ </table> <br> - <button class="btn btn-primary pull-right" type="submit" style = "background-color: #1facb3; border-width: 0px;">Save</button> + <button class="btn btn-primary pull-right" type="submit" id="btnblue">Save</button> <br> </form> <br> diff --git a/fossee_manim/templates/fossee_manim/faqs.html b/fossee_manim/templates/fossee_manim/faqs.html index b956f50..09900c2 100644 --- a/fossee_manim/templates/fossee_manim/faqs.html +++ b/fossee_manim/templates/fossee_manim/faqs.html @@ -9,15 +9,11 @@ span { background-color: #f2e680; } - li, - ul{ - font-family: 'Lato', sans-serif; - } </style> <div class="container-fluid jumbotron" align = "justify" style="margin-top:20px"> <!-- style="padding-top:120px"> --> <h1><center>Frequently Asked Questions</center></h1> - <div class="container"> + <div class="container" style= "font-family: 'Lato', sans-serif;"> <hr/> <ul> diff --git a/fossee_manim/templates/fossee_manim/honorarium.html b/fossee_manim/templates/fossee_manim/honorarium.html index 781e70d..e281cf2 100644 --- a/fossee_manim/templates/fossee_manim/honorarium.html +++ b/fossee_manim/templates/fossee_manim/honorarium.html @@ -14,18 +14,16 @@ span { background-color: #f2e680; } - li{ - font-family: 'Lato', sans-serif; - } </style> <div class="container-fluid jumbotron" align = "justify" style="margin-top:20px;"> <h1><center>Honorarium</center></h1> - <div class="container""> + <div class="container" style= "font-family: 'Lato', sans-serif;"> <hr> <h2><center>Amount</center></h2> <br> + <ol> <li> The honorarium amount is assigned based on: <ul> diff --git a/fossee_manim/templates/fossee_manim/index.html b/fossee_manim/templates/fossee_manim/index.html index 49edd78..2adf680 100644 --- a/fossee_manim/templates/fossee_manim/index.html +++ b/fossee_manim/templates/fossee_manim/index.html @@ -18,7 +18,7 @@ <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: 'Raleway', sans-serif; font-weight: 500;">FOSSEE Animations</a></h3> + <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> @@ -27,14 +27,14 @@ <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: 'Raleway', sans-serif; font-weight: 500;">Anyone can contribute to the project</a></h3> + <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" 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: 'Raleway', sans-serif; font-weight: 500;">On successful submission</a></h3> + <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> @@ -56,7 +56,7 @@ <div class="jumbotron row text-center" id= "infg" style="background-color: white; margin: 10px; font-family:'Lato', sans-serif; font-weight:400"> <div class="container text-center"> - <h1 style="color: #e45700; font-family:'Raleway', sans-serif;">HOW IT WORKS</h1> + <h1 style="color: #e45700; font-family:'Montserrat', sans-serif;">HOW IT WORKS</h1> <img class="img-fluid d-block text-center" width="100%" src="{{ URL_ROOT }}/static/img/info.svg" alt="Infographic"> <br> Want to know more? Visit our <a href="{{URL_ROOT}}/guidelines/" style="background-color:#157b80; color:white;">Guidelines</a> page! diff --git a/fossee_manim/templates/fossee_manim/proposal_status.html b/fossee_manim/templates/fossee_manim/proposal_status.html index a2f0130..a5cf74e 100644 --- a/fossee_manim/templates/fossee_manim/proposal_status.html +++ b/fossee_manim/templates/fossee_manim/proposal_status.html @@ -10,6 +10,7 @@ {% if request.user.profile.position == 'contributor' %} <h2> Proposal Status </h2> + <hr> <table class="table table-hover" style= "font-family: 'Lato', sans-serif;"> <thead> <tr> @@ -30,7 +31,7 @@ <td><span class="text-info">{{ an.status }}</span></td> {% endif %} <td><span class="badge">{{ an.created }}</span></td> - <td><a href="{% url 'edit_proposal' an.id %}"><button type="button" class="btn btn-info" style="background-color: #1facb3;">Edit</button></a></td> + <td><a href="{% url 'edit_proposal' an.id %}"><button type="button" class="btn btn-info" id= "btnblue">Edit</button></a></td> </tr> </tbody> {% endfor %} diff --git a/fossee_manim/templates/fossee_manim/send_proposal.html b/fossee_manim/templates/fossee_manim/send_proposal.html index 66c807b..b17e2bd 100644 --- a/fossee_manim/templates/fossee_manim/send_proposal.html +++ b/fossee_manim/templates/fossee_manim/send_proposal.html @@ -18,11 +18,12 @@ <div class="container-fluid jumbotron" align="center" style="background-color: white;"> <h1><center>Proposal - Stage 1</center></h1> - <div class="alert alert-info"> + <hr> + <div class="alert alert-info" style= "background-color: #c2eff4; color: #157b80;"> Please Note: If you're not serious about creating animations, do not send us a proposal. Fake submissions can result in permanent ban. </div> - <br> + <form method="post"> {% csrf_token %} @@ -32,7 +33,7 @@ </table> <br> <br> - <button class="btn btn-success" type="submit">Save</button> + <button class="btn btn-success" id = "btnblue" type="submit">Save</button> </form> <!-- Initialize Quill editor --> diff --git a/fossee_manim/templates/fossee_manim/view_profile.html b/fossee_manim/templates/fossee_manim/view_profile.html index ec54c8e..1edf689 100644 --- a/fossee_manim/templates/fossee_manim/view_profile.html +++ b/fossee_manim/templates/fossee_manim/view_profile.html @@ -50,7 +50,7 @@ </tr> </table> <br> - <a class="btn btn-primary pull-right" href="{{ URL_ROOT }}/edit_profile/" style= "background-color: #1facb3; border-width: 0px;">Edit Profile</a> + <a class="btn btn-primary pull-right" href="{{ URL_ROOT }}/edit_profile/" id= "btnblue">Edit Profile</a> </div> <br><br> {% endblock %} |