about summary refs log tree commit diff
path: root/app/views/layouts
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-09-20 10:52:14 +0200
committerGitHub <noreply@github.com>2019-09-20 10:52:14 +0200
commitb9a8b38844278f26b9d1d1d53256e0781ba3575a (patch)
tree96b2314ca803a3e253785f1afc8f56b5c097bf49 /app/views/layouts
parent37ccafec8fe8bf5588794257744554be61a3f22e (diff)
Fix page body not being scrollable in admin layout (#11893)
Hide navigation behind hamburger icon on small screens in admin layout
Diffstat (limited to 'app/views/layouts')
-rw-r--r--app/views/layouts/admin.html.haml20
1 files changed, 16 insertions, 4 deletions
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index 083f2fac7..57bda45e2 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -4,11 +4,21 @@
 - content_for :content do
   .admin-wrapper
     .sidebar-wrapper
-      .sidebar
-        = link_to root_path do
-          = image_pack_tag 'logo.svg', class: 'logo', alt: 'Mastodon'
+      .sidebar-wrapper__inner
+        .sidebar
+          = link_to root_path do
+            = image_pack_tag 'logo.svg', class: 'logo', alt: 'Mastodon'
+
+          .sidebar__toggle
+            .sidebar__toggle__logo
+              = link_to root_path do
+                = svg_logo_full
+
+            = link_to '#', class: 'sidebar__toggle__icon' do
+              = fa_icon 'bars'
+
+          = render_navigation
 
-        = render_navigation
     .content-wrapper
       .content
         %h2= yield :page_title
@@ -17,4 +27,6 @@
 
         = yield
 
+    .sidebar-wrapper.sidebar-wrapper--empty
+
 = render template: 'layouts/application'