propagate from branch 'i2p.www' (head a893b34de76aa1a5af2507a897669be255dd497f)

to branch 'i2p.www.revamp' (head dc46cb85c4e0382445d24ec4b3d70fb2f0ac2f5d)
This commit is contained in:
str4d
2015-09-29 07:54:46 +00:00
23 changed files with 618 additions and 202 deletions

View File

@@ -13,6 +13,7 @@
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/default.css') }}" media="screen, handheld, print, projection" />
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/mobile.css') }}" media="screen and (min-device-width:320px) and (max-width:767px)" />
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/desktop.css') }}" title="{{ g.theme }}" media="screen and (min-device-width:768px) and (min-width:768px), print, projection" />
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/widescreen.css') }}" title="{{ g.theme }}" media="screen and (min-device-width:1120px) and (min-width:1120px), print, projection" />
<!--[if IEMobile]>
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/mobile.css') }}" media="screen" />
<![endif]-->
@@ -22,6 +23,7 @@
{% if is_rtl() -%}
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/default.rtl.css') }}" media="screen, handheld, print, projection" />
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/desktop.rtl.css') }}" title="{{ g.theme }}" media="screen and (min-device-width:768px) and (min-width:768px), print, projection" />
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/widescreen.rtl.css') }}" title="{{ g.theme }}" media="screen and (min-device-width:1120px) and (min-width:1120px), print, projection" />
{%- endif %}
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/syntax.css') }}" media="screen, handheld, print, projection" />
{%- endif %}
@@ -49,9 +51,27 @@
<div class="container-fluid{% if not self.content() %} well{% endif %}">
<div id="content">
{% block content_outer %}
<article class="inner">
<div class="title">
<h1>{{ self.title() }}</h1>
</div>
<main role="main" class="inner">
<div class="fluid">
{% if self.content_nav() or self.sidebar() -%}
<aside class="sidebar">
{% if self.content_nav() -%}
<nav{% if self.sidebar() %} class="top"{% endif %}>
{% block content_nav %}{% endblock %}
</nav>
{%- endif %}
{% block sidebar %}{% endblock %}
</aside>
{%- endif %}
<article class="content-inner">
{% if self.lastupdated() or self.accuratefor() -%}
<div class="lastupdated">
<div class="meta">
<!--
{% block lastupdated %}{% endblock %}
{% block accuratefor %}{% endblock %}
@@ -72,11 +92,10 @@
</div>
{%- endif %}
<div class="title">
<h1>{{ self.title() }}</h1>
</div>
{% block content %}{% endblock %}
</article>
{% block content %}{% endblock %}
</article>
</div>
</main>
{% endblock %}
</div>
<footer id="global-footer">