Avoid using a mixin for side menu and content styles

This commit is contained in:
decabeza
2020-03-27 12:59:58 +01:00
committed by Javi Martín
parent 4b93437351
commit 2363aa4c76
6 changed files with 26 additions and 38 deletions

View File

@@ -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;

View File

@@ -16,10 +16,6 @@
// 01. Dashboard global
// --------------------
.dashboard-menu-and-content {
@include side-menu-and-content;
}
.proposal-title {
display: inline-block;

View File

@@ -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
// ----------

View File

@@ -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 {

View File

@@ -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>

View File

@@ -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" %>