revert previous patch and move sidebar back to its original location
authorDon Armstrong <don@donarmstrong.com>
Tue, 18 Feb 2014 05:26:36 +0000 (21:26 -0800)
committerDon Armstrong <don@donarmstrong.com>
Tue, 18 Feb 2014 05:26:36 +0000 (21:26 -0800)
local.css
templates/page.tmpl

index 3a7e571..ce5b8e5 100644 (file)
--- a/local.css
+++ b/local.css
@@ -226,7 +226,6 @@ div.recentchanges {
 .sidebar {
        width: 20ex;
        float: right;
-    vertical-align: top;
        margin-left: 4px;
        margin-bottom: 4px;
        margin-top: -1px;
index e83c6cf..d042d13 100644 (file)
 
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
+<TMPL_UNLESS DYNAMIC>
+<TMPL_IF SIDEBAR>
+<TMPL_IF HTML5><aside class="sidebar"><TMPL_ELSE><div class="sidebar"></TMPL_IF>
+<TMPL_VAR SIDEBAR>
+<TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
+</TMPL_IF>
+</TMPL_UNLESS>
 
 <div id="pagebody">
 
 
 </div>
 
-<TMPL_UNLESS DYNAMIC>
-<TMPL_IF SIDEBAR>
-<TMPL_IF HTML5><aside class="sidebar"><TMPL_ELSE><div class="sidebar"></TMPL_IF>
-<TMPL_VAR SIDEBAR>
-<TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
-</TMPL_IF>
-</TMPL_UNLESS>
-
 <TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF>
 <TMPL_UNLESS DYNAMIC>
 <TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>