Merge pull request #1 from sh4nks/master

Merging latest commits from upstream

docs/theming.rst

@@ -150,10 +150,17 @@ Advanced Example
 -----------------
 
 A more advanced example of a theme, is our own default theme called
-**Aurora**. It does not provide an ``layout.html`` because I want to avoid
-code duplication and it is easier to maintain as well. For your own theme,
-please copy the ``layout.html`` from FlaskBB's ``templates/`` folder into your
-themes ``templates/`` folder.
+**Aurora**. We do not have a ``layout.html`` file because we want to avoid code
+duplication and are just falling back to the one that FlaskBB ships with in
+its ``templates/`` folder. In order to use your own stylesheets you have to
+create a ``layout.html`` file. It's probably the easiest to just copy the
+``layout.html`` from FlaskBB's ``templates/`` folder into your themes
+``templates/`` folder.
+
+For example, the `forums <https://forums.flaskbb.org>`_ on FlaskBB are using
+a slightly modified version of the Aurora theme. It is available on GitHub
+here: `Aurora Mod <https://github.com/sh4nks/flaskbb-theme-aurora-mod>`_.
+The modified version just adds a top navigation and uses a different footer.
 
 
 Prerequisites

flaskbb/templates/layout.html

@@ -58,7 +58,7 @@
                 <div class="navbar navbar-default" role="navigation">
                     <!-- Brand and toggle get grouped for better mobile display -->
                     <div class="navbar-header">
-                      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse" aria-expanded="false">
+                      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false">
                         <span class="sr-only">Toggle navigation</span>
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
@@ -66,7 +66,7 @@
                       </button>
                     </div>
 
-                    <div class="collapse navbar-collapse">
+                    <div class="collapse navbar-collapse" id="navbar-collapse">
                         <!-- navbar left -->
                         <ul class="nav navbar-nav forum-nav">
                             {%- from theme("macros.html") import is_active, topnav with context -%}

flaskbb/templates/message/message_layout.html

@@ -9,7 +9,7 @@
 </ol>
 
 <div class="row">
-    <div class="col-sm-2">
+    <div class="col-sm-3 col-md-2">
         <div class="sidebar">
             <ul class="nav sidenav">
                 <div class="sidenav-btn">
@@ -22,7 +22,7 @@
             </ul>
         </div><!--/.sidebar -->
     </div><!--/.col-sm-3 -->
-    <div class="col-sm-10">
+    <div class="col-sm-9 col-md-10">
         {% block message_content %}{% endblock %}
     </div><!--/.col-sm-9 -->
 </div><!--/.row -->