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

Simplify main admin header margin rules

Browse Source 
Instead of having a header with a bottom margin followed by an element
with a negative margin, it makes more sense to have no margin on either
element.
This commit is contained in:
Javi Martín
2020-05-09 00:47:55 +02:00
parent 7880573635
commit c362e1190f
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,6 +134,10 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
> header {
margin-bottom: 0;
}
> .menu-and-content { > .menu-and-content {
flex: 1; flex: 1;
} }

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

@@ -9,7 +9,7 @@
<body class="admin"> <body class="admin">
<%= render "layouts/admin_header" %> <%= 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" %> <%= check_box_tag :show_menu, nil, false, role: "switch" %>
<nav id="side_menu" class="admin-sidebar"> <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 %> <%= 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" %> <%= check_box_tag :show_menu, nil, false, role: "switch" %>
<nav id="side_menu" class="dashboard-sidebar"> <nav id="side_menu" class="dashboard-sidebar">

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

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