Merge branch 'hoellen-fix-sidebar-toggle' into refactor-admin-webpack

5 years ago · 4b620ba5d1
parent 7ec033b79b c147a371d7
commit 4b620ba5d1
3 changed files with 10 additions and 9 deletions
--- a/core/admin/mailu/ui/templates/base.html
+++ b/core/admin/mailu/ui/templates/base.html
@ -10,14 +10,14 @@
  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">
      <header class="main-header">
-        <a href="{{ config["WEB_ADMIN"] }}" class="logo">
-          <span class="logo-lg">{{ config["SITENAME"] }}</span>
-        </a>
-        <a href="#" class="sidebar-toggle"  data-toggle="push-menu" role="button">
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </a>
+        <div class="logo">
+          <a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
+            <span class="sr-only">Toggle navigation</span>
+          </a>
+          <a href="{{ config["WEB_ADMIN"] }}">
+            <span class="logo-lg">{{ config["SITENAME"] }}</span>
+          </a>
+        </div>
      </header>
      <aside class="main-sidebar">
        {% block sidebar %}
--- a/core/admin/mailu/ui/templates/sidebar.html
+++ b/core/admin/mailu/ui/templates/sidebar.html
@ -3,7 +3,7 @@
  <h4 class="text-center text-primary">{{ current_user }}</h4>
  {% endif %}

-  <ul class="sidebar-menu">
+  <ul class="sidebar-menu" data-widget="tree">
    {% if current_user.is_authenticated %}
    <li class="header">{% trans %}My account{% endtrans %}</li>
    <li>
--- a/towncrier/newsfragments/988.feature
+++ b/towncrier/newsfragments/988.feature
@ -0,0 +1 @@
+Add sidebar toggle