Finished merging duck's and danimoth's template layouts

i2p2www/pages/global/layout.html

@@ -29,8 +29,7 @@
         {% include "global/nav.html" %}
       </nav>
     </header>
-    <div class="container-fluid">
-{%- if g.theme != "danimoth" %}
+    <div class="container-fluid{% if not self.content() %} well{% endif %}">
       <div id="content">
         {% block content_outer %}
         <article class="inner">
@@ -48,18 +47,6 @@
       <footer>
         {% include "global/footer.html" %}
       </footer>
-{%- else %}
-      <div class="content{% if not self.content() %} well{% endif %}">
-        {%- if self.content() %}
-        {{ self.content() }}
-        {%- else %}
-        {{ self.content_outer() }}
-        {%- endif %}
-        <footer class="row">
-          {% include "global/footer.html" %}
-        </footer>
-      </div>
-{%- endif %}
     </div>
   </body>
 </html>

i2p2www/static/styles/danimoth.css

@@ -182,10 +182,11 @@ clear:both;
 .container-fluid {
 position:relative;
 min-width:940px;
-padding-left:20px;
+/*padding-left:20px;
 padding-right:20px;
-padding-top: 13px;
+padding-top: 13px;*/
 zoom:1;
+margin: 13px 20px 20px 260px;
 }
 .container-fluid:before,.container-fluid:after {
 display:table;
@@ -203,9 +204,11 @@ float:left;
 width:220px;
 }
 
+/*
 .container-fluid>.content {
 margin-left:240px;
 }
+*/
 
 a {
 color:#0069d6;