Merge branch 'master' into newmc

diff --git a/js/80-sidebar.js b/js/80-sidebar.js
index cf729ec652986729945fd8946122cd061d34a418..2ed0aa869a331e718fcd0fc98da0d481ccce7f81 100644 (file)
--- a/js/80-sidebar.js
+++ b/js/80-sidebar.js
@@ -4,7 +4,7 @@
        $( document ).ready(function() {
                if(!$('#sidebar').size()) {
             var content = $('#content');
-            content.wrapInner('<div class="col-md-9">').append('<div id="sidebar" class="col-md-3">').addClass('row');
+            content.wrapInner('<div class="col-md-9">').append('<aside id="sidebar" class="col-md-3">').addClass('row');
         }
        });
 })();

diff --git a/tmpl/skel.en b/tmpl/skel.en
index 05edad80d17488e1214a632d9397d6e8db569201..a207abc408e32635a8d132639d74786f8adad2a4 100644 (file)
--- a/tmpl/skel.en
+++ b/tmpl/skel.en
@@ -31,7 +31,7 @@
 
 <div id="result"></div>
 
-<div id="content">Content goes here</div>
+<main id="content">Content goes here</main>
 
 <div id="webchat"><a href="http://webchat.oftc.net/?channels=%23mindcoding" target="_blank">Webchat</a></div>