Commit f19493e2 authored by eric's avatar eric
Browse files

Merge branch 'vj14' of git.constantvzw.org:osp.tools.ethertoff into vj14

parents e6b739be fcbed8e5
......@@ -8,8 +8,8 @@ if($("body").hasClass("p-mode")){
// POLYFILL HACK: move metadata and footnotes outside of div#content
footnotes = $(".footnote").detach();
footnotes.insertAfter($("#content"));
metadata = $("#metadata").detach();
metadata.insertAfter($(".footnote"));
//metadata = $("#metadata").detach();
//metadata.insertAfter($(".footnote"));
// OVERRIDES PAGE FORMAT SET ON PAD
try{
......
/* __________________________________ LOCAL SETTINGS __________________________________ */
@page-height: 210mm;
@page-width: 148.5mm;
@page-height: 200mm;
@page-width: 170mm;
@spread: @page-width*2;
@crop-length: 7mm;
......@@ -11,7 +11,7 @@
@page-height-crop: @page-height + (@crop*2);
@page-margin-inside: 20mm;
@page-margin-outside: 10mm;
@page-margin-outside: 20mm;
@page-margin-top: 10mm;
@page-margin-bottom: 15mm;
......@@ -324,15 +324,13 @@ div.column + div.column {
padding-left: 1em;
}
#content,
div.footnote,
div#metadata {
div.footnote {
-webkit-flow-into: myFlow;
-adobe-flow-into: myFlow;
width: 100%;
}
.include #content,
.include div.footnote,
.include div#metadata {
.include div.footnote {
-webkit-flow-into: none;
-adobe-flow-into: none;
}
......
......@@ -77,8 +77,7 @@
</div>
<div class="wrap" style="height: 85%;">
<div class="left-side">
{% include "partials/metadata.html" %}
<div class="left-side screen-only">
</div>
<div class="middle">
......
......@@ -66,6 +66,7 @@
{% block content %}
{% include "partials/metadata.html" %}
{% ifequal mode "p" %}
<header class="{% if meta.type %}{{ meta.type.0|lower }}{% endif %}">
......@@ -78,6 +79,7 @@
</header>
{% endifequal %}
{{ text|safe }}
......
{% load wikify relearn_tags %}
<div id="metadata">
<div class="metadata">
<dl>
{% if meta.theme %}
<dt>Theme</dt>
......
Supports Markdown
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