From e0e5f9be37a2a1b3ebdcbef457346dc2237f9c52 Mon Sep 17 00:00:00 2001 From: Zach DeCook Date: Tue, 24 Dec 2019 22:50:13 -0500 Subject: [PATCH 1/2] * Page layout: Fix issue to keep main content and sidebar side-by-side (was affecting some medium-sized screen sizes) --- resources/assets/sass/_app.scss | 12 +----------- resources/views/layouts/app.blade.php | 6 ++++-- resources/views/partials/header.blade.php | 2 +- resources/views/partials/sidebar.blade.php | 4 +--- 4 files changed, 7 insertions(+), 17 deletions(-) diff --git a/resources/assets/sass/_app.scss b/resources/assets/sass/_app.scss index f5a2f4c..a780dd8 100755 --- a/resources/assets/sass/_app.scss +++ b/resources/assets/sass/_app.scss @@ -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); } @@ -102,10 +98,4 @@ th.sortable.sorted-by.desc::after { .col .fluid { min-height: 100vh; } - .sidebar.fixed { - display: block; - } - .header .header-brand { - display: none; - } -} \ No newline at end of file +} diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 1a2db14..0962b11 100755 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -28,10 +28,12 @@
- @include("otter::partials/sidebar") +
+ @include("otter::partials/sidebar") +
-
+
@include("otter::partials/header")
diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php index e5920a4..6fa9a33 100755 --- a/resources/views/partials/header.blade.php +++ b/resources/views/partials/header.blade.php @@ -3,7 +3,7 @@
- tabler logo + tabler logo
diff --git a/resources/views/partials/sidebar.blade.php b/resources/views/partials/sidebar.blade.php index c7500a2..5fe9545 100755 --- a/resources/views/partials/sidebar.blade.php +++ b/resources/views/partials/sidebar.blade.php @@ -1,5 +1,4 @@ @section("sidebar") -
@@ -18,5 +17,4 @@ path-prefix="{{ config('otter.path', 'otter') }}" > -
-@show \ No newline at end of file +@show From fe9379373a34e4a1451f826c8bbbb297d62637e2 Mon Sep 17 00:00:00 2001 From: Zach DeCook Date: Tue, 24 Dec 2019 22:55:40 -0500 Subject: [PATCH 2/2] - Layout: Clean up something --- resources/assets/sass/_app.scss | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/resources/assets/sass/_app.scss b/resources/assets/sass/_app.scss index a780dd8..eca8ce3 100755 --- a/resources/assets/sass/_app.scss +++ b/resources/assets/sass/_app.scss @@ -90,12 +90,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; - } +.fixed { + min-height: 100vh; }