Commit 0b2c33af authored by eric's avatar eric
Browse files

More friendly urls for the stylesheets

And fix a syntax error in the stock print.css
parent f19493e2
......@@ -35,3 +35,6 @@ html, body {
font-size: 200px !important;
line-height: 1em !important;
}
}
......@@ -7,8 +7,8 @@
<link rel="stylesheet" href="{{ STATIC_URL }}css/fonts.css" type="text/css" media="all">
{% block extra_styles %}
<link rel="stylesheet/less" href="/css/" type="text/css" media="screen">
<link rel="stylesheet/less" href="/css-print/" type="text/css" media="all">
<link rel="stylesheet/less" href="{% url 'css' %}" type="text/css" media="screen">
<link rel="stylesheet/less" href="{% url 'css-print' %}" type="text/css" media="all">
{% endblock %}
<script src="{{ STATIC_URL }}js/less-1.4.1.min.js" type="text/javascript"></script>
......
{% extends "base.html" %}
{% load wikify relearn_tags %}
{% block extra_styles %}
<link rel="stylesheet/less" href="/css/" type="text/css" media="screen">
<link rel="stylesheet/less" href="/css-print/" type="text/css" media="print">
{% endblock %}
{% block bodyclasses %}pad-00md{% endblock %}
{% block extra_nav %}
......
......@@ -3,11 +3,11 @@
{% block extra_styles %}
{% ifequal mode "p" %}
<link rel="stylesheet/less" href="/css-print/" type="text/css" media="all">
<link rel="stylesheet/less" href="{% url 'css' %}" type="text/css" media="all">
<link rel="stylesheet/less" href="{{ STATIC_URL }}less/print.less" type="text/css" media="all">
{% else %}
<link rel="stylesheet/less" href="/css/" type="text/css" media="screen">
<link rel="stylesheet/less" href="/css-print/" type="text/css" media="print">
<link rel="stylesheet/less" href="{% url 'css' %}" type="text/css" media="screen">
<link rel="stylesheet/less" href="{% url 'css-print' %}" type="text/css" media="print">
{% endifequal %}
{% endblock %}
......
......@@ -13,9 +13,9 @@ urlpatterns = patterns(
'',
url(r'^admin/', include(admin.site.urls)),
url(r'^all/$', TemplateView.as_view(template_name = 'all.html'), name='all'),
url(r'^css/$', 'relearn.views.css', name='css'),
url(r'^style.css$', 'relearn.views.css', name='css'),
url(r'^publish/$', 'relearn.views.publish', name='publish'),
url(r'^css-print/$', 'relearn.views.cssprint', name='css-print'),
url(r'^print.css$', 'relearn.views.cssprint', name='css-print'),
url(r'^$', 'relearn.views.home', name='home'),
url(r'^accounts/login$', 'django.contrib.auth.views.login',
{'template_name': 'login.html'}, name='login'),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment