summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholyantony2015-09-15 13:10:26 +0530
committerholyantony2015-09-15 13:10:26 +0530
commit0cdff9d8134bc61689a74d371747f5e741a116be (patch)
tree183af460721467a08445d776ef38f7077efb3284
parent9db68d4500530ea60f2b5fe21251446e2be306da (diff)
downloadFOSSEE-Forum-0cdff9d8134bc61689a74d371747f5e741a116be.tar.gz
FOSSEE-Forum-0cdff9d8134bc61689a74d371747f5e741a116be.tar.bz2
FOSSEE-Forum-0cdff9d8134bc61689a74d371747f5e741a116be.zip
Subject:Resolved overlap issue in question page
Description: 1. Resolved overlap issue 2. Added images for FOSS
-rw-r--r--static/website/images/DWSIM.jpgbin0 -> 22261 bytes
-rw-r--r--static/website/images/FOSSEELaptop.jpgbin0 -> 16188 bytes
-rw-r--r--static/website/images/Sandhi.jpgbin0 -> 24632 bytes
-rw-r--r--static/website/images/eSim.jpg (renamed from static/website/images/FreeEDA.jpg)bin18339 -> 18339 bytes
-rw-r--r--static/website/templates/get-question.html4
-rw-r--r--static/website/templates/index.html2
6 files changed, 2 insertions, 4 deletions
diff --git a/static/website/images/DWSIM.jpg b/static/website/images/DWSIM.jpg
new file mode 100644
index 0000000..2f860e5
--- /dev/null
+++ b/static/website/images/DWSIM.jpg
Binary files differ
diff --git a/static/website/images/FOSSEELaptop.jpg b/static/website/images/FOSSEELaptop.jpg
new file mode 100644
index 0000000..e997f12
--- /dev/null
+++ b/static/website/images/FOSSEELaptop.jpg
Binary files differ
diff --git a/static/website/images/Sandhi.jpg b/static/website/images/Sandhi.jpg
new file mode 100644
index 0000000..9befc9a
--- /dev/null
+++ b/static/website/images/Sandhi.jpg
Binary files differ
diff --git a/static/website/images/FreeEDA.jpg b/static/website/images/eSim.jpg
index 028d58c..028d58c 100644
--- a/static/website/images/FreeEDA.jpg
+++ b/static/website/images/eSim.jpg
Binary files 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">