From 0cdff9d8134bc61689a74d371747f5e741a116be Mon Sep 17 00:00:00 2001
From: holyantony
Date: Tue, 15 Sep 2015 13:10:26 +0530
Subject: Subject:Resolved overlap issue in question page

Description:
1. Resolved overlap issue
2. Added images for FOSS
---
 static/website/images/DWSIM.jpg            | Bin 0 -> 22261 bytes
 static/website/images/FOSSEELaptop.jpg     | Bin 0 -> 16188 bytes
 static/website/images/FreeEDA.jpg          | Bin 18339 -> 0 bytes
 static/website/images/Sandhi.jpg           | Bin 0 -> 24632 bytes
 static/website/images/eSim.jpg             | Bin 0 -> 18339 bytes
 static/website/templates/get-question.html |   4 +---
 static/website/templates/index.html        |   2 +-
 7 files changed, 2 insertions(+), 4 deletions(-)
 create mode 100644 static/website/images/DWSIM.jpg
 create mode 100644 static/website/images/FOSSEELaptop.jpg
 delete mode 100644 static/website/images/FreeEDA.jpg
 create mode 100644 static/website/images/Sandhi.jpg
 create mode 100644 static/website/images/eSim.jpg

diff --git a/static/website/images/DWSIM.jpg b/static/website/images/DWSIM.jpg
new file mode 100644
index 0000000..2f860e5
Binary files /dev/null and b/static/website/images/DWSIM.jpg differ
diff --git a/static/website/images/FOSSEELaptop.jpg b/static/website/images/FOSSEELaptop.jpg
new file mode 100644
index 0000000..e997f12
Binary files /dev/null and b/static/website/images/FOSSEELaptop.jpg differ
diff --git a/static/website/images/FreeEDA.jpg b/static/website/images/FreeEDA.jpg
deleted file mode 100644
index 028d58c..0000000
Binary files a/static/website/images/FreeEDA.jpg and /dev/null differ
diff --git a/static/website/images/Sandhi.jpg b/static/website/images/Sandhi.jpg
new file mode 100644
index 0000000..9befc9a
Binary files /dev/null and b/static/website/images/Sandhi.jpg differ
diff --git a/static/website/images/eSim.jpg b/static/website/images/eSim.jpg
new file mode 100644
index 0000000..028d58c
Binary files /dev/null and b/static/website/images/eSim.jpg differ
diff --git a/static/website/templates/get-question.html b/static/website/templates/get-question.html
index 0335e5d..388a8c6 100644
--- a/static/website/templates/get-question.html
+++ b/static/website/templates/get-question.html
@@ -14,8 +14,6 @@
 <span class="saved hideme">saved</span>
 
 <div class="row">
- 
-        
                         
     <div class="question-wrapper col-lg-12 col-md-12 col-sm-12 col-xs-12">
     <div class="question {% if user|can_edit:question %}editable{% endif %}" >
@@ -140,7 +138,7 @@
            		
                        
                   
-            <div class="body" id="body{{ answer.id }}" style="padding-bottom: 0px">
+            <div class="body" id="body{{ answer.id }}" style="padding-bottom: 12px">
                 {{ answer.body|safe }}
             </div>
             
diff --git a/static/website/templates/index.html b/static/website/templates/index.html
index 9344492..98a8d43 100644
--- a/static/website/templates/index.html
+++ b/static/website/templates/index.html
@@ -67,7 +67,7 @@
                             {% if file %}
                                 <img src="{% static category|get_category_image %}">
                             {% else %}
-                                <div class="category-title">{{category}}</div>
+                                <div class="category-title">{{ category.description }}</div>
                             {% endif %}
                         {% endwith %}
                         <div class="caption">
-- 
cgit