fixed merge

biswaz · Aug 14, 2018 · fa625cf · fa625cf
2 parents 6fe0fe0 + e4478af
commit fa625cf
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 183 deletions.
diff --git a/floodrelief/settingsbak.py b/floodrelief/settingsbak.py
diff --git a/static/css/style.css b/static/css/style.css
@@ -12,7 +12,11 @@ body{
     border: 2px solid #333333;
     padding: 6px 10px;
     font-weight: 500;
-    text-decoration: none
+    text-decoration: none;
+    display:inline-block;margin-top:5px;
+}
+.nav-logo{
+    height: 60px;
 }
 .backtohome{
     float:right;
@@ -69,15 +73,20 @@ form{
     max-width: 600px;
 }
 footer{
-    margin: 30px 0;
+    margin: 40px 0;
 }
 .ml.small{
     font-size: 0.6em;
 }
+.footer-logo{
+    height: 60px;
+    margin: 15px;
+}
 @media screen and (max-width: 640px) {
     .brand-logo,.brand-logo:hover{
-        font-size: 18px;
-        padding: 4px 8px;
+        font-size: 15px;
+        padding: 3px 6px;
+        margin-top: 0;
     }
     h1.main-logo{
         font-size: 3.5rem;
@@ -95,6 +104,15 @@ footer{
     a.home-button .text{
         font-size: 2rem;
     }
+
+    .nav-logo{
+        height: 30px;
+    }
+    .footer-logo{
+        height: 80px;
+        display: block;
+        margin: 15px auto;
+    }
 }
 
 table {

diff --git a/static/images/it-mission.png b/static/images/it-mission.png
diff --git a/static/images/kerala-government.png b/static/images/kerala-government.png
diff --git a/templates/base.html b/templates/base.html
@@ -28,9 +28,15 @@
  {% block body %}
 
 <nav class="navbar">
-    <a class="brand-logo" href="/">keralarescue</a>
-    {# <a href="/" class="backtohome">{% bootstrap_icon "home" %} &nbsp; Back To Home</a> #}
-    {# <a href="/volunteers" class="contactus">{% bootstrap_icon "phone" %} &nbsp; Contact Us</a> #}
+    <div class="col-sm-4 col-xs-4">
+      <img src="{% static 'images/kerala-government.png' %}" class="nav-logo" style="float:left">
+    </div>
+    <div class="col-sm-4 col-xs-4 text-center">
+        <a class="brand-logo" href="/">keralarescue</a>
+    </div>
+    <div class="col-sm-4 col-xs-4">
+        <img src="{% static 'images/it-mission.png' %}" class="nav-logo" style="float: right;">
+    </div>
 </nav>
 <div class="container">
 
@@ -44,8 +50,9 @@
 
 <footer class="footer">
   <div class="container text-center">
-    <img src="{% static 'images/ieeelogo.png' %}">
-    <img src="{% static 'images/emblem.png' %}">
+    <img src="{% static 'images/kerala-government.png' %}" class="footer-logo">
+    <img src="{% static 'images/it-mission.png' %}" class="footer-logo">
+    <img src="{% static 'images/ieeelogo.png' %}" class="footer-logo">
   </div>
 </footer>
 

diff --git a/templates/home.html b/templates/home.html
@@ -25,10 +25,10 @@ <h1 class="main-logo">kerala<span style="font-weight: normal;">rescue</span></h1
         </span>
     </a>
     <a href="/reg_contrib" class="home-button card" role="button">
-        {% bootstrap_icon "globe" %}
+        {% bootstrap_icon "apple" %}
         <span class="text">
-            Contribute<br/>
-            <span class="ml small">സഹായിക്കുക</span>
+            Contribute To<br/>Releif Camps
+            <span class="ml small">സംഭാവന നല്‍കാന്‍</span>
         </span>
     </a>
     <a href="/volunteer" class="home-button card" role="button">