From 2363aa4c7699c3d82b5b98c73c57035f1e60b043 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Fri, 27 Mar 2020 12:59:58 +0100
Subject: [PATCH] Avoid using a mixin for side menu and content styles

---
 app/assets/stylesheets/admin.scss     |  4 ----
 app/assets/stylesheets/dashboard.scss |  4 ----
 app/assets/stylesheets/layout.scss    | 19 +++++++++++++++
 app/assets/stylesheets/mixins.scss    | 33 ++++-----------------------
 app/views/layouts/admin.html.erb      |  2 +-
 app/views/layouts/dashboard.html.erb  |  2 +-
 6 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index b986816e6..d3709a73f 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -291,10 +291,6 @@ $sidebar-active: #f4fcd0;
     margin-right: rem-calc(12);
   }
 
-  .side-menu-and-admin-content {
-    @include side-menu-and-content;
-  }
-
   .admin-content {
     .proposal-form {
       padding-top: 0;
diff --git a/app/assets/stylesheets/dashboard.scss b/app/assets/stylesheets/dashboard.scss
index 7de561c42..cfa1985b4 100644
--- a/app/assets/stylesheets/dashboard.scss
+++ b/app/assets/stylesheets/dashboard.scss
@@ -16,10 +16,6 @@
 // 01. Dashboard global
 // --------------------
 
-.dashboard-menu-and-content {
-  @include side-menu-and-content;
-}
-
 .proposal-title {
   display: inline-block;
 
diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 25c769a2a..1118019f1 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -449,6 +449,25 @@ a {
   margin-top: 0;
 }
 
+.menu-and-content {
+  display: flex;
+
+  > :first-child {
+    flex: 25%;
+    min-width: 250px;
+
+    > :first-child {
+      height: 100%;
+    }
+  }
+
+  > :last-child {
+    flex: 75%;
+    overflow-x: auto;
+    padding: $line-height !important;
+  }
+}
+
 // 02. Header
 // ----------
 
diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss
index 289eb83a6..faef06d3f 100644
--- a/app/assets/stylesheets/mixins.scss
+++ b/app/assets/stylesheets/mixins.scss
@@ -1,9 +1,8 @@
 // Table of Contents
 //
 // 01. Logo
-// 02. Side menu and content
-// 03. Orbit bullets
-// 04. Direct uploads
+// 02. Orbit bullets
+// 03. Direct uploads
 // ------------------
 
 // 01. Logo
@@ -22,30 +21,8 @@
   }
 }
 
-// 02. Side menu and content
-// -------------------------
-
-@mixin side-menu-and-content {
-  display: flex;
-
-  > :first-child {
-    flex: 25%;
-    min-width: 250px;
-
-    > :first-child {
-      height: 100%;
-    }
-  }
-
-  > :last-child {
-    flex: 75%;
-    overflow-x: auto;
-    padding: $line-height !important;
-  }
-}
-
-// 03. Orbit bullet
-// ----------------
+// 02. Orbit bullets
+// -----------------
 
 @mixin orbit-bullets {
   @include disable-mouse-outline;
@@ -72,7 +49,7 @@
   }
 }
 
-// 04. Direct uploads
+// 03. Direct uploads
 // ------------------
 
 @mixin direct-uploads {
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index b73dc8fae..b4d0b39e6 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -19,7 +19,7 @@
         <div class="off-canvas-content" data-off-canvas-content>
           <%= render "layouts/admin_header" %>
 
-          <div class="side-menu-and-admin-content no-margin-top">
+          <div class="menu-and-content no-margin-top">
             <div id="side_menu" class="hide-for-small-only">
               <%= side_menu %>
             </div>
diff --git a/app/views/layouts/dashboard.html.erb b/app/views/layouts/dashboard.html.erb
index 2b20ca089..a52e740e2 100644
--- a/app/views/layouts/dashboard.html.erb
+++ b/app/views/layouts/dashboard.html.erb
@@ -38,7 +38,7 @@
         <div class="off-canvas-content" data-off-canvas-content>
           <%= render "layouts/header", with_subnavigation: false %>
 
-          <div class="dashboard-menu-and-content no-margin-top">
+          <div class="menu-and-content no-margin-top">
             <div id="side_menu" class="hide-for-small-only">
               <div class="dashboard-sidebar">
                 <%= render "dashboard/menu" %>