diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index c7e7f1fdf..a5689d700 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -293,22 +293,14 @@ $sidebar-active: #f4fcd0; .side-menu-and-admin-content { display: flex; - - @include breakpoint(small only) { - flex-direction: column; - } } .side-menu { flex: 25%; min-width: 250px; - > :last-child { + .admin-sidebar { height: 100%; - - .admin-sidebar { - height: 100%; - } } } diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index 71c0125d7..82df3db8d 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb @@ -20,17 +20,15 @@ <%= render "layouts/admin_header" %>
-
+
+ <%= side_menu %> +
+ +
-
- <%= side_menu %> -
-
- -
<%= render "layouts/flash" %> <%= render "layouts/officing_booth" if controller.class.parent == Officing && session[:booth_id].present? %> <%= yield %>