Merge branch 'master' of ssh://4angle.com/home/edward/git/sourcing

This commit is contained in:
Edward Betts 2017-06-07 14:25:30 +01:00
commit 2feb845824
2 changed files with 3 additions and 1 deletions

View file

@ -6,8 +6,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<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='css/style.css') }}">
{% block style %}
{% endblock %}
</head>

View file

@ -80,7 +80,7 @@
</p>
{%- endfor -%}
{% 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 %}&nbsp;{% endif
%}</p>#}
<p data-start="{{ start }}">{{ nbsp_at_start(line) }}</p>