From 91d4624443dda4785235ab0da777f8522c54e164 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Sat, 19 Oct 2019 19:09:38 +0200
Subject: [PATCH] Simplify admin side menu layout

We can move the button to toggle the menu to the main content, and
everything will look the same way while we'll need one div less.
---
 app/assets/stylesheets/admin.scss | 10 +---------
 app/views/layouts/admin.html.erb  | 12 +++++-------
 2 files changed, 6 insertions(+), 16 deletions(-)

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" %>
 
           <div class="side-menu-and-admin-content no-margin-top">
-            <div class="side-menu">
+            <div id="side_menu" class="side-menu hide-for-small-only">
+              <%= side_menu %>
+            </div>
+
+            <div class="admin-content">
               <div class="show-for-small-only">
                 <button type="button" class="button hollow expanded" data-toggle="offCanvas"><%= t("admin.menu.admin") %></button>
               </div>
 
-              <div id="side_menu" class="hide-for-small-only">
-                <%= side_menu %>
-              </div>
-            </div>
-
-            <div class="admin-content">
               <%= render "layouts/flash" %>
               <%= render "layouts/officing_booth" if controller.class.parent == Officing && session[:booth_id].present? %>
               <%= yield %>