consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4006 from consul/blank_space

Browse Source 
Make the admin menu fill the screen vertically
This commit is contained in:
Javi Martín
2020-09-22 11:12:18 +02:00
committed by GitHub
parent 93cf9e22c3 c362e1190f
commit b1e3c52de0
6 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/admin.scss
View File

@@ -22,6 +22,7 @@ $sidebar-hover: #25597c;
$sidebar-active: #f4fcd0;
.admin {
@include admin-layout;
h2 {
font-weight: 100;

4
app/assets/stylesheets/dashboard.scss
View File

@@ -16,6 +16,10 @@
// 01. Dashboard global
// --------------------
.proposal-dashboard {
@include admin-layout;
}
.proposal-title {
display: inline-block;

17
app/assets/stylesheets/mixins.scss
View File

@@ -3,6 +3,7 @@
// 01. Logo
// 02. Orbit bullets
// 03. Direct uploads
// 04. Admin layout
// ------------------
// 01. Logo
@@ -126,6 +127,22 @@
}
}
// 04. Admin layout
// ----------------
@mixin admin-layout {
display: flex;
flex-direction: column;
> header {
margin-bottom: 0;
}
> .menu-and-content {
flex: 1;
}
}
@mixin has-fa-icon($icon, $style) {
@extend .fa-#{$icon};

2
app/views/layouts/admin.html.erb
View File

@@ -9,7 +9,7 @@
<body class="admin">
<%= render "layouts/admin_header" %>
<div class="menu-and-content no-margin-top">
<div class="menu-and-content">
<%= check_box_tag :show_menu, nil, false, role: "switch" %>
<nav id="side_menu" class="admin-sidebar">

2
app/views/layouts/dashboard.html.erb
View File

@@ -27,7 +27,7 @@
<%= render "layouts/header", with_subnavigation: false %>
<div class="menu-and-content no-margin-top">
<div class="menu-and-content">
<%= check_box_tag :show_menu, nil, false, role: "switch" %>
<nav id="side_menu" class="dashboard-sidebar">

2
app/views/layouts/management.html.erb
View File

@@ -45,7 +45,7 @@
</div>
</header>
<div class="menu-and-content no-margin-top">
<div class="menu-and-content">
<%= check_box_tag :show_menu, nil, false, role: "switch" %>
<nav class="admin-sidebar">