Merge branch 'nabvar_right_again' into 'dev'

fix: 🚸 Move user menu back to the right side of the screen (Fix #306)

See merge request re2o/re2o!588

templates/base.html

@@ -82,18 +82,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
     <div class="container-fluid text-center content">
         <div class="row content">
-            <div class="col-sm-2 sidenav-left pt4">
+            <div class="col-lg-2 pt4">
-                {% include 'sidebar.html' %}
-
-                {% block sidebar %}
-                {% endblock %}
             </div>
-            <div class="col-sm-offset-2 col-sm-10 col-lg-8 text-left pt4">
+            <div class="col-sm-10 col-lg-8 text-left pt4">
                 {# Display django.contrib.messages as Bootstrap alerts #}
                 {% bootstrap_messages %}
                 {% block content %}{% endblock %}
             </div>
-            <div class="col-lg-2 pt4">
+
+            <div class="col-sm-2 sidenav-right pt4">
+                {% include 'sidebar.html' %}
+
+                {% block sidebar %}
+                {% endblock %}
             </div>
         </div>
     </div>