Style changes

static/style.css

@@ -37,22 +37,23 @@ body{font-family:sans-serif;background-color:var(--bg-main); color: var(--fg-mai
 .article-header {text-align: center;}
 #firstHeading {font-family:sans-serif; text-align: center;font-size:3em; font-weight: normal}
 @media (min-width:800px) {.homepage #firstHeading {font-size: 4.5em}}
-.inner-content{font-family:serif; margin: 1.7em auto; max-width: 1280px; line-height: 1.9; color: var(--fg-main)}
+.inner-content, .article-content {margin: 1.7em auto; max-width: 1280px;}
-.inner-content em,.inner-content strong{color: var(--fg-sharp)}
+.article-content{font-family:serif; margin: 1.7em auto; max-width: 1280px; line-height: 1.9; color: var(--fg-main)}
-.inner-content h1{color: var(--fg-error)}
+.article-content em,.article-content strong{color: var(--fg-sharp)}
-.inner-content table {font-family: sans-serif}
+.article-content h1{color: var(--fg-error)}
-.inner-content h2, .inner-content h3, .inner-content h4, .inner-content h5, .inner-content h6{font-family:sans-serif; color: var(--fg-sharp); font-weight: normal}
+.article-content table {font-family: sans-serif}
-.inner-content h2{border-bottom: 1px solid var(--border)}
+.article-content h2, .article-content h3, .article-content h4, .article-content h5, .article-content h6{font-family:sans-serif; color: var(--fg-sharp); font-weight: normal}
-.inner-content h3{margin:0.8em 0}
+.article-content h2{border-bottom: 1px solid var(--border)}
-.inner-content h4{margin:0.6em 0}
+.article-content h3{margin:0.8em 0}
-.inner-content h5{margin:0.5em 0}
+.article-content h4{margin:0.6em 0}
-.inner-content h6{margin:0.4em 0}
+.article-content h5{margin:0.5em 0}
-.inner-content p{text-indent: 1.9em; margin: 0}
+.article-content h6{margin:0.4em 0}
-.inner-content li{margin: .3em 0}
+.article-content p{text-indent: 1.9em; margin: 0}
-.inner-content blockquote{color:var(--fg-alt); border-left: 4px solid var(--bg-alt);margin-left:0;padding-left:12px}
+.article-content li{margin: .3em 0}
-.inner-content table{border:var(--bg-alt) 1px solid;border-collapse:collapse;line-height: 1.5;overflow-x:auto}
+.article-content blockquote{color:var(--fg-alt); border-left: 4px solid var(--bg-alt);margin-left:0;padding-left:12px}
-.inner-content table > * > tr > th, .inner-content table > tr > th {background-color:var(--bg-alt);border:var(--border) 1px solid;padding:2px}
+.article-content table{border:var(--bg-alt) 1px solid;border-collapse:collapse;line-height: 1.5;overflow-x:auto}
-.inner-content table > * > tr > td, .inner-content table > tr > td {border:var(--border) 1px solid;padding:2px}
+.article-content table > * > tr > th, .article-content table > tr > th {background-color:var(--bg-alt);border:var(--border) 1px solid;padding:2px}
+.article-content table > * > tr > td, .article-content table > tr > td {border:var(--border) 1px solid;padding:2px}
 
 /* spoiler styles */
 .spoiler {color: var(--fg-sharp); background-color: var(--fg-sharp)}

templates/administration.jinja2

@@ -5,6 +5,7 @@
 {% block content %}
 <h1>Administrative tools</h1>
 
+<div class="inner-content">
   {% if current_user and current_user.is_admin %}
   <ul>
     <li>
@@ -20,4 +21,5 @@
   {% else %}
   <p>Administrative tools can be accessed by administrator users only.</p>
   {% endif %}
+</div>
 {% endblock %}

templates/backlinks.jinja2

@@ -10,6 +10,7 @@
 <h1 id="firstHeading">{{ p.title }}</h1>
 <div class="preview-subtitle">{{ T('backlinks') }}</div>
 
+<div class="inner-content">
   {% if backlinks %}
   <ul>
     {% for op in backlinks %}
@@ -21,6 +22,8 @@
   {% else %}
   <p class="placeholder">{{ T("backlinks-empty") }}</p>
   {% endif %}
+</div>
+
 
 <p>{{ T("back-to") }} <a href="{{ p.get_url() }}">{{ p.title }}</a>.</p>
 {% endblock %}

templates/badrequest.jinja2

@@ -5,5 +5,7 @@
 {% block content %}
 <h1>Bad request</h1>
 
+<div class="inner-content">
   <p>You sent a request the server can’t understand. If you entered the URL manually please check your spelling and try again.</p>
+</div>
 {% endblock %}

templates/calendar.jinja2

@@ -6,6 +6,7 @@
 <article>
   <h1 id="firstHeading">{{ T('calendar') }}</h1>
 
+  <div class="inner-content">
     <ul>
       {% for year in range(till_year, from_year-1, -1) %}
       <li>
@@ -30,5 +31,6 @@
         </li>
       </ul>
     </p>
+  </div>
 </article>
 {% endblock %}

templates/contributions.jinja2

@@ -9,6 +9,7 @@
 {% block content %}
 <h1>Contributions of {{ u.username }}</h1>
 
+<div class="inner-content">
   <p class="nl-pagination">Showing results <strong>{{ page_n * 20 - 19 }}</strong> to <strong>{{ min(page_n * 20, total_count) }}</strong> of <strong>{{ total_count }}</strong> total.</p>
 
   <ul>
@@ -38,4 +39,5 @@
     <li class="nl-next"><a href="?page={{ page_n + 1 }}">Next page &raquo;</a></li>
     {% endif %}
   </ul>
+</div>
 {% endblock %}

templates/easter.jinja2

@@ -5,6 +5,7 @@
 {% block content %}
 <h1>{{ T('easter-date-calc') }}</h1>
 
+<div class="inner-content">
   <form>
     <div>
       <label for="y">{{ T('year') }}: </label>
@@ -25,5 +26,6 @@
       <li>Prima Domenica d'Avvento: <strong>{{ easter_dates['avvento1'].strftime('%B %-d, %Y') }}</strong></li>
     </ul>
   </div>
+</div>
 {% endif %}
 {% endblock %}

templates/edit.jinja2

@@ -25,12 +25,13 @@
       Remember this is only a preview. 
       <strong>Your changes were not saved yet!</strong>
       <a href="#editing-area">Jump to editing area</a></div>
-    <div class="inner-content">{{ preview|safe }}</div>
+    <div class="inner-content article-content">{{ preview|safe }}</div>
     <div style="clear:both"></div>
   </div>
 </article>
 {% endif %}
 
+<div class="inner-content">
   <form method="POST">
     <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
     <div>
@@ -88,6 +89,7 @@
     </div>
     {% endif %}
   </form>
+</div>
 
 {% endblock %}
 

templates/exportpages.jinja2

@@ -5,6 +5,7 @@
 {% block content %}
 <h1>Export pages</h1>
 
+<div class="inner-content">
   <p>You can export how many pages you want, that will be downloaded in JSON format and can be imported in another {{ app_name }} instance.</p>
 
   <p>In order to add page to export list, please enter exact title, /url, #tag or +id. Entering a tag will add all pages with that tag to list. Each page or tag is separated by a newline.</p>
@@ -21,4 +22,5 @@
       <input type="submit" value="Download">
     </div>
   </form>
+</div>
 {% endblock %}

templates/forbidden.jinja2

@@ -5,5 +5,7 @@
 {% block content %}
 <h1>Forbidden</h1>
 
+<div class="inner-content">
   <p>You don’t have permission to access this resource.</p>
+</div>
 {% endblock %}

templates/history.jinja2

@@ -10,6 +10,7 @@
 <h1 id="firstHeading">{{ p.title }}</h1>
 <div class="preview-subtitle">Page history</div>
 
+<div class="inner-content">
   <ul>
   {% for rev in history %}
     <li>
@@ -32,6 +33,7 @@
     </li>
   {% endfor %}
   </ul>
+</div>
 
 <p>{{ T("back-to") }} <a href="{{ p.get_url() }}">{{ p.title }}</a>.</p>
 {% endblock %}

templates/importpages.jinja2

@@ -5,7 +5,9 @@
 {% block content %}
 <h1>Import pages</h1>
 
+<div class="inner-content">
   {% if current_user.is_admin %}
+
     <p>
       You can import files produced by the <a href="/manage/export">exporter tool</a>, in JSON format.
       Importing pages can be done by users with Admin permissions only.
@@ -25,7 +27,9 @@
         <input type="submit" value="Import" />
       </div>
     </form>
+  </div>
   {% else %}
   <p>Importing pages can be done by users with Admin permissions only.</p>
   {% endif %}
+</div>
 {% endblock %}

templates/internalservererror.jinja2

@@ -1,9 +1,11 @@
 {% extends "base.jinja2" %}
 
-{% block title %}Internal Server Error - {{ app_name }}{% endblock %}
+{% block title %}% _ % - {{ app_name }}{% endblock %}
 
 {% block content %}
 <h1>Internal Server Error</h1>
 
+<div class="inner-content">
   <p>We’re sorry, an unexpected error occurred. Try refreshing the page.</p>
+</div>
 {% endblock %}

templates/leaderboard.jinja2

@@ -9,6 +9,7 @@
 {% block content %}
 <h1>Best pages</h1>
 
+<div class="inner-content">
   <table>
     <thead>
       <tr>
@@ -35,4 +36,5 @@
       {% endfor %}
     </tbody>
   </table>
+</div>
 {% endblock %}

templates/listrecent.jinja2

@@ -2,7 +2,7 @@
 
 {% block content %}
 <article>
-  <h1>Notes by date</h1>
+  <h1 id="firstHeading">Notes by date</h1>
 
   <p class="nl-pagination">Showing results <strong>{{ page_n * 20 - 19 }}</strong> to <strong>{{ min(page_n * 20, total_count) }}</strong> of <strong>{{ total_count }}</strong> total.</p>
 

templates/login.jinja2

@@ -5,6 +5,7 @@
 {% block content %}
 <h1>{{ T('login') }}</h1>
 
+<div class="inner-content">
     <form method="POST">
         <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
         <div>
@@ -28,6 +29,7 @@
             <input type="submit" value="{{ T('login') }}" />
         </div>
     </form>
+<div class="inner-content"></div>
 
 <p>{{ T('no-account-sign-up') }} <a href="/accounts/register" rel="nofollow">{{ T("sign-up") }}</a></p>
 {% endblock %}

templates/manageaccounts.jinja2

@@ -5,6 +5,7 @@
 {% block content %}
 <h1>Manage accounts</h1>
 
+<div class="inner-content">
 {% if current_user.is_admin %}
   <p>
     Here is the list of users registered on {{ app_name }}, in reverse chronological order.
@@ -43,10 +44,9 @@
       <li class="nl-next"><a href="?page={{ page_n + 1 }}">Next page &raquo;</a></li>
       {% endif %}
     </ul>
-
-
   </form>
   {% else %}
   <p>Managing accounts can be done by users with Admin permissions only.</p>
   {% endif %}
+</div>
 {% endblock %}

templates/notfound.jinja2

@@ -5,5 +5,7 @@
 {% block content %}
 <h1>{{ T('not-found') }}</h1>
 
+<div class="inner-content">
   <p>{{ T('not-found-text-1') }} <strong>{{ request.path }}</strong> {{ T('not-found-text-2') }}.</p>
+</div>
 {% endblock %}

templates/privacy.jinja2

@@ -7,7 +7,7 @@
 
 <h1 id="firstHeading">Privacy Policy</h1>
 
-<div class="inner-content">
+<div class="inner-content article-content">
 {% filter markdown %}
 # Privacy
 

templates/register.jinja2

@@ -5,6 +5,7 @@
 {% block content %}
 <h1>{{ T('sign-up') }}</h1>
 
+<div class="inner-content">
   <form method="POST">
     <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
     <div>
@@ -33,4 +34,6 @@
   </form>
 
   <p>{{ T('already-have-account') }} <a href="/accounts/login" rel="nofollow">{{ T("login") }}</a></p>
+</div>
+
 {% endblock %}

templates/search.jinja2

@@ -5,6 +5,7 @@
 {% block content %}
 <h1>Search</h1>
 
+<div class="inner-content">
   <form method="POST">
     <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
     <div class="search-wrapper">
@@ -30,5 +31,6 @@
   {% else %}
   <p>Please note that search queries do not search for page text.</p> 
   {% endif %}
+</div>
 
 {% endblock %}

templates/stats.jinja2

@@ -5,6 +5,7 @@
 {% block content %}
 <h1>Statistics</h1>
 
+<div class="inner-content">
   <ul>
     <li>{{ T("notes-count") }}: <strong>{{ notes_count }}</strong></li>
     <li>{{ T("notes-count-with-url") }}: <strong>{{ notes_with_url }}</strong></li>
@@ -13,4 +14,5 @@
     <li>{{ T('users-count') }}: <strong>{{ users_count }}</strong></li>
     <li>{{ T('groups-count') }}: <strong>{{ groups_count }}</strong></li>
   </ul>
+</div>
 {% endblock %}

templates/terms.jinja2

@@ -5,7 +5,7 @@
 {% block content %}
 <h1 id="firstHeading">Terms of Service</h1>
 
-<div class="inner-content">
+<div class="inner-content article-content">
 {% filter markdown %}
 ## Scope and Definitions
 

templates/uploadinfo.jinja2

@@ -1,23 +0,0 @@
-{% extends "base.jinja2" %}
-
-{% block title %}Info on file "{{ upl.name }}" - {{ app_name }}{% endblock %}
-
-{% block content %}
-<h1>Info on file "{{ upl.name }}"</h1>
-
-<div class="upload-frame">
-  <img src="{{ upl.url }}" alt="{{ upl.name }}">
-</div>
-
-<p>You can include this file in other pages with <strong>{{ '{{' }}media:{{ upl.id }}{{ '}}' }}</strong>.</p>
-
-<h2>File info</h2>
-
-<p>Type: {{ type_list[upl.filetype] }}</p>
-
-<p>Upload ID: {{ upl.id }}</p>
-
-<p>Uploaded on: {{ upl.upload_date.strftime('%B %-d, %Y %H:%M:%S') }}</p>
-
-<p>Size: {{ upl.filesize }} bytes</p>
-{% endblock %}

templates/view.jinja2

@@ -42,7 +42,7 @@
   </div>
   {% endif %}
 
-  <div class="inner-content">
+  <div class="inner-content article-content">
     {{ html_and_toc[0]|safe }}
   </div>