Consistent content positioning

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>

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;
 }
 

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;
 }