summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-04-02 16:41:19 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-04-02 16:41:19 -0400
commitdbb431b20e295144cfb951a4e54905475115fb98 (patch)
tree2ce1dd576c825bb9127141cfadf9d86c1bc025b5
parentf6280015e772504e02c3a8b5fe5a2732d34212c1 (diff)
downloadaskbot-dbb431b20e295144cfb951a4e54905475115fb98.tar.gz
askbot-dbb431b20e295144cfb951a4e54905475115fb98.tar.bz2
askbot-dbb431b20e295144cfb951a4e54905475115fb98.zip
added backup font Arial to Yanone Kafeesatz, commented out the search tip and one more small improvement in the template
-rw-r--r--askbot/skins/default/media/style/lib_style.less2
-rw-r--r--askbot/skins/default/templates/main_page/headline.html4
-rw-r--r--askbot/skins/default/templates/main_page/sidebar.html4
3 files changed, 7 insertions, 3 deletions
diff --git a/askbot/skins/default/media/style/lib_style.less b/askbot/skins/default/media/style/lib_style.less
index 941c83ff..795733e5 100644
--- a/askbot/skins/default/media/style/lib_style.less
+++ b/askbot/skins/default/media/style/lib_style.less
@@ -14,7 +14,7 @@
@body-font:Arial; /* "Trebuchet MS", sans-serif;*/
@sort-font:Georgia, serif;
-@main-font:'Yanone Kaffeesatz', sans-serif;
+@main-font:'Yanone Kaffeesatz', Arial, sans-serif;
@secondary-font:Arial;
/* Receive exactly positions for background Sprite */
diff --git a/askbot/skins/default/templates/main_page/headline.html b/askbot/skins/default/templates/main_page/headline.html
index 19dc7063..cc6f47a5 100644
--- a/askbot/skins/default/templates/main_page/headline.html
+++ b/askbot/skins/default/templates/main_page/headline.html
@@ -20,7 +20,7 @@
}}
</div>
{% endif %}
- {% if author_name or search_tags or query %}
+ {#% if author_name or search_tags or query %}
<p class="search-tips"><b>{% trans %}Search tips:{% endtrans %}</b>
{% if reset_method_count > 1 %}
{% if author_name %}
@@ -39,5 +39,5 @@
</p>
{% else %}
<p class="search-tips"><b>{% trans %}Search tip:{% endtrans %}</b> {% trans %}add tags and a query to focus your search{% endtrans %}</p>
- {% endif %}
+ {% endif %#}
{% endif %}
diff --git a/askbot/skins/default/templates/main_page/sidebar.html b/askbot/skins/default/templates/main_page/sidebar.html
index 9fb8fab9..fbfbdeb8 100644
--- a/askbot/skins/default/templates/main_page/sidebar.html
+++ b/askbot/skins/default/templates/main_page/sidebar.html
@@ -1,8 +1,10 @@
{% import "macros.html" as macros %}
+{% if settings.SIDEBAR_MAIN_HEADER %}
<div class="box">
{{ settings.SIDEBAR_MAIN_HEADER }}
</div>
+{% endif %}
{% if contributors and settings.SIDEBAR_MAIN_SHOW_AVATARS %}
{% include "widgets/contributors.html" %}
@@ -16,6 +18,8 @@
{% include "widgets/related_tags.html" %}
{% endif %}
+{% if settings.SIDEBARE_MAIN_FOOTER %}
<div class="box">
{{ settings.SIDEBAR_MAIN_FOOTER }}
</div>
+{% endif %}