From 13b38463ab46a8535d95b1ca41acf94c999d7d0b Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Fri, 29 May 2015 16:05:36 +0000
Subject: [PATCH 01/32] First pass at redesigning content layout

---
 i2p2www/pages/global/layout.html       | 23 ++++++---
 i2p2www/static/styles/duck/default.css | 70 +++++++++++++++++---------
 i2p2www/static/styles/duck/desktop.css | 28 +++++------
 i2p2www/static/styles/duck/mobile.css  |  6 ++-
 4 files changed, 79 insertions(+), 48 deletions(-)

diff --git a/i2p2www/pages/global/layout.html b/i2p2www/pages/global/layout.html
index afda10c3..0239bd0e 100644
--- a/i2p2www/pages/global/layout.html
+++ b/i2p2www/pages/global/layout.html
@@ -49,7 +49,18 @@
     <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">
+          <aside class="sidebar">
+            {% if self.content_nav() -%}
+            <nav>
+            {% block content_nav %}{% endblock %}
+            </nav>
+            {%- endif %}
+
           {% if self.lastupdated() or self.accuratefor() -%}
           <div class="lastupdated">
             <!--
@@ -71,12 +82,12 @@
             {%- endif %}{% endif %}{% endif %}
           </div>
           {%- endif %}
+          </aside>
 
-          <div class="title">
-            <h1>{{ self.title() }}</h1>
-          </div>
-        {% block content %}{% endblock %}
-        </article>
+          <article class="content-inner">
+          {% block content %}{% endblock %}
+          </article>
+        </main>
       {% endblock %}
       </div>
       <footer id="global-footer">
diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css
index 64b6288e..99b5e22a 100644
--- a/i2p2www/static/styles/duck/default.css
+++ b/i2p2www/static/styles/duck/default.css
@@ -23,6 +23,17 @@ div.hide {
     display: none
 }
 
+.title {
+    font-family: "URW Gothic L", "Century Gothic", sans-serif;
+    text-transform: uppercase;
+    font-size: 3.5em;
+    font-weight: bold;
+    text-shadow: 1px 1px 1px rgba(0,0,0,.2);
+    color: #333333;
+    line-height:41px;
+    vertical-align:middle;
+}
+
 div#topbar {
     width: 80%;
     /*margin: 1em auto;*/
@@ -142,53 +153,61 @@ div#content .feed-icon {
     width: 28px;
 }
 
-div#content .lastupdated {
-    background-color: #ffffdd;
-    border-radius: 0 0 5px 5px;
-    padding: 2px 4px;
-    position: relative;
-    left: 8%;
-    text-align: right;
-    width: 80%;
-}
-
 /**
  * The .inner class is for the content wrapper on inner pages (as opposed to the home page)
  */
 
 div#content .inner {
+    background: rgba(0, 0, 0, 0.05);
     width: auto;
-    margin: 0 5%;
     padding: 0 5% 0.1em;
     position: relative;
-    background: rgba(171, 204, 113, 0.6);
     border-top: 2px solid #abcc71;
-    border-left: 2px solid #abcc71;
-    border-right: 2px solid #abcc71;
-    border-radius: 5px 5px 0 0;
     color: black;
     font-size: 1.2em;
     line-height: 1.4em;
 }
 
+div#content .sidebar {
+    border-bottom: 2px solid #abcc71;
+    border-left: 2px solid #abcc71;
+    border-right: 2px solid #abcc71;
+}
+
+div#content .sidebar nav {
+    background: rgba(171, 204, 113, 0.6);
+    border-bottom: 2px solid #abcc71;
+}
+
+div#content .sidebar nav ul {
+    margin: 0;
+    padding: 1.5em 1em;
+}
+
+div#content .lastupdated {
+    background-color: #ffffdd;
+    border-radius: 0 0 0 10px;
+    padding: 2px 4px;
+    position: relative;
+    text-align: right;
+}
+
+div#content .content-inner {
+    background: white;
+    border-left: 2px solid #abcc71;
+    border-right: 2px solid #abcc71;
+    padding: 1em 2em;
+}
+
 div#content .inner h1,
 div#content .inner h2,
 div#content .inner h3,
 div#content .inner h4 {
-    color: white;
-    text-shadow: 1px 1px 1px rgba(0,0,0,.3);
     margin: 1em 0 .5em;
     padding-bottom: .2em;
-    clear: both;
     line-height: 110%;
 }
 
-div#content .inner h2,
-div#content .inner h3,
-div#content .inner h4 {
-    border-bottom: 1px solid white
-}
-
 div#content .inner h1 {
     font-size: 2.2em;
     margin: 1em 0 0.5em;
@@ -197,7 +216,8 @@ div#content .inner h1 {
 }
 
 div#content .inner h2 {
-    font-size: 1.6em
+    font-size: 1.6em;
+    border-bottom: 1px solid black
 }
 
 div#content .inner h3 {
diff --git a/i2p2www/static/styles/duck/desktop.css b/i2p2www/static/styles/duck/desktop.css
index c4de8bb1..951009e4 100644
--- a/i2p2www/static/styles/duck/desktop.css
+++ b/i2p2www/static/styles/duck/desktop.css
@@ -13,12 +13,6 @@ div#topbar #logo img:hover {
 }
 
 div#topbar .title {
-    font-family: "URW Gothic L", "Century Gothic", sans-serif;
-    text-transform: uppercase;
-    font-size: 3.5em;
-    font-weight: bold;
-    text-shadow: 1px 1px 1px rgba(0,0,0,.2);
-    color: #333333;
     /*position: absolute;*/
     top:0;
     right:0;
@@ -241,24 +235,26 @@ div#content .aside:first-child {
     margin-left: 0%
 }
 
-div#content .lastupdated {
-    left: auto;
-    position: absolute;
-    right: 10%;
-    top: 0;
-    width: 200px;
-}
-
 /**
  * The .inner class is for the content wrapper on inner pages (as opposed to the home page)
  */
 
 div#content .inner {
-    padding: 4em 5% 2em;
+    padding:0 10%;
     font-size: 1.3em;
 }
 
-div#content .inner > .title {
+div#content .inner .sidebar {
+    border-radius: 0 0 0 10px;
+    float: left;
+    width: 200px;
+}
+
+div#content .content-inner {
+    margin-left: 202px;
+}
+
+div#content .title {
     display: none
 }
 
diff --git a/i2p2www/static/styles/duck/mobile.css b/i2p2www/static/styles/duck/mobile.css
index a59b12c2..16032098 100644
--- a/i2p2www/static/styles/duck/mobile.css
+++ b/i2p2www/static/styles/duck/mobile.css
@@ -1,3 +1,7 @@
+.title {
+    text-align: center;
+}
+
 #topbar .title {
     display: none
 }
@@ -138,4 +142,4 @@ div#content .inner .title {
 #global-footer .aside.third,
 #global-footer .aside.fifth {
     margin-left: 0
-}
\ No newline at end of file
+}

From 452d9973ef4c9ec0a96f104ae8f6021a6f586994 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Fri, 29 May 2015 16:18:25 +0000
Subject: [PATCH 02/32] Started moving TOCs into correct place

---
 i2p2www/pages/site/faq.html                   |  5 ++--
 .../get-involved/develop/applications.html    |  7 +++--
 .../get-involved/guides/new-developers.html   | 26 +++++++++----------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/i2p2www/pages/site/faq.html b/i2p2www/pages/site/faq.html
index dcb0324b..3b12e6fa 100644
--- a/i2p2www/pages/site/faq.html
+++ b/i2p2www/pages/site/faq.html
@@ -1,7 +1,6 @@
 {% extends "global/layout.html" %}
 {% block title %}{{ _('Frequently Asked Questions') }}{% endblock %}
-{% block content %}
-<h3 id="index">{{ _('Index') }}</h3>
+{% block content_nav %}
 <ol>
 <li style="list-style: none; display: inline">
 <h4>{{ _('General') }}</h4>
@@ -47,7 +46,9 @@
 <li><a href="#compat6x">{% trans %}I'm using FreeBSD and when I start I2P I receive an error about <code>libm.so.4</code>!{% endtrans %}</a></li>
 <li><a href="#protocolfamily">{% trans %}In <code>wrapper.log</code> I see an error stating <code>Protocol family unavailable</code> when I2P is loading{% endtrans %}</a></li>
 </ol>
+{% endblock %}
 
+{% block content %}
 <h3 id="systems">{% trans %}What systems will I2P run on?{% endtrans %}
 <span class="permalink">(<a href="#systems">{{ _('link') }}</a>)</span></h3>
 <p>{% trans chart='https://trac.i2p2.de/wiki/java' -%}
diff --git a/i2p2www/pages/site/get-involved/develop/applications.html b/i2p2www/pages/site/get-involved/develop/applications.html
index d23578d4..c1d977a7 100644
--- a/i2p2www/pages/site/get-involved/develop/applications.html
+++ b/i2p2www/pages/site/get-involved/develop/applications.html
@@ -2,17 +2,16 @@
 {% block title %}{{ _('Application Development') }}{% endblock %}
 {% block lastupdated %}{% trans %}May 2013{% endtrans %}{% endblock %}
 {% block accuratefor %}0.9.6{% endblock %}
-{% block content %}
-<h1>{{ _('Application Development Guide') }}</h1>
-
-<h2>{{ _('Contents') }}</h2>
+{% block content_nav %}
 <ul>
     <li><a href="#why">{{ _('Why write I2P-specific code?') }}</a></li>
     <li><a href="#concepts">{{ _('Important concepts') }}</a></li>
     <li><a href="#options">{{ _('Development options') }}</a></li>
     <li><a href="#start"><b>{{ _('Start developing - a simple guide') }}</b></a></li>
 </ul>
+{% endblock %}
 
+{% block content %}
 <h2 id="why">{{ _('Why write I2P-specific code?') }}</h2>
 
 <p>{% trans i2ptunnel=site_url('docs/api/i2ptunnel') -%}
diff --git a/i2p2www/pages/site/get-involved/guides/new-developers.html b/i2p2www/pages/site/get-involved/guides/new-developers.html
index 910a350f..fdb8bc3b 100644
--- a/i2p2www/pages/site/get-involved/guides/new-developers.html
+++ b/i2p2www/pages/site/get-involved/guides/new-developers.html
@@ -1,17 +1,6 @@
 {% extends "global/layout.html" %}
 {% block title %}{% trans %}New Developer's Guide{% endtrans %}{% endblock %}
-{% block content %}
-<p>{% trans %}
-So you want to start work on I2P? Great!
-Here's a quick guide to getting started
-on contributing to the website or the software, doing development or creating translations.
-{%- endtrans %}</p>
-<p>{% trans volunteer=site_url('get-involved') %}
-Not quite ready for coding?
-Try <a href="{{ volunteer }}">getting involved</a> first.
-{%- endtrans %}</p>
-
-<div id="TOC">
+{% block content_nav %}
   <ol>
     <li><a href="#basic-study">{% trans %}Basic study{% endtrans %}</a></li>
     <li><a href="#getting-the-i2p-code">{% trans %}Getting the I2P code{% endtrans %}</a></li>
@@ -22,7 +11,18 @@ Try <a href="{{ volunteer }}">getting involved</a> first.
     <li><a href="#translations">{% trans %}Translations{% endtrans %}</a></li>
     <li><a href="#tools">{% trans %}Tools{% endtrans %}</a></li>
   </ol>
-</div>
+{% endblock %}
+
+{% block content %}
+<p>{% trans %}
+So you want to start work on I2P? Great!
+Here's a quick guide to getting started
+on contributing to the website or the software, doing development or creating translations.
+{%- endtrans %}</p>
+<p>{% trans volunteer=site_url('get-involved') %}
+Not quite ready for coding?
+Try <a href="{{ volunteer }}">getting involved</a> first.
+{%- endtrans %}</p>
 
 <h2 id="basic-study">{% trans %}Basic study{% endtrans %}</h2>
 

From 1a29aeac54de366762077819b8419cdcfd50afa3 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Fri, 29 May 2015 16:18:38 +0000
Subject: [PATCH 03/32] CSS fix

---
 i2p2www/static/styles/duck/default.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css
index 99b5e22a..0a81378c 100644
--- a/i2p2www/static/styles/duck/default.css
+++ b/i2p2www/static/styles/duck/default.css
@@ -179,6 +179,11 @@ div#content .sidebar nav {
     border-bottom: 2px solid #abcc71;
 }
 
+div#content .sidebar nav ol {
+    margin: 0;
+    padding: 1.5em
+}
+
 div#content .sidebar nav ul {
     margin: 0;
     padding: 1.5em 1em;

From c00f7739ff4be43ccf8a1433abd981102349856c Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Fri, 29 May 2015 22:18:02 +0000
Subject: [PATCH 04/32] Style fixes for when sidebar has no or partial content

---
 i2p2www/pages/global/layout.html       | 6 ++++--
 i2p2www/static/styles/duck/default.css | 4 ++--
 i2p2www/static/styles/duck/desktop.css | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/i2p2www/pages/global/layout.html b/i2p2www/pages/global/layout.html
index 0239bd0e..cf2411cc 100644
--- a/i2p2www/pages/global/layout.html
+++ b/i2p2www/pages/global/layout.html
@@ -54,9 +54,10 @@
         </div>
 
         <main role="main" class="inner">
+          {% if self.content_nav() or self.lastupdated() or self.accuratefor() -%}
           <aside class="sidebar">
             {% if self.content_nav() -%}
-            <nav>
+            <nav{% if self.lastupdated() or self.accuratefor() %} class="top"{% endif %}>
             {% block content_nav %}{% endblock %}
             </nav>
             {%- endif %}
@@ -83,8 +84,9 @@
           </div>
           {%- endif %}
           </aside>
+          {%- endif %}
 
-          <article class="content-inner">
+          <article class="content-inner{% if self.content_nav() or self.lastupdated() or self.accuratefor() %} two-col{% endif %}">
           {% block content %}{% endblock %}
           </article>
         </main>
diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css
index 0a81378c..80638205 100644
--- a/i2p2www/static/styles/duck/default.css
+++ b/i2p2www/static/styles/duck/default.css
@@ -169,13 +169,13 @@ div#content .inner {
 }
 
 div#content .sidebar {
+    background: rgba(171, 204, 113, 0.6);
     border-bottom: 2px solid #abcc71;
     border-left: 2px solid #abcc71;
     border-right: 2px solid #abcc71;
 }
 
-div#content .sidebar nav {
-    background: rgba(171, 204, 113, 0.6);
+div#content .sidebar .top {
     border-bottom: 2px solid #abcc71;
 }
 
diff --git a/i2p2www/static/styles/duck/desktop.css b/i2p2www/static/styles/duck/desktop.css
index 951009e4..838196f3 100644
--- a/i2p2www/static/styles/duck/desktop.css
+++ b/i2p2www/static/styles/duck/desktop.css
@@ -250,7 +250,7 @@ div#content .inner .sidebar {
     width: 200px;
 }
 
-div#content .content-inner {
+div#content .content-inner.two-col {
     margin-left: 202px;
 }
 

From aaf4d19fcac14536a12585d3aa2db6992fcf831c Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Fri, 29 May 2015 23:43:08 +0000
Subject: [PATCH 05/32] Top shadow

---
 i2p2www/static/styles/duck/default.css | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css
index 80638205..ac1a7def 100644
--- a/i2p2www/static/styles/duck/default.css
+++ b/i2p2www/static/styles/duck/default.css
@@ -168,6 +168,16 @@ div#content .inner {
     line-height: 1.4em;
 }
 
+div#content .inner:before {
+    box-shadow: 0 6px 12px -12px inset;
+    content: " ";
+    height: 12px;
+    left: 0;
+    position: absolute;
+    top: 0;
+    width: 100%;
+}
+
 div#content .sidebar {
     background: rgba(171, 204, 113, 0.6);
     border-bottom: 2px solid #abcc71;

From d844733297226f0497ff55e3aa19db348f380456 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Fri, 29 May 2015 23:50:03 +0000
Subject: [PATCH 06/32] Increase sidebar width

---
 i2p2www/static/styles/duck/desktop.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i2p2www/static/styles/duck/desktop.css b/i2p2www/static/styles/duck/desktop.css
index 838196f3..ec247c18 100644
--- a/i2p2www/static/styles/duck/desktop.css
+++ b/i2p2www/static/styles/duck/desktop.css
@@ -247,11 +247,11 @@ div#content .inner {
 div#content .inner .sidebar {
     border-radius: 0 0 0 10px;
     float: left;
-    width: 200px;
+    width: 250px;
 }
 
 div#content .content-inner.two-col {
-    margin-left: 202px;
+    margin-left: 252px;
 }
 
 div#content .title {

From 42313cbe5537b2b3641270623e1e8cc5d549ff01 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Fri, 29 May 2015 23:50:13 +0000
Subject: [PATCH 07/32] Adjust ol padding in sidebar

---
 i2p2www/static/styles/duck/default.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css
index ac1a7def..25c925a5 100644
--- a/i2p2www/static/styles/duck/default.css
+++ b/i2p2www/static/styles/duck/default.css
@@ -191,7 +191,7 @@ div#content .sidebar .top {
 
 div#content .sidebar nav ol {
     margin: 0;
-    padding: 1.5em
+    padding: 0.5em 1em 1em 2em
 }
 
 div#content .sidebar nav ul {

From 99068677ee59620aac5778de2d035c854febe210 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sat, 30 May 2015 00:02:39 +0000
Subject: [PATCH 08/32] Sidebar padding tweaks

---
 i2p2www/static/styles/duck/default.css | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css
index 25c925a5..ac66f32d 100644
--- a/i2p2www/static/styles/duck/default.css
+++ b/i2p2www/static/styles/duck/default.css
@@ -189,14 +189,18 @@ div#content .sidebar .top {
     border-bottom: 2px solid #abcc71;
 }
 
+div#content .sidebar nav {
+    padding: 1em;
+}
+
 div#content .sidebar nav ol {
     margin: 0;
-    padding: 0.5em 1em 1em 2em
+    padding-left: 1em;
 }
 
 div#content .sidebar nav ul {
     margin: 0;
-    padding: 1.5em 1em;
+    padding-left: 0.5em;
 }
 
 div#content .lastupdated {

From 068c60acb2031580ef075c31452fa790b13fd820 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sat, 30 May 2015 00:16:40 +0000
Subject: [PATCH 09/32] Moved TOCs into sidebar

---
 .../site/docs/applications/supported.html     |  9 ++---
 .../site/docs/spec/common-structures.html     | 21 +++++-----
 .../site/get-involved/guides/monotone.html    |  6 +--
 i2p2www/pages/site/get-involved/todo.html     | 38 ++++++++++---------
 4 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/i2p2www/pages/site/docs/applications/supported.html b/i2p2www/pages/site/docs/applications/supported.html
index 96bf6ceb..34ad75a4 100644
--- a/i2p2www/pages/site/docs/applications/supported.html
+++ b/i2p2www/pages/site/docs/applications/supported.html
@@ -1,10 +1,6 @@
 {% extends "global/layout.html" %}
 {% block title %}{% trans %}Supported Applications{% endtrans %}{% endblock %}
-{% block content %}
-
-<h1 class="title">{% trans %}Supported Applications{% endtrans %}</h1>
-
-<div id="TOC">
+{% block content_nav %}
   <ul>
     <li><a href="#blogging-and-forums">{% trans %}Blogging, Forums, and Wikis{% endtrans %}</a></li>
 
@@ -80,8 +76,9 @@
       </ul>
     </li>
   </ul>
-</div>
+{% endblock %}
 
+{% block content %}
 <p>{% trans trac='https://trac.i2p2.de/report/1' -%}
 This is intended to be a comprehensive listing of applications used with
 I2P. If you know of something that's missing please submit a ticket on
diff --git a/i2p2www/pages/site/docs/spec/common-structures.html b/i2p2www/pages/site/docs/spec/common-structures.html
index 4805121d..a2d304a5 100644
--- a/i2p2www/pages/site/docs/spec/common-structures.html
+++ b/i2p2www/pages/site/docs/spec/common-structures.html
@@ -2,16 +2,7 @@
 {% block title %}{% trans %}Common structures Specification{% endtrans %}{% endblock %}
 {% block lastupdated %}{% trans %}April 2015{% endtrans %}{% endblock %}
 {% block accuratefor %}0.9.19{% endblock %}
-{% block content %}
-<p>{% trans i2np=site_url('docs/protocol/i2np'),
-i2cp=site_url('docs/protocol/i2cp'),
-ssu=site_url('docs/transport/ssu') -%}
-This document describes some data types common to all I2P protocols, like
-<a href="{{ i2np }}">I2NP</a>, <a href="{{ i2cp }}">I2CP</a>,
-<a href="{{ ssu }}">SSU</a>, etc.
-{%- endtrans %}</p>
-
-<h2>Index</h2>
+{% block content_nav %}
 <table border=1>
 <tr><th>{% trans %}Type{% endtrans %}</th></tr>
 <tr><td><a href="#type_Boolean">Boolean</a></td></tr>
@@ -37,6 +28,16 @@ This document describes some data types common to all I2P protocols, like
 <tr><td><a href="#type_String">String</a></td></tr>
 <tr><td><a href="#type_TunnelId">TunnelId</a></td></tr>
 </table>
+{% endblock %}
+
+{% block content %}
+<p>{% trans i2np=site_url('docs/protocol/i2np'),
+i2cp=site_url('docs/protocol/i2cp'),
+ssu=site_url('docs/transport/ssu') -%}
+This document describes some data types common to all I2P protocols, like
+<a href="{{ i2np }}">I2NP</a>, <a href="{{ i2cp }}">I2CP</a>,
+<a href="{{ ssu }}">SSU</a>, etc.
+{%- endtrans %}</p>
 
 <h2 id="type_Integer">Integer</h2>
 <h4>{% trans %}Description{% endtrans %}</h4>
diff --git a/i2p2www/pages/site/get-involved/guides/monotone.html b/i2p2www/pages/site/get-involved/guides/monotone.html
index e51a5c6a..9c8114dd 100644
--- a/i2p2www/pages/site/get-involved/guides/monotone.html
+++ b/i2p2www/pages/site/get-involved/guides/monotone.html
@@ -1,7 +1,6 @@
 {% extends "global/layout.html" %}
 {% block title %}{% trans %}Monotone Guide{% endtrans %}{% endblock %}
-{% block content %}
-<div id="TOC">
+{% block content_nav %}
   <ol>
     <li>
       <a href="#operating-a-monotone-client">{% trans %}Operating a Monotone client{% endtrans %}</a>
@@ -26,8 +25,9 @@
       </ol>
     </li>
   </ol>
-</div>
+{% endblock %}
 
+{% block content %}
 <p><i>
   {% trans transitionguide=site_url('misc/transition-guide'), newdevs=site_url('get-involved/guides/new-developers') -%}
   This is a revised version of <a href="{{ transitionguide }}">Complication's original
diff --git a/i2p2www/pages/site/get-involved/todo.html b/i2p2www/pages/site/get-involved/todo.html
index ce70e590..684fbab9 100644
--- a/i2p2www/pages/site/get-involved/todo.html
+++ b/i2p2www/pages/site/get-involved/todo.html
@@ -1,24 +1,14 @@
 {% extends "global/layout.html" %}
 {% block title %}{{ _('I2P Project Targets') }}{% endblock %}
-{% block content %}
-<p>{% trans roadmap=site_url('get-involved/roadmap'), volunteer=site_url('get-involved') -%}
-Below is a more detailed (yet still incomplete) discussion of the major areas
-of future development on the core I2P network, spanning the plausibly planned
-releases. This does not include stego transports, porting to wireless devices,
-or tools to secure the local machine, nor does it include client applications
-that will be essential in I2P's success. There are probably other things that
-will come up, especially as I2P gets more peer review, but these are the main
-'big things'. See also <a href="{{ roadmap }}">the roadmap</a>. Want to help?
-<a href="{{ volunteer }}">Get involved</a>!
-{%- endtrans %}</p>
-
-<h2>{{ _('Core functionality') }} <span class="permalink"><a href="#core">[{{ _('link') }}]</a></span></h2>
+{% block content_nav %}
+<ul>
+<li><a href="#core">{{ _('Core functionality') }}</a>
   <ul class="targetlist">
     <li><a href="#netdb">{% trans -%}
 NetworkDB and profile tuning and ejection policy for large nets
 {%- endtrans %}</a></li>
-  </ul>
-<h2>{{ _('Security / anonymity') }} <span class="permalink"><a href="#security">[{{ _('link') }}]</a></span></h2>
+  </ul></li>
+<li><a href="#security">{{ _('Security / anonymity') }}</a>
   <ul class="targetlist">
     <li><a href="#fullRestrictedRoutes">{% trans -%}
 Full blown n-hop restricted routes with optional trusted links
@@ -32,8 +22,22 @@ Advanced tunnel operation (batching/mixing/throttling/padding)
     <li><a href="#stop">{% trans -%}
 Stop &amp; go mix w/ garlics &amp; tunnels
 {%- endtrans %}</a></li>
-  </ul>
-<h2>{{ _('Performance') }} <span class="permalink"><a href="{{ site_url('about/performance/future') }}">[{{ _('link') }}]</a></span></h2>
+  </ul></li>
+<li><a href="{{ site_url('about/performance/future') }}">{{ _('Performance') }}</a></li>
+</ul>
+{% endblock %}
+
+{% block content %}
+<p>{% trans roadmap=site_url('get-involved/roadmap'), volunteer=site_url('get-involved') -%}
+Below is a more detailed (yet still incomplete) discussion of the major areas
+of future development on the core I2P network, spanning the plausibly planned
+releases. This does not include stego transports, porting to wireless devices,
+or tools to secure the local machine, nor does it include client applications
+that will be essential in I2P's success. There are probably other things that
+will come up, especially as I2P gets more peer review, but these are the main
+'big things'. See also <a href="{{ roadmap }}">the roadmap</a>. Want to help?
+<a href="{{ volunteer }}">Get involved</a>!
+{%- endtrans %}</p>
 
   <h2 id="core">{{ _('Core functionality') }}</h2>
   <ul class="targetlist">

From 526c56cd262ac1d191beb2c07f3839af5d0ace04 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sat, 30 May 2015 00:22:40 +0000
Subject: [PATCH 10/32] Put blog metadata into sidebar

---
 i2p2www/pages/blog/post.html     | 5 ++++-
 i2p2www/pages/global/layout.html | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/i2p2www/pages/blog/post.html b/i2p2www/pages/blog/post.html
index 262d9ef7..ce6d9f52 100644
--- a/i2p2www/pages/blog/post.html
+++ b/i2p2www/pages/blog/post.html
@@ -1,12 +1,15 @@
 {% extends "global/layout.html" %}
 {%- from "global/macros" import render_categories with context -%}
 {% block title %}{{ title }} - {{ _('Blog') }}{% endblock %}
-{% block content %}
+{% block sidebar %}
 <ul id="post-info" class="lastupdated">
   <li class="date">{{ _('Posted:') }} {{ meta.date }}</li>
   <li class="author">{{ _('Author:') }} {{ meta.author }}</li>
   <li class="category">{{ render_categories(meta.category)|safe }}</li>
 </ul>
+{% endblock %}
+
+{% block content %}
 {% autoescape false %}
 {{ body }}
 {% endautoescape %}
diff --git a/i2p2www/pages/global/layout.html b/i2p2www/pages/global/layout.html
index cf2411cc..3fa09c7f 100644
--- a/i2p2www/pages/global/layout.html
+++ b/i2p2www/pages/global/layout.html
@@ -54,7 +54,7 @@
         </div>
 
         <main role="main" class="inner">
-          {% if self.content_nav() or self.lastupdated() or self.accuratefor() -%}
+          {% if self.content_nav() or self.sidebar() or self.lastupdated() or self.accuratefor() -%}
           <aside class="sidebar">
             {% if self.content_nav() -%}
             <nav{% if self.lastupdated() or self.accuratefor() %} class="top"{% endif %}>
@@ -62,6 +62,8 @@
             </nav>
             {%- endif %}
 
+            {% block sidebar %}{% endblock %}
+
           {% if self.lastupdated() or self.accuratefor() -%}
           <div class="lastupdated">
             <!--
@@ -86,7 +88,7 @@
           </aside>
           {%- endif %}
 
-          <article class="content-inner{% if self.content_nav() or self.lastupdated() or self.accuratefor() %} two-col{% endif %}">
+          <article class="content-inner{% if self.content_nav() or self.sidebar() or self.lastupdated() or self.accuratefor() %} two-col{% endif %}">
           {% block content %}{% endblock %}
           </article>
         </main>

From 4c273e17c67d47ddbc478253fe3e558004951e1a Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sat, 30 May 2015 00:29:55 +0000
Subject: [PATCH 11/32] Put papers nav into sidebar

---
 i2p2www/pages/papers/list.html         | 22 ++++------------------
 i2p2www/static/styles/duck/default.css |  9 +++++++++
 i2p2www/static/styles/duck/desktop.css |  7 -------
 3 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/i2p2www/pages/papers/list.html b/i2p2www/pages/papers/list.html
index a273ec6f..bf1a47ba 100644
--- a/i2p2www/pages/papers/list.html
+++ b/i2p2www/pages/papers/list.html
@@ -3,7 +3,7 @@
 {% block headextra %}
 <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/pubs.css') }}" />
 {% endblock %}
-{% block content %}
+{% block content_nav %}
 <div class="biblinks">
 <p align="center">
 {%- if bib.tag|length %}<a href='{% if bib.field != 'date' -%}
@@ -41,14 +41,8 @@
 </p>
 </div>
 
-<!-- Table 1: contains the sidebar and the body. -->
-<table cellspacing="3" cellpadding="0" border="0" align="center" width="100%%">
-<tr valign="top">
-<td>
-
 <!-- Table 2: The sidebar-->
-<table align="right" cellspacing="0" cellpadding="5" width="100"
-     class="sidebar">
+<table align="right" cellspacing="0" cellpadding="5" width="100%">
 <tr valign="top"><td><p class="l1"><strong>{{ bib.sectiontypes }}:</strong><br /></p>
 {% for section in bib.sections %}
 <p class="l2"><a href="#{{ section.slug }}">{{ section.name }}</a></p>
@@ -56,10 +50,9 @@
 </td>
 </tr>
 </table><!-- End of table 2 -->
-</td>
-
-<td width="85%%">
+{% endblock %}
 
+{% block content %}
 <h2>Publications by {{ bib.field }}</h2>
 
 <ul class="sections">
@@ -73,13 +66,6 @@
 {% endfor %}
 </ul>
 
-</td>
-
-<td width="5%%"><br /></td>
-
-</tr>
-</table><!-- End of table 1 -->
-
 <p class="contact">{% trans email="press&#64;i2<!-- -->p2.de"|safe,
 bibtex = get_url('papers_bibtex', tag=bib.tag) if bib.tag else get_url('papers_bibtex'),
 citeseer = 'http://citeseer.ist.psu.edu/online-nature01/' -%}
diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css
index ac66f32d..c10b1025 100644
--- a/i2p2www/static/styles/duck/default.css
+++ b/i2p2www/static/styles/duck/default.css
@@ -418,6 +418,15 @@ div#content .inner ul.DREAD {
     text-align: left !important;
 }
 
+/*
+ * Papers
+ */
+
+.biblinks {
+    border-bottom: 1px solid;
+}
+
+
 /*
  * Footer
  */
diff --git a/i2p2www/static/styles/duck/desktop.css b/i2p2www/static/styles/duck/desktop.css
index ec247c18..9ba9454b 100644
--- a/i2p2www/static/styles/duck/desktop.css
+++ b/i2p2www/static/styles/duck/desktop.css
@@ -300,13 +300,6 @@ div#content .title {
 
 /* End of downloads list CSS */
 
-.biblinks {
-    left: auto;
-    position: absolute;
-    right: 10%;
-    top: 0;
-}
-
 #global-footer .aside {
     width: 15%;
     margin-left: 1%;

From afeacad0d275d8037cc83e95195ba767af7ab160 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sat, 30 May 2015 02:22:45 +0000
Subject: [PATCH 12/32] Only add border-radius to lastupdated in desktop view

---
 i2p2www/static/styles/duck/default.css | 3 +--
 i2p2www/static/styles/duck/desktop.css | 5 +++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css
index c10b1025..8fabb027 100644
--- a/i2p2www/static/styles/duck/default.css
+++ b/i2p2www/static/styles/duck/default.css
@@ -205,10 +205,9 @@ div#content .sidebar nav ul {
 
 div#content .lastupdated {
     background-color: #ffffdd;
-    border-radius: 0 0 0 10px;
     padding: 2px 4px;
     position: relative;
-    text-align: right;
+    text-align: center;
 }
 
 div#content .content-inner {
diff --git a/i2p2www/static/styles/duck/desktop.css b/i2p2www/static/styles/duck/desktop.css
index 9ba9454b..995bf6ee 100644
--- a/i2p2www/static/styles/duck/desktop.css
+++ b/i2p2www/static/styles/duck/desktop.css
@@ -250,6 +250,11 @@ div#content .inner .sidebar {
     width: 250px;
 }
 
+div#content .lastupdated {
+    border-radius: 0 0 0 10px;
+    text-align: right;
+}
+
 div#content .content-inner.two-col {
     margin-left: 252px;
 }

From 7b592736ddbd373f5e3a45e4aebffe4ea4da3c06 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sat, 30 May 2015 03:01:54 +0000
Subject: [PATCH 13/32] Font size overhaul

References:
http://www.smashingmagazine.com/2011/10/07/16-pixels-body-copy-anything-less-costly-mistake/
http://www.smashingmagazine.com/2014/09/29/balancing-line-length-font-size-responsive-web-design/
---
 i2p2www/static/styles/duck/default.css | 16 +++++++---------
 i2p2www/static/styles/duck/desktop.css |  9 ++++-----
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css
index 8fabb027..eea8b7db 100644
--- a/i2p2www/static/styles/duck/default.css
+++ b/i2p2www/static/styles/duck/default.css
@@ -2,7 +2,6 @@
 
 body {
     font-family: Droid Sans, Helvetica, sans-serif;
-    font-size: 10px;
     background-color: #ffffdd;
     min-height: 800px;
     width: 100%;
@@ -26,7 +25,7 @@ div.hide {
 .title {
     font-family: "URW Gothic L", "Century Gothic", sans-serif;
     text-transform: uppercase;
-    font-size: 3.5em;
+    font-size: 2.1875rem;
     font-weight: bold;
     text-shadow: 1px 1px 1px rgba(0,0,0,.2);
     color: #333333;
@@ -36,8 +35,7 @@ div.hide {
 
 div#topbar {
     width: 80%;
-    /*margin: 1em auto;*/
-    margin: 1em auto;
+    margin: 0.625em auto;
     position: relative;
 }
 
@@ -71,7 +69,6 @@ div#content .main {
     position: relative;
     margin: 0 auto;
     text-shadow: 1px 1px 1px rgba(255,255,255,.5);
-    font-size: 1.6em;
     line-height: 1.5em;
     border: 2px solid #abcc71;
     border-left: none;
@@ -107,14 +104,14 @@ div#content .main h1 {
 
 div#content .aside-wrap {
     width: 80%;
-    margin: 2em auto;
+    margin: 1.25em auto;
 }
 
 div#content .aside {
     position: relative;
     display: inline-block;
     vertical-align: top;
-    font-size: 1.2em;
+    font-size: 0.75rem;
 }
 
 div#content .aside a {
@@ -140,7 +137,7 @@ div#content .aside ul {
 div#content .aside ul li {
     list-style-type: none;
     margin: 1em 0;
-    line-height: 1.3em;
+    line-height: 1.5em;
 }
 
 div#content .feed-icon {
@@ -164,7 +161,6 @@ div#content .inner {
     position: relative;
     border-top: 2px solid #abcc71;
     color: black;
-    font-size: 1.2em;
     line-height: 1.4em;
 }
 
@@ -183,6 +179,7 @@ div#content .sidebar {
     border-bottom: 2px solid #abcc71;
     border-left: 2px solid #abcc71;
     border-right: 2px solid #abcc71;
+    font-size: 0.875rem;
 }
 
 div#content .sidebar .top {
@@ -435,6 +432,7 @@ div#content .inner ul.DREAD {
     border-top: 3px solid #883333;
     background: #552222;
     box-shadow: 0px -4px 8px rgba(0,0,0,.3);
+    font-size: 0.75rem;
     padding: 1em 10%;
     background: -moz-linear-gradient(#883333, #772222);
 }
diff --git a/i2p2www/static/styles/duck/desktop.css b/i2p2www/static/styles/duck/desktop.css
index 995bf6ee..21eaa629 100644
--- a/i2p2www/static/styles/duck/desktop.css
+++ b/i2p2www/static/styles/duck/desktop.css
@@ -1,9 +1,9 @@
 body {
-    padding-top: 1em;
+    padding-top: 0.625em;
 }
 
 div#topbar {
-    margin: 1em auto 0;
+    margin: 0.625em auto 0;
 }
 
 div#topbar #logo img:hover {
@@ -78,7 +78,7 @@ menu ul,
     color: #d00e0e;
     display: inline-block;
     font-family: "URW Gothic L", "Century Gothic", sans-serif;
-    font-size: 2em;
+    font-size: 1.25em;
     font-weight: bold;
     text-shadow: 1px 1px 1px rgba(100,20,20,.2);
     line-height: 40px;
@@ -228,7 +228,7 @@ div#content .main {
 div#content .aside {
     width: 30.9%;
     margin-left: 3%;
-    font-size: 1.3em;
+    font-size: 0.875rem;
 }
 
 div#content .aside:first-child {
@@ -241,7 +241,6 @@ div#content .aside:first-child {
 
 div#content .inner {
     padding:0 10%;
-    font-size: 1.3em;
 }
 
 div#content .inner .sidebar {

From fa7cfd9fe45ee9740c59eb10c54792c20453b2aa Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sat, 30 May 2015 03:16:39 +0000
Subject: [PATCH 14/32] Different padding for one- and two-column view

---
 i2p2www/pages/global/layout.html       | 2 +-
 i2p2www/static/styles/duck/desktop.css | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/i2p2www/pages/global/layout.html b/i2p2www/pages/global/layout.html
index 3fa09c7f..5f721a42 100644
--- a/i2p2www/pages/global/layout.html
+++ b/i2p2www/pages/global/layout.html
@@ -53,7 +53,7 @@
           <h1>{{ self.title() }}</h1>
         </div>
 
-        <main role="main" class="inner">
+        <main role="main" class="inner{% if self.content_nav() or self.sidebar() or self.lastupdated() or self.accuratefor() %} two-col{% endif %}">
           {% if self.content_nav() or self.sidebar() or self.lastupdated() or self.accuratefor() -%}
           <aside class="sidebar">
             {% if self.content_nav() -%}
diff --git a/i2p2www/static/styles/duck/desktop.css b/i2p2www/static/styles/duck/desktop.css
index 21eaa629..7901b5ae 100644
--- a/i2p2www/static/styles/duck/desktop.css
+++ b/i2p2www/static/styles/duck/desktop.css
@@ -240,7 +240,11 @@ div#content .aside:first-child {
  */
 
 div#content .inner {
-    padding:0 10%;
+    padding: 0 20%;
+}
+
+div#content .inner.two-col {
+    padding: 0 15% 0 10%;
 }
 
 div#content .inner .sidebar {

From 3cf2235fd6b16e5fb44c4375ed8f74a6128dd1f7 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sat, 30 May 2015 03:35:37 +0000
Subject: [PATCH 15/32] Keep images inside .box, use 1.5em line height

---
 i2p2www/static/styles/duck/default.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css
index eea8b7db..75d7e091 100644
--- a/i2p2www/static/styles/duck/default.css
+++ b/i2p2www/static/styles/duck/default.css
@@ -161,7 +161,7 @@ div#content .inner {
     position: relative;
     border-top: 2px solid #abcc71;
     color: black;
-    line-height: 1.4em;
+    line-height: 1.5em;
 }
 
 div#content .inner:before {
@@ -270,6 +270,11 @@ div#content .inner td.blue {
     color: blue;
 }
 
+div#content .inner .box img {
+    height: auto;
+    max-width: 100%;
+}
+
 /*
  * Download page
  */

From 31bc68f2b8e615c96b9696dd5b7a0ebc2d718b27 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sat, 30 May 2015 03:36:01 +0000
Subject: [PATCH 16/32] Move index of attacks into sidebar

---
 i2p2www/pages/site/docs/how/threat-model.html | 46 ++++++++++---------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/i2p2www/pages/site/docs/how/threat-model.html b/i2p2www/pages/site/docs/how/threat-model.html
index e1e2db5f..c2bed944 100644
--- a/i2p2www/pages/site/docs/how/threat-model.html
+++ b/i2p2www/pages/site/docs/how/threat-model.html
@@ -41,6 +41,30 @@
 </ul>
 {% endmacro %}
 
+{% block content_nav %}
+<h3>{% trans %}Index of Attacks{% endtrans %}</h3>
+<ul>
+<li><a href="#bruteforce">{% trans %}Brute force attacks{% endtrans %}</a></li>
+<li><a href="#timing">{% trans %}Timing attacks{% endtrans %}</a></li>
+<li><a href="#intersection">{% trans %}Intersection attacks{% endtrans %}</a></li>
+<li><a href="#dos">{% trans %}Denial of service attacks{% endtrans %}</a></li>
+<li><a href="#tagging">{% trans %}Tagging attacks{% endtrans %}</a></li>
+<li><a href="#partitioning">{% trans %}Partitioning attacks{% endtrans %}</a></li>
+<li><a href="#predecessor">{% trans %}Predecessor attacks{% endtrans %}</a></li>
+<li><a href="#harvesting">{% trans %}Harvesting attacks{% endtrans %}</a></li>
+<li><a href="#traffic">{% trans %}Identification Through Traffic Analysis{% endtrans %}</a></li>
+<li><a href="#sybil">{% trans %}Sybil attacks{% endtrans %}</a></li>
+<li><a href="#buddy">{% trans %}Buddy Exhaustion attacks{% endtrans %}</a></li>
+<li><a href="#crypto">{% trans %}Cryptographic attacks{% endtrans %}</a></li>
+<li><a href="#floodfill">{% trans %}Floodfill attacks{% endtrans %}</a></li>
+<li><a href="#netdb">{% trans %}Other Network Database attacks{% endtrans %}</a></li>
+<li><a href="#central">{% trans %}Attacks on centralized resources{% endtrans %}</a></li>
+<li><a href="#dev">{% trans %}Development attacks{% endtrans %}</a></li>
+<li><a href="#impl">{% trans %}Implementation attacks{% endtrans %}</a></li>
+<li><a href="#blocklist">{% trans %}Other Defenses{% endtrans %}</a></li>
+</ul>
+{% endblock %}
+
 {% block content %}
 <h2>{% trans %}What do we mean by "anonymous"?{% endtrans %}</h2>
 
@@ -179,28 +203,6 @@ and priority scores are calculated using the equations outlined
 
 #}
 
-<h3 id="index">{% trans %}Index of Attacks{% endtrans %}</h3>
-<ul>
-<li><a href="#bruteforce">{% trans %}Brute force attacks{% endtrans %}</a></li>
-<li><a href="#timing">{% trans %}Timing attacks{% endtrans %}</a></li>
-<li><a href="#intersection">{% trans %}Intersection attacks{% endtrans %}</a></li>
-<li><a href="#dos">{% trans %}Denial of service attacks{% endtrans %}</a></li>
-<li><a href="#tagging">{% trans %}Tagging attacks{% endtrans %}</a></li>
-<li><a href="#partitioning">{% trans %}Partitioning attacks{% endtrans %}</a></li>
-<li><a href="#predecessor">{% trans %}Predecessor attacks{% endtrans %}</a></li>
-<li><a href="#harvesting">{% trans %}Harvesting attacks{% endtrans %}</a></li>
-<li><a href="#traffic">{% trans %}Identification Through Traffic Analysis{% endtrans %}</a></li>
-<li><a href="#sybil">{% trans %}Sybil attacks{% endtrans %}</a></li>
-<li><a href="#buddy">{% trans %}Buddy Exhaustion attacks{% endtrans %}</a></li>
-<li><a href="#crypto">{% trans %}Cryptographic attacks{% endtrans %}</a></li>
-<li><a href="#floodfill">{% trans %}Floodfill attacks{% endtrans %}</a></li>
-<li><a href="#netdb">{% trans %}Other Network Database attacks{% endtrans %}</a></li>
-<li><a href="#central">{% trans %}Attacks on centralized resources{% endtrans %}</a></li>
-<li><a href="#dev">{% trans %}Development attacks{% endtrans %}</a></li>
-<li><a href="#impl">{% trans %}Implementation attacks{% endtrans %}</a></li>
-<li><a href="#blocklist">{% trans %}Other Defenses{% endtrans %}</a></li>
-</ul>
-
 <h3 id="bruteforce">{% trans %}Brute force attacks{% endtrans %}</h3>
 
 {# DREAD_score(2, 1, 1, 1, 3) #}

From 7fbc2dd3303a8ea428f8577b15c724b05ed227b3 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sat, 30 May 2015 04:08:54 +0000
Subject: [PATCH 17/32] Download page CSS

---
 i2p2www/static/styles/duck/default.css | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css
index 75d7e091..23112796 100644
--- a/i2p2www/static/styles/duck/default.css
+++ b/i2p2www/static/styles/duck/default.css
@@ -288,13 +288,17 @@ div#content .inner .box img {
 
 .os {
     color: white;
-    font-size: 1.6em;
     font-weight: bold;
     text-align: center;
     text-decoration: underline;
     text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
 }
 
+.os img {
+    height: auto;
+    max-width: 100%;
+}
+
 .file {
     margin-bottom: 10px
 }
@@ -314,8 +318,8 @@ div#content .inner .box img {
     padding: 10px;
 }
 
-.file .default .name {
-    font-size: 1.6em
+.file .default .mirror {
+    font-size: 0.75em;
 }
 
 .file .mirrors,
@@ -324,6 +328,8 @@ div#content .inner .box img {
     -moz-box-sizing: border-box;
     -webkit-box-sizing: border-box;
     display: inline-block;
+    font-size: 0.75em;
+    line-height: 1em;
     width: 50%;
 }
 
@@ -337,7 +343,8 @@ div#content .inner .box img {
 }
 
 .details .hash:before {
-    content: 'SHA256: '
+    content: 'SHA256: ';
+    font-size: 0.8125em;
 }
 
 .warning {

From b889b7c8615273e2dbd9c2741de5ef32eef2e621 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sat, 30 May 2015 04:22:19 +0000
Subject: [PATCH 18/32] Extracted TOC of tech intro

---
 i2p2www/pages/site/docs/how/tech-intro.html | 38 +++++++++------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/i2p2www/pages/site/docs/how/tech-intro.html b/i2p2www/pages/site/docs/how/tech-intro.html
index 230bfa78..f5eab1c5 100644
--- a/i2p2www/pages/site/docs/how/tech-intro.html
+++ b/i2p2www/pages/site/docs/how/tech-intro.html
@@ -1,26 +1,22 @@
 {% extends "global/layout.html" %}
-{% block title %}{% trans %}Introducing I2P{% endtrans %}{% endblock %}
+{% block title %}{% trans %}I2P: A scalable framework for anonymous communication{% endtrans %}{% endblock %}
+{% block content_nav %}
+<ul>
+  <li><a href="#intro">{% trans %}Introduction{% endtrans %}</a></li>
+  <li>
+    <a href="#op">{% trans %}I2P Operation{% endtrans %}</a>
+    <ul>
+      <li><a href="#op.overview">{% trans %}Overview{% endtrans %}</a></li>
+      <li><a href="#op.tunnels">{% trans %}Tunnels{% endtrans %}</a></li>
+      <li><a href="#op.netdb">{% trans %}Network Database{% endtrans %}</a></li>
+      <li><a href="#op.transport">{% trans %}Transport protocols{% endtrans %}</a></li>
+      <li><a href="#op.crypto">{% trans %}Cryptography{% endtrans %}</a></li>
+    </ul>
+  </li>
+</ul>
+{% endblock %}
+
 {% block content %}
-
-<h1 class="title">{% trans %}I2P: A scalable framework for anonymous communication{% endtrans %}</h1>
-  <div id="toc">
-    <h2>{% trans %}Table of Contents{% endtrans %}</h2>
-      <ul>
-        <li><a href="#intro">{% trans %}Introduction{% endtrans %}</a></li>
-        <li>
-              <a href="#op">{% trans %}I2P Operation{% endtrans %}</a>
-              <ul>
-                <li><a href="#op.overview">{% trans %}Overview{% endtrans %}</a></li>
-                <li><a href="#op.tunnels">{% trans %}Tunnels{% endtrans %}</a></li>
-                <li><a href="#op.netdb">{% trans %}Network Database{% endtrans %}</a></li>
-                <li><a href="#op.transport">{% trans %}Transport protocols{% endtrans %}</a></li>
-                <li><a href="#op.crypto">{% trans %}Cryptography{% endtrans %}</a></li>
-              </ul>
-        </li>
-      </ul>
-  </div> 
-
-  <br/>
   <h1 id="intro">{% trans %}Introduction{% endtrans %}</h1>
   <p>{% trans -%}
 I2P is a scalable, self organizing, resilient packet switched anonymous 

From b0a6ddd870eda3ff552e0d9625a93bff40d6dce5 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sun, 31 May 2015 01:07:41 +0000
Subject: [PATCH 19/32] Consistent content positioning

---
 i2p2www/pages/global/layout.html       |  6 ++++--
 i2p2www/static/styles/duck/default.css | 16 ++++++++--------
 i2p2www/static/styles/duck/desktop.css | 15 ++++++---------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/i2p2www/pages/global/layout.html b/i2p2www/pages/global/layout.html
index 5f721a42..35bac7eb 100644
--- a/i2p2www/pages/global/layout.html
+++ b/i2p2www/pages/global/layout.html
@@ -53,7 +53,8 @@
           <h1>{{ self.title() }}</h1>
         </div>
 
-        <main role="main" class="inner{% if self.content_nav() or self.sidebar() or self.lastupdated() or self.accuratefor() %} two-col{% endif %}">
+        <main role="main" class="inner">
+        <div class="fluid">
           {% if self.content_nav() or self.sidebar() or self.lastupdated() or self.accuratefor() -%}
           <aside class="sidebar">
             {% if self.content_nav() -%}
@@ -88,9 +89,10 @@
           </aside>
           {%- endif %}
 
-          <article class="content-inner{% if self.content_nav() or self.sidebar() or self.lastupdated() or self.accuratefor() %} two-col{% endif %}">
+          <article class="content-inner">
           {% block content %}{% endblock %}
           </article>
+        </div>
         </main>
       {% endblock %}
       </div>
diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css
index 23112796..7c69bfc0 100644
--- a/i2p2www/static/styles/duck/default.css
+++ b/i2p2www/static/styles/duck/default.css
@@ -156,12 +156,11 @@ div#content .feed-icon {
 
 div#content .inner {
     background: rgba(0, 0, 0, 0.05);
-    width: auto;
-    padding: 0 5% 0.1em;
-    position: relative;
     border-top: 2px solid #abcc71;
     color: black;
     line-height: 1.5em;
+    position: relative;
+    width: auto;
 }
 
 div#content .inner:before {
@@ -174,11 +173,15 @@ div#content .inner:before {
     width: 100%;
 }
 
+div#content .inner .fluid {
+    background: white;
+    border-left: 2px solid #abcc71;
+    border-right: 2px solid #abcc71;
+}
+
 div#content .sidebar {
     background: rgba(171, 204, 113, 0.6);
     border-bottom: 2px solid #abcc71;
-    border-left: 2px solid #abcc71;
-    border-right: 2px solid #abcc71;
     font-size: 0.875rem;
 }
 
@@ -208,9 +211,6 @@ div#content .lastupdated {
 }
 
 div#content .content-inner {
-    background: white;
-    border-left: 2px solid #abcc71;
-    border-right: 2px solid #abcc71;
     padding: 1em 2em;
 }
 
diff --git a/i2p2www/static/styles/duck/desktop.css b/i2p2www/static/styles/duck/desktop.css
index 7901b5ae..cee68eaa 100644
--- a/i2p2www/static/styles/duck/desktop.css
+++ b/i2p2www/static/styles/duck/desktop.css
@@ -239,26 +239,23 @@ div#content .aside:first-child {
  * The .inner class is for the content wrapper on inner pages (as opposed to the home page)
  */
 
-div#content .inner {
-    padding: 0 20%;
-}
-
-div#content .inner.two-col {
-    padding: 0 15% 0 10%;
+div#content .inner .fluid {
+    margin: 0 30% 0 0.625rem;
 }
 
 div#content .inner .sidebar {
-    border-radius: 0 0 0 10px;
+    border-radius: 0 0 10px 0;
+    border-right: 2px solid #abcc71;
     float: left;
     width: 250px;
 }
 
 div#content .lastupdated {
-    border-radius: 0 0 0 10px;
+    border-radius: 0 0 10px 0;
     text-align: right;
 }
 
-div#content .content-inner.two-col {
+div#content .content-inner {
     margin-left: 252px;
 }
 

From dfdb1aa7ccb3c292dc60128978a91917f7f104bb Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sun, 31 May 2015 01:24:23 +0000
Subject: [PATCH 20/32] Create meta class for showing metadata in right margin

---
 i2p2www/pages/blog/post.html           |  9 ++++-----
 i2p2www/pages/global/layout.html       | 10 +++++-----
 i2p2www/static/styles/duck/default.css |  9 +++++++--
 i2p2www/static/styles/duck/desktop.css | 10 +++++++---
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/i2p2www/pages/blog/post.html b/i2p2www/pages/blog/post.html
index ce6d9f52..484127a3 100644
--- a/i2p2www/pages/blog/post.html
+++ b/i2p2www/pages/blog/post.html
@@ -1,15 +1,14 @@
 {% extends "global/layout.html" %}
 {%- from "global/macros" import render_categories with context -%}
 {% block title %}{{ title }} - {{ _('Blog') }}{% endblock %}
-{% block sidebar %}
-<ul id="post-info" class="lastupdated">
+{% block content %}
+<div class="meta">
+<ul id="post-info">
   <li class="date">{{ _('Posted:') }} {{ meta.date }}</li>
   <li class="author">{{ _('Author:') }} {{ meta.author }}</li>
   <li class="category">{{ render_categories(meta.category)|safe }}</li>
 </ul>
-{% endblock %}
-
-{% block content %}
+</div>
 {% autoescape false %}
 {{ body }}
 {% endautoescape %}
diff --git a/i2p2www/pages/global/layout.html b/i2p2www/pages/global/layout.html
index 35bac7eb..2e2c3d5c 100644
--- a/i2p2www/pages/global/layout.html
+++ b/i2p2www/pages/global/layout.html
@@ -55,18 +55,20 @@
 
         <main role="main" class="inner">
         <div class="fluid">
-          {% if self.content_nav() or self.sidebar() or self.lastupdated() or self.accuratefor() -%}
+          {% if self.content_nav() or self.sidebar() -%}
           <aside class="sidebar">
             {% if self.content_nav() -%}
-            <nav{% if self.lastupdated() or self.accuratefor() %} class="top"{% endif %}>
+            <nav{% if self.sidebar() %} class="top"{% endif %}>
             {% block content_nav %}{% endblock %}
             </nav>
             {%- endif %}
 
             {% block sidebar %}{% endblock %}
+          </aside>
+          {%- endif %}
 
           {% if self.lastupdated() or self.accuratefor() -%}
-          <div class="lastupdated">
+          <div class="meta lastupdated">
             <!--
             {% block lastupdated %}{% endblock %}
             {% block accuratefor %}{% endblock %}
@@ -86,8 +88,6 @@
             {%- endif %}{% endif %}{% endif %}
           </div>
           {%- endif %}
-          </aside>
-          {%- endif %}
 
           <article class="content-inner">
           {% block content %}{% endblock %}
diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css
index 7c69bfc0..36fdd7d2 100644
--- a/i2p2www/static/styles/duck/default.css
+++ b/i2p2www/static/styles/duck/default.css
@@ -203,13 +203,18 @@ div#content .sidebar nav ul {
     padding-left: 0.5em;
 }
 
-div#content .lastupdated {
+div#content .meta {
     background-color: #ffffdd;
-    padding: 2px 4px;
+    border: 1px dashed;
+    padding: 0.5em 1em;
     position: relative;
     text-align: center;
 }
 
+div#content .lastupdated {
+    margin: 1em 2em;
+}
+
 div#content .content-inner {
     padding: 1em 2em;
 }
diff --git a/i2p2www/static/styles/duck/desktop.css b/i2p2www/static/styles/duck/desktop.css
index cee68eaa..8e27ee25 100644
--- a/i2p2www/static/styles/duck/desktop.css
+++ b/i2p2www/static/styles/duck/desktop.css
@@ -250,9 +250,13 @@ div#content .inner .sidebar {
     width: 250px;
 }
 
-div#content .lastupdated {
-    border-radius: 0 0 10px 0;
-    text-align: right;
+div#content .inner .meta {
+    border: 1px dashed;
+    position: absolute;
+    left: 72%;
+    margin: 1em 0;
+    right: 2%;
+    text-align: left;
 }
 
 div#content .content-inner {

From ccc3598c81b108ea4e48fc2af0e8ef60b43fa879 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sun, 31 May 2015 02:37:44 +0000
Subject: [PATCH 21/32] Add a third size scale, style .meta and .box the same

---
 i2p2www/pages/global/layout.html          |  5 +++--
 i2p2www/static/styles/duck/default.css    | 10 ++++------
 i2p2www/static/styles/duck/desktop.css    | 12 ++----------
 i2p2www/static/styles/duck/widescreen.css | 12 ++++++++++++
 4 files changed, 21 insertions(+), 18 deletions(-)
 create mode 100644 i2p2www/static/styles/duck/widescreen.css

diff --git a/i2p2www/pages/global/layout.html b/i2p2www/pages/global/layout.html
index 2e2c3d5c..0e716466 100644
--- a/i2p2www/pages/global/layout.html
+++ b/i2p2www/pages/global/layout.html
@@ -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]-->
@@ -67,8 +68,9 @@
           </aside>
           {%- endif %}
 
+          <article class="content-inner">
           {% if self.lastupdated() or self.accuratefor() -%}
-          <div class="meta lastupdated">
+          <div class="meta">
             <!--
             {% block lastupdated %}{% endblock %}
             {% block accuratefor %}{% endblock %}
@@ -89,7 +91,6 @@
           </div>
           {%- endif %}
 
-          <article class="content-inner">
           {% block content %}{% endblock %}
           </article>
         </div>
diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css
index 36fdd7d2..d435fe18 100644
--- a/i2p2www/static/styles/duck/default.css
+++ b/i2p2www/static/styles/duck/default.css
@@ -175,8 +175,6 @@ div#content .inner:before {
 
 div#content .inner .fluid {
     background: white;
-    border-left: 2px solid #abcc71;
-    border-right: 2px solid #abcc71;
 }
 
 div#content .sidebar {
@@ -203,16 +201,16 @@ div#content .sidebar nav ul {
     padding-left: 0.5em;
 }
 
-div#content .meta {
+div#content .inner .meta,
+div#content .inner .box {
     background-color: #ffffdd;
     border: 1px dashed;
     padding: 0.5em 1em;
     position: relative;
-    text-align: center;
 }
 
-div#content .lastupdated {
-    margin: 1em 2em;
+div#content .inner .meta {
+    text-align: center;
 }
 
 div#content .content-inner {
diff --git a/i2p2www/static/styles/duck/desktop.css b/i2p2www/static/styles/duck/desktop.css
index 8e27ee25..089ad390 100644
--- a/i2p2www/static/styles/duck/desktop.css
+++ b/i2p2www/static/styles/duck/desktop.css
@@ -240,7 +240,8 @@ div#content .aside:first-child {
  */
 
 div#content .inner .fluid {
-    margin: 0 30% 0 0.625rem;
+    border-left: 2px solid #abcc71;
+    margin-left: 0.625rem;
 }
 
 div#content .inner .sidebar {
@@ -250,15 +251,6 @@ div#content .inner .sidebar {
     width: 250px;
 }
 
-div#content .inner .meta {
-    border: 1px dashed;
-    position: absolute;
-    left: 72%;
-    margin: 1em 0;
-    right: 2%;
-    text-align: left;
-}
-
 div#content .content-inner {
     margin-left: 252px;
 }
diff --git a/i2p2www/static/styles/duck/widescreen.css b/i2p2www/static/styles/duck/widescreen.css
new file mode 100644
index 00000000..b98d1b82
--- /dev/null
+++ b/i2p2www/static/styles/duck/widescreen.css
@@ -0,0 +1,12 @@
+div#content .inner .fluid {
+    border-right: 2px solid #abcc71;
+    margin-right: 30%;
+}
+
+div#content .inner .meta {
+    position: absolute;
+    left: 72%;
+    margin: 1em 0;
+    right: 2%;
+    text-align: left;
+}

From d1e56866ffbc92d437d7efc2aefcda1a80d7b8ba Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sun, 31 May 2015 02:40:51 +0000
Subject: [PATCH 22/32] Mobile style fixes

---
 i2p2www/static/styles/duck/mobile.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/i2p2www/static/styles/duck/mobile.css b/i2p2www/static/styles/duck/mobile.css
index 16032098..f79c9e00 100644
--- a/i2p2www/static/styles/duck/mobile.css
+++ b/i2p2www/static/styles/duck/mobile.css
@@ -121,11 +121,11 @@ div#content .aside {
     width: 100%
 }
 
-div#content .inner {
-    margin-top: 1em
+div#content .title {
+    margin-top: 0.5em
 }
 
-div#content .inner .title {
+div#content .inner {
     margin-top: 1em
 }
 

From bbda270a4a920ea11487559c0178ca07314da8f4 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sun, 31 May 2015 02:54:31 +0000
Subject: [PATCH 23/32] RTL style fixes

---
 i2p2www/pages/global/layout.html              |  1 +
 i2p2www/static/styles/duck/default.rtl.css    | 14 ++++++++++-
 i2p2www/static/styles/duck/desktop.rtl.css    | 24 ++++++++++++++++++-
 i2p2www/static/styles/duck/widescreen.rtl.css | 11 +++++++++
 4 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 i2p2www/static/styles/duck/widescreen.rtl.css

diff --git a/i2p2www/pages/global/layout.html b/i2p2www/pages/global/layout.html
index 0e716466..ac32f318 100644
--- a/i2p2www/pages/global/layout.html
+++ b/i2p2www/pages/global/layout.html
@@ -23,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 %}
diff --git a/i2p2www/static/styles/duck/default.rtl.css b/i2p2www/static/styles/duck/default.rtl.css
index dc80ef1c..d10f5d1b 100644
--- a/i2p2www/static/styles/duck/default.rtl.css
+++ b/i2p2www/static/styles/duck/default.rtl.css
@@ -8,4 +8,16 @@ div#topbar #logo {
 
 div#content .feed-icon {
     float: left
-}
\ No newline at end of file
+}
+
+/** Content **/
+
+div#content .sidebar nav ol {
+    padding-left: 0;
+    padding-right: 1em;
+}
+
+div#content .sidebar nav ul {
+    padding-left: 0;
+    padding-right: 0.5em;
+}
diff --git a/i2p2www/static/styles/duck/desktop.rtl.css b/i2p2www/static/styles/duck/desktop.rtl.css
index 757ede8e..5f78aa73 100644
--- a/i2p2www/static/styles/duck/desktop.rtl.css
+++ b/i2p2www/static/styles/duck/desktop.rtl.css
@@ -57,6 +57,28 @@ div#content .main {
     -o-transform: rotate(5deg);
 }
 
+/** Content **/
+
+div#content .inner .fluid {
+    border-left: none;
+    border-right: 2px solid #abcc71;
+    margin-left: 0;
+    margin-right: 0.625rem;
+}
+
+div#content .inner .sidebar {
+    border-radius: 0 0 0 10px;
+    border-left: 2px solid #abcc71;
+    border-right: none;
+    float: right;
+}
+
+div#content .content-inner {
+    margin-left: 0;
+    margin-right: 252px;
+}
+
+
 /** Downloads list **/
 
 .package .os {
@@ -73,4 +95,4 @@ div#content .main {
 
 .details .hash {
     float: left
-}
\ No newline at end of file
+}
diff --git a/i2p2www/static/styles/duck/widescreen.rtl.css b/i2p2www/static/styles/duck/widescreen.rtl.css
new file mode 100644
index 00000000..d7883d45
--- /dev/null
+++ b/i2p2www/static/styles/duck/widescreen.rtl.css
@@ -0,0 +1,11 @@
+div#content .inner .fluid {
+    border-left: 2px solid #abcc71;
+    margin-left: 30%;
+}
+
+div#content .inner .meta {
+    position: absolute;
+    left: 2%;
+    right: 72%;
+    text-align: right;
+}

From e208d0b83e1117b8b3d346cea91d36880ee89a69 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sun, 31 May 2015 03:02:31 +0000
Subject: [PATCH 24/32] Make {% highlight %} always be ltr

---
 i2p2www/formatters.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i2p2www/formatters.py b/i2p2www/formatters.py
index 8b915b25..fd8006d5 100644
--- a/i2p2www/formatters.py
+++ b/i2p2www/formatters.py
@@ -667,7 +667,7 @@ class I2PHtmlFormatter(Formatter):
         style = '; '.join(style)
 
         yield 0, ('<div' + (self.cssclass and ' class="%s"' % self.cssclass)
-                  + (style and (' style="%s"' % style)) + '>')
+                  + (style and (' style="%s"' % style)) + ' dir=ltr>')
         for tup in inner:
             yield tup
         yield 0, '</div>\n'

From 86479e691a2f83f8ad54b7c1eb5d934b0e91028d Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sun, 31 May 2015 03:05:28 +0000
Subject: [PATCH 25/32] Keep release SHA256 checksums inside blog post content
 area

---
 i2p2www/static/styles/duck/default.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css
index d435fe18..7ed58ece 100644
--- a/i2p2www/static/styles/duck/default.css
+++ b/i2p2www/static/styles/duck/default.css
@@ -429,6 +429,10 @@ div#content .inner ul.DREAD {
     text-align: left !important;
 }
 
+pre.literal-block {
+    overflow: auto;
+}
+
 /*
  * Papers
  */

From 6d05a742deb5ed18d93b637574a82a0063d873c0 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Thu, 18 Jun 2015 05:31:20 +0000
Subject: [PATCH 26/32] Android 0.9.20

---
 i2p2www/pages/downloads/list.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/i2p2www/pages/downloads/list.html b/i2p2www/pages/downloads/list.html
index 5cf13e6a..e420f344 100644
--- a/i2p2www/pages/downloads/list.html
+++ b/i2p2www/pages/downloads/list.html
@@ -4,7 +4,7 @@
 {% set i2pinstall_jar_hash     = 'd16f68fff3a34d161843a09e90fff1ac5eae8ccb319a43257244ec0e764a11c1' %}
 {% set i2psource_hash          = '0addf3ea05c5e5dc297d1af09dda7787a731865418a34b5a88cb770c7314b12f' %}
 {% set i2pupdate_hash          = 'e28e45877033cb6b70070066a93aa3b22b32ec4a5d6df2790083f87a04e5fd85' %}
-{% set i2p_android_hash        = '96cfd0ebf56fc30e746fb77f449697465f0b9c0e047c0129072582453062345c' %}
+{% set i2p_android_hash        = '7524404477d058c93ccaf680b8e4d8df30045dcf6fac8c42e9454306ae6e421d' %}
 {% block content %}
 <h3>{{ _('Dependency') }}</h3>
 <p>{% trans java='http://java.com/download/',
@@ -148,14 +148,14 @@ or type <tt>java -version</tt> at your command prompt.
     <div class="file">
       {% trans %}Outside I2P{% endtrans %}:
       <!-- do not use url_for here -->
-      <a class="default" href="https://download.i2p2.de/android/current/i2p.apk">I2P-0.9.19.1</a>
+      <a class="default" href="https://download.i2p2.de/android/current/i2p.apk">I2P-0.9.20</a>
       <br>
       {% trans %}Inside I2P{% endtrans %}:
       <!-- do not use i2pconv here -->
       <a class="default" href="http://update.killyourtv.i2p/i2p.apk">I2P-0.9.19.1</a>
       <br>
       {% trans %}Our F-Droid repository{% endtrans %}:
-      <a class="default" href="https://f-droid.i2p.io/">I2P-0.9.19.1</a>
+      <a class="default" href="https://f-droid.i2p.io/">I2P-0.9.20</a>
       <br>
       F-Droid:
       <a class="default" href="https://f-droid.org/app/net.i2p.android.router">I2P-0.9.19</a>

From 9baccc15d865d583a82725ce31b92ac3400cb17d Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sat, 27 Jun 2015 03:12:53 +0000
Subject: [PATCH 27/32] Use meta class for redirect notice

---
 i2p2www/pages/downloads/redirect.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i2p2www/pages/downloads/redirect.html b/i2p2www/pages/downloads/redirect.html
index 761d29b2..523225f5 100644
--- a/i2p2www/pages/downloads/redirect.html
+++ b/i2p2www/pages/downloads/redirect.html
@@ -4,7 +4,7 @@
 <meta http-equiv="refresh" content="5;url={{ url }}" />
 {% endblock %}
 {% block content %}
-<div class="file filedownload">
+<div class="meta">
 <p>{% trans -%}
 Your download will begin shortly. If it doesn't start within 5 seconds, click <a href="{{ url }}">here</a>.
 {%- endtrans %}</p>

From 372fb1e9a3b24db988072135d7288fe9903d105c Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Mon, 29 Jun 2015 12:31:16 +0000
Subject: [PATCH 28/32] Fixed CSS misapplication

---
 i2p2www/static/styles/duck/default.css | 2 +-
 i2p2www/static/styles/duck/desktop.css | 2 +-
 i2p2www/static/styles/duck/mobile.css  | 9 +++------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css
index 7ed58ece..2836db85 100644
--- a/i2p2www/static/styles/duck/default.css
+++ b/i2p2www/static/styles/duck/default.css
@@ -22,7 +22,7 @@ div.hide {
     display: none
 }
 
-.title {
+div#content > .title {
     font-family: "URW Gothic L", "Century Gothic", sans-serif;
     text-transform: uppercase;
     font-size: 2.1875rem;
diff --git a/i2p2www/static/styles/duck/desktop.css b/i2p2www/static/styles/duck/desktop.css
index 089ad390..6b3221f8 100644
--- a/i2p2www/static/styles/duck/desktop.css
+++ b/i2p2www/static/styles/duck/desktop.css
@@ -255,7 +255,7 @@ div#content .content-inner {
     margin-left: 252px;
 }
 
-div#content .title {
+div#content > .title {
     display: none
 }
 
diff --git a/i2p2www/static/styles/duck/mobile.css b/i2p2www/static/styles/duck/mobile.css
index f79c9e00..83f12b98 100644
--- a/i2p2www/static/styles/duck/mobile.css
+++ b/i2p2www/static/styles/duck/mobile.css
@@ -1,7 +1,3 @@
-.title {
-    text-align: center;
-}
-
 #topbar .title {
     display: none
 }
@@ -121,8 +117,9 @@ div#content .aside {
     width: 100%
 }
 
-div#content .title {
-    margin-top: 0.5em
+div#content > .title {
+    margin-top: 0.5em;
+    text-align: center;
 }
 
 div#content .inner {

From f67987bbb89417274f87f56cfd63e1dcbfe4d8f9 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Tue, 30 Jun 2015 22:37:25 +0000
Subject: [PATCH 29/32] Bugfix

---
 i2p2www/static/styles/duck/default.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css
index 2836db85..1fd3aad9 100644
--- a/i2p2www/static/styles/duck/default.css
+++ b/i2p2www/static/styles/duck/default.css
@@ -22,7 +22,7 @@ div.hide {
     display: none
 }
 
-div#content > .title {
+div#topbar .title, div#content > .title {
     font-family: "URW Gothic L", "Century Gothic", sans-serif;
     text-transform: uppercase;
     font-size: 2.1875rem;

From fae2031211afb6dd5e655eb2e6fa201de01747fc Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Wed, 15 Jul 2015 23:45:48 +0000
Subject: [PATCH 30/32] Thinner content borders, wider right main margin

---
 i2p2www/static/styles/duck/default.css    | 2 +-
 i2p2www/static/styles/duck/desktop.css    | 5 +++--
 i2p2www/static/styles/duck/widescreen.css | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css
index 1fd3aad9..ad5c1d7d 100644
--- a/i2p2www/static/styles/duck/default.css
+++ b/i2p2www/static/styles/duck/default.css
@@ -179,7 +179,7 @@ div#content .inner .fluid {
 
 div#content .sidebar {
     background: rgba(171, 204, 113, 0.6);
-    border-bottom: 2px solid #abcc71;
+    border-bottom: 1px solid #abcc71;
     font-size: 0.875rem;
 }
 
diff --git a/i2p2www/static/styles/duck/desktop.css b/i2p2www/static/styles/duck/desktop.css
index 6b3221f8..2be278ea 100644
--- a/i2p2www/static/styles/duck/desktop.css
+++ b/i2p2www/static/styles/duck/desktop.css
@@ -240,19 +240,20 @@ div#content .aside:first-child {
  */
 
 div#content .inner .fluid {
-    border-left: 2px solid #abcc71;
+    border-left: 1px solid #abcc71;
     margin-left: 0.625rem;
 }
 
 div#content .inner .sidebar {
     border-radius: 0 0 10px 0;
-    border-right: 2px solid #abcc71;
+    border-right: 1px solid #abcc71;
     float: left;
     width: 250px;
 }
 
 div#content .content-inner {
     margin-left: 252px;
+    padding-right: 4em;
 }
 
 div#content > .title {
diff --git a/i2p2www/static/styles/duck/widescreen.css b/i2p2www/static/styles/duck/widescreen.css
index b98d1b82..725c7fd8 100644
--- a/i2p2www/static/styles/duck/widescreen.css
+++ b/i2p2www/static/styles/duck/widescreen.css
@@ -1,5 +1,5 @@
 div#content .inner .fluid {
-    border-right: 2px solid #abcc71;
+    border-right: 1px solid #abcc71;
     margin-right: 30%;
 }
 

From 56851d3940d3e706648888bad26c225849bc3577 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sun, 19 Jul 2015 10:20:13 +0000
Subject: [PATCH 31/32] Add decoration to sidebar background

---
 design/bg-sidebar.svg                         | 292 ++++++++++++++++++
 i2p2www/static/styles/duck/default.css        |   5 +-
 i2p2www/static/styles/duck/desktop.css        |   2 +
 .../static/styles/duck/images/bg-sidebar.png  | Bin 0 -> 11390 bytes
 4 files changed, 297 insertions(+), 2 deletions(-)
 create mode 100644 design/bg-sidebar.svg
 create mode 100644 i2p2www/static/styles/duck/images/bg-sidebar.png

diff --git a/design/bg-sidebar.svg b/design/bg-sidebar.svg
new file mode 100644
index 00000000..58783e0e
--- /dev/null
+++ b/design/bg-sidebar.svg
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="250"
+   height="460"
+   viewBox="0 0 250 460.00001"
+   id="svg3411"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="bg-sidebar.svg"
+   inkscape:export-filename="bg-sidebar.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs3413" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="59.5"
+     inkscape:cy="228.5"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1366"
+     inkscape:window-height="719"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3416">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-592.36214)">
+    <g
+       id="g4892">
+      <circle
+         style="display:inline;opacity:1;fill:#01ff01;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path2965"
+         cx="221.73021"
+         cy="707.62994"
+         r="9.4642859" />
+      <circle
+         style="display:inline;opacity:1;fill:#01ff01;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path2969"
+         cx="197.54765"
+         cy="753.52283"
+         r="9.4642859" />
+      <circle
+         id="path2961"
+         style="display:inline;opacity:1;fill:#01ff01;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         cx="100.81744"
+         cy="753.52283"
+         r="9.4642859" />
+      <circle
+         id="path2979"
+         style="display:inline;opacity:1;fill:#01ff01;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         cx="197.54765"
+         cy="891.20135"
+         r="9.4642859" />
+      <circle
+         id="path2933"
+         style="display:inline;opacity:1;fill:#01ff01;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         cx="221.73021"
+         cy="615.84424"
+         r="9.4642859" />
+      <circle
+         id="path2941"
+         style="display:inline;opacity:1;fill:#01ff01;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         cx="221.73021"
+         cy="845.30853"
+         r="9.4642859" />
+      <circle
+         style="display:inline;opacity:1;fill:#01ff01;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path2917"
+         cx="173.3651"
+         cy="707.62994"
+         r="9.4642859" />
+      <circle
+         style="display:inline;opacity:1;fill:#01ff01;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path2949"
+         cx="197.54765"
+         cy="661.73712"
+         r="9.4642859" />
+      <circle
+         style="display:inline;opacity:1;fill:#01ff01;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path2953"
+         cx="149.18254"
+         cy="753.52283"
+         r="9.4642859" />
+      <circle
+         id="path2955"
+         style="display:inline;opacity:1;fill:#01ff01;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         cx="173.3651"
+         cy="937.09418"
+         r="9.4642859" />
+      <circle
+         style="display:inline;opacity:1;fill:#01ff01;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path2935"
+         cx="124.99998"
+         cy="937.09418"
+         r="9.4642859" />
+      <circle
+         style="display:inline;opacity:1;fill:#01ff01;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path2959"
+         cx="221.73021"
+         cy="982.98706"
+         r="9.4642859" />
+      <circle
+         style="display:inline;opacity:1;fill:#01ff01;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path2973"
+         cx="197.54765"
+         cy="799.41565"
+         r="9.4642859" />
+      <circle
+         id="path2975"
+         style="display:inline;opacity:1;fill:#01ff01;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         cx="124.99998"
+         cy="1028.88"
+         r="9.4642859" />
+      <circle
+         style="display:inline;opacity:1;fill:#01ff01;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path2977"
+         cx="173.3651"
+         cy="845.30853"
+         r="9.4642859" />
+    </g>
+    <g
+       id="g4841">
+      <circle
+         id="path2863"
+         style="display:inline;opacity:1;fill:#ff0101;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         cx="28.269793"
+         cy="799.41565"
+         r="9.4642859" />
+      <circle
+         style="display:inline;opacity:1;fill:#ff0101;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path2873"
+         cx="100.81744"
+         cy="707.62994"
+         r="9.4642859" />
+      <circle
+         style="display:inline;opacity:1;fill:#ff0101;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path2881"
+         cx="52.452339"
+         cy="753.52283"
+         r="9.4642859" />
+      <circle
+         style="display:inline;opacity:1;fill:#ff0101;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path2865"
+         cx="28.269793"
+         cy="845.30853"
+         r="9.4642859" />
+      <circle
+         style="display:inline;opacity:1;fill:#ff0101;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path2891"
+         cx="76.634888"
+         cy="937.09418"
+         r="9.4642859" />
+      <circle
+         id="path2857"
+         style="display:inline;opacity:1;fill:#ff0101;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         cx="28.269793"
+         cy="615.84424"
+         r="9.4642859" />
+      <circle
+         style="display:inline;opacity:1;fill:#ff0101;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path2877"
+         cx="76.634888"
+         cy="615.84424"
+         r="9.4642859" />
+      <circle
+         style="display:inline;opacity:1;fill:#ff0101;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path2869"
+         cx="52.452339"
+         cy="661.73712"
+         r="9.4642859" />
+      <circle
+         style="display:inline;opacity:1;fill:#ff0101;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path2861"
+         cx="100.81744"
+         cy="982.98706"
+         r="9.4642859" />
+      <circle
+         id="path2875"
+         style="display:inline;opacity:1;fill:#ff0101;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         cx="52.452339"
+         cy="891.20135"
+         r="9.4642859" />
+      <circle
+         id="path2899"
+         style="display:inline;opacity:1;fill:#ff0101;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         cx="28.269793"
+         cy="937.09418"
+         r="9.4642859" />
+      <circle
+         id="path2883"
+         style="display:inline;opacity:1;fill:#ff0101;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         cx="52.452339"
+         cy="1028.88"
+         r="9.4642859" />
+    </g>
+    <g
+       id="g4865">
+      <circle
+         style="display:inline;opacity:1;fill:#ebed02;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path2897"
+         cx="76.634888"
+         cy="799.41565"
+         r="9.4642859" />
+      <circle
+         style="display:inline;opacity:1;fill:#ebed02;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path2943"
+         cx="149.18254"
+         cy="982.98706"
+         r="9.4642859" />
+      <circle
+         id="path2923"
+         style="display:inline;opacity:1;fill:#ebed02;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         cx="100.81744"
+         cy="891.20135"
+         r="9.4642859" />
+      <circle
+         id="path2909"
+         style="display:inline;opacity:1;fill:#ebed02;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         cx="149.18254"
+         cy="615.84424"
+         r="9.4642859" />
+      <circle
+         id="path2901"
+         style="display:inline;opacity:1;fill:#ebed02;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         cx="124.99998"
+         cy="661.73712"
+         r="9.4642859" />
+      <circle
+         style="display:inline;opacity:1;fill:#ebed02;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path2921"
+         cx="124.99998"
+         cy="799.41565"
+         r="9.4642859" />
+      <circle
+         style="display:inline;opacity:1;fill:#ebed02;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path2907"
+         cx="52.452339"
+         cy="982.98706"
+         r="9.4642859" />
+      <circle
+         style="display:inline;opacity:1;fill:#ebed02;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path2925"
+         cx="124.99998"
+         cy="845.30853"
+         r="9.4642859" />
+      <circle
+         style="display:inline;opacity:1;fill:#ebed02;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path2947"
+         cx="52.452339"
+         cy="707.62994"
+         r="9.4642859" />
+      <circle
+         id="path2931"
+         style="display:inline;opacity:1;fill:#ebed02;fill-opacity:0.39215687;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         cx="197.54765"
+         cy="1028.88"
+         r="9.4642859" />
+    </g>
+  </g>
+</svg>
diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css
index ad5c1d7d..6a55963f 100644
--- a/i2p2www/static/styles/duck/default.css
+++ b/i2p2www/static/styles/duck/default.css
@@ -174,11 +174,11 @@ div#content .inner:before {
 }
 
 div#content .inner .fluid {
-    background: white;
+    background-color: white;
 }
 
 div#content .sidebar {
-    background: rgba(171, 204, 113, 0.6);
+    background: white;
     border-bottom: 1px solid #abcc71;
     font-size: 0.875rem;
 }
@@ -188,6 +188,7 @@ div#content .sidebar .top {
 }
 
 div#content .sidebar nav {
+    background: rgba(171, 204, 113, 0.6);
     padding: 1em;
 }
 
diff --git a/i2p2www/static/styles/duck/desktop.css b/i2p2www/static/styles/duck/desktop.css
index 2be278ea..77dab1c4 100644
--- a/i2p2www/static/styles/duck/desktop.css
+++ b/i2p2www/static/styles/duck/desktop.css
@@ -240,6 +240,8 @@ div#content .aside:first-child {
  */
 
 div#content .inner .fluid {
+    background-image: url('images/bg-sidebar.png');
+    background-repeat: repeat-y;
     border-left: 1px solid #abcc71;
     margin-left: 0.625rem;
 }
diff --git a/i2p2www/static/styles/duck/images/bg-sidebar.png b/i2p2www/static/styles/duck/images/bg-sidebar.png
new file mode 100644
index 0000000000000000000000000000000000000000..d241abe5392969dc35dd02217d37a04cecf19587
GIT binary patch
literal 11390
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

literal 0
HcmV?d00001


From 9751af7f903a342d6cfb8e8feb3af399dcff746c Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sun, 19 Jul 2015 10:32:50 +0000
Subject: [PATCH 32/32] Fix .main h1 line-height

---
 i2p2www/static/styles/duck/default.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css
index 6a55963f..0986d2d1 100644
--- a/i2p2www/static/styles/duck/default.css
+++ b/i2p2www/static/styles/duck/default.css
@@ -79,6 +79,7 @@ div#content .main {
 div#content .main h1 {
     font-family: "URW Gothic L", "Century Gothic", sans-serif;
     font-size: 2.5em;
+    line-height: 1em;
     text-shadow: 1px 1px 2px rgba(0,0,0,.3);
     color: white;
     margin-bottom: .5em;