Skip to content

* Page layout: Fix issue to keep main content and sidebar side-by-side #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
earboxer wants to merge 3 commits into from
Closed

* Page layout: Fix issue to keep main content and sidebar side-by-side #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0e5f9b
* Page layout: Fix issue to keep main content and sidebar side-by-side
earboxer Dec 25, 2019
fe93793
- Layout: Clean up something
earboxer Dec 25, 2019
b3cd02f
Merge remote-tracking branch 'origin/develop' into fixbootstraplayout
earboxer Jan 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 3 additions & 19 deletions resources/assets/sass/_app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
background-color: #ffffff;
}

.sidebar.fixed {
display: none;
}

.sidebar .nav-tabs .nav-link {
border-bottom: 1px solid rgba(0, 40, 100, 0.12);
}
Expand Down Expand Up @@ -98,18 +94,6 @@ th.sortable.sorted-by.desc::after {
flex:1;
}

@media (min-width: 992px) {
.fixed {
flex: 0 0 200px;
min-height: 100vh;
}
.col .fluid {
min-height: 100vh;
}
.sidebar.fixed {
display: block;
}
.header .header-brand {
display: none;
}
}
.fixed {
min-height: 100vh;
}
6 changes: 4 additions & 2 deletions resources/views/layouts/app.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,12 @@
<body class="">
<div class="page container-fluid">
<div id="app" class="page-main row h-100">
@include("otter::partials/sidebar")
<div class="col-md-2 d-none d-md-block sidebar fixed">
@include("otter::partials/sidebar")
</div>

<!-- center content -->
<div class="col fluid d-flex flex-column px-0">
<div class="col-md-10">
@include("otter::partials/header")
<!-- main content -->
<div class="flex-grow">
Expand Down
2 changes: 1 addition & 1 deletion resources/views/partials/header.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="container">
<div class="d-flex">
<a class="header-brand" href="/{{ config('otter.path', 'otter') }}">
<img src="{{ asset('vendor/otter/assets/img/logo.svg') }}" class="header-brand-img" alt="tabler logo">
<img src="{{ asset('vendor/otter/assets/img/logo.svg') }}" class="header-brand-img d-md-none" alt="tabler logo">
</a>
<div class="d-flex order-lg-2 ml-auto">
<div class="dropdown">
Expand Down
4 changes: 1 addition & 3 deletions resources/views/partials/sidebar.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@section("sidebar")
<div class="col-md-2 px-0 sidebar fixed">
<div class="header py-4">
<div class="container">
<div class="d-flex">
Expand All @@ -18,5 +17,4 @@
path-prefix="{{ config('otter.path', 'otter') }}"
></sidebar-component>
</ul>
</div>
@show
@show