Merge branch 'master' of ssh://4angle.com/home/edward/git/sourcing
This commit is contained in:
commit
2feb845824
|
@ -6,8 +6,10 @@
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<title>{% block title %}Xanadu{% endblock %}</title>
|
<title>{% block title %}Xanadu{% endblock %}</title>
|
||||||
|
|
||||||
|
<link href="https://fonts.googleapis.com/css?family=Neuton" rel="stylesheet">
|
||||||
<link rel="stylesheet" href="{{ url_for('static', filename='bootstrap4/css/bootstrap.css') }}">
|
<link rel="stylesheet" href="{{ url_for('static', filename='bootstrap4/css/bootstrap.css') }}">
|
||||||
<link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}">
|
<link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}">
|
||||||
|
|
||||||
{% block style %}
|
{% block style %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
</head>
|
</head>
|
||||||
|
|
|
@ -80,7 +80,7 @@
|
||||||
</p>
|
</p>
|
||||||
{%- endfor -%}
|
{%- endfor -%}
|
||||||
{% else %}
|
{% else %}
|
||||||
{%- for start, line in iter_lines(text) if line -%}
|
{%- for start, line in iter_lines(text) if line != '\r\n' -%}
|
||||||
{# <p data-start="{{ start }}">{% if line != "\n" and line != "\r\n" %}{{ line }}{% else %} {% endif
|
{# <p data-start="{{ start }}">{% if line != "\n" and line != "\r\n" %}{{ line }}{% else %} {% endif
|
||||||
%}</p>#}
|
%}</p>#}
|
||||||
<p data-start="{{ start }}">{{ nbsp_at_start(line) }}</p>
|
<p data-start="{{ start }}">{{ nbsp_at_start(line) }}</p>
|
||||||
|
|
Loading…
Reference in a new issue