From: Radek Czajka Date: Tue, 12 Nov 2013 11:57:43 +0000 (+0100) Subject: Merge branch 'master' into rwd X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/7f0caf88dd3aac2e4d5bb4ee064137e03ecd4f03?ds=inline;hp=-c Merge branch 'master' into rwd Conflicts: apps/wolnelektury_core/templates/superbase.html --- 7f0caf88dd3aac2e4d5bb4ee064137e03ecd4f03 diff --combined apps/wolnelektury_core/templates/superbase.html index 65b9e0a82,e97ede609..9ee206f57 --- a/apps/wolnelektury_core/templates/superbase.html +++ b/apps/wolnelektury_core/templates/superbase.html @@@ -5,7 -5,6 +5,7 @@@ {% load catalogue_tags funding_tags reporting_stats sponsor_tags %} + @@@ -18,36 -17,63 +18,37 @@@ {% block title %}{% trans "Wolne Lektury" %} :: {% block titleextra %}{% endblock %}{% endblock %} - + - {% compressed_css "all" %} - - - {#% compressed_css "handheld" %#} - - + href="{% static 'opensearch.xml' %}" /> + {% compressed_css "main" %} {% block extrahead %} {% endblock %} {% block bodycontent %} + {% funding link=1 closeable=1 add_class="funding-top-header" %} -
- -