Started playing with new settings view layout

resources/icons/palette.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12,2C6.49,2,2,6.49,2,12s4.49,10,10,10c1.38,0,2.5-1.12,2.5-2.5c0-0.61-0.23-1.2-0.64-1.67c-0.08-0.1-0.13-0.21-0.13-0.33 c0-0.28,0.22-0.5,0.5-0.5H16c3.31,0,6-2.69,6-6C22,6.04,17.51,2,12,2z M17.5,13c-0.83,0-1.5-0.67-1.5-1.5c0-0.83,0.67-1.5,1.5-1.5 s1.5,0.67,1.5,1.5C19,12.33,18.33,13,17.5,13z M14.5,9C13.67,9,13,8.33,13,7.5C13,6.67,13.67,6,14.5,6S16,6.67,16,7.5 C16,8.33,15.33,9,14.5,9z M5,11.5C5,10.67,5.67,10,6.5,10S8,10.67,8,11.5C8,12.33,7.33,13,6.5,13S5,12.33,5,11.5z M11,7.5 C11,8.33,10.33,9,9.5,9S8,8.33,8,7.5C8,6.67,8.67,6,9.5,6S11,6.67,11,7.5z"/></svg>

resources/sass/_layout.scss

@@ -8,6 +8,9 @@
   margin-inline-end: auto;
   padding-inline-start: $-m;
   padding-inline-end: $-m;
+  &.medium {
+    max-width: 1100px;
+  }
   &.small {
     max-width: 840px;
   }

resources/sass/_lists.scss

@@ -681,7 +681,17 @@ ul.pagination {
   }
   a:hover {
     @include lightDark(background-color, rgba(0, 0, 0, 0.05), rgba(255, 255, 255, 0.05));
-    border-radius: 3px;
+    border-radius: 4px;
     text-decoration: none;
   }
+  &.in-sidebar {
+    a {
+      display: block;
+      margin-bottom: $-xs;
+    }
+    a.active {
+      border-radius: 4px;
+      @include lightDark(background-color, rgba(0, 0, 0, 0.05), rgba(255, 255, 255, 0.05));
+    }
+  }
 }

resources/views/settings/audit.blade.php

@@ -3,11 +3,7 @@
 @section('body')
 <div class="container">
 
-    <div class="grid left-focus v-center no-row-gap">
-        <div class="py-m">
     @include('settings.parts.navbar', ['selected' => 'audit'])
-        </div>
-    </div>
 
     <div class="card content-wrap auto-height">
         <h1 class="list-heading">{{ trans('settings.audit') }}</h1>

resources/views/settings/index.blade.php

@@ -1,10 +1,29 @@
 @extends('layouts.simple')
 
 @section('body')
-    <div class="container small">
+    <div class="container medium">
 
-        @include('settings.parts.navbar-with-version', ['selected' => 'settings'])
+        @include('settings.parts.navbar', ['selected' => 'settings'])
 
+        <div class="grid gap-xxl right-focus">
+
+            <div>
+                <h5>Categories</h5>
+                <div class="active-link-list in-sidebar">
+                    <a href="#" class=" active">@icon('star') Features & Security</a>
+                    <a href="#">@icon('palette') Customization</a>
+                    <a href="#">@icon('lock') Registration</a>
+                </div>
+
+                <h5>Version</h5>
+                <div class="">
+                    <a target="_blank" rel="noopener noreferrer" href="https://github.com/BookStackApp/BookStack/releases">
+                        BookStack @if(strpos($version, 'v') !== 0) version @endif {{ $version }}
+                    </a>
+                </div>
+            </div>
+
+            <div>
                 <div class="card content-wrap auto-height">
                     <h2 id="features" class="list-heading">{{ trans('settings.app_features_security') }}</h2>
                     <form action="{{ url("/settings") }}" method="POST">
@@ -271,6 +290,9 @@
                         </div>
                     </form>
                 </div>
+            </div>
+
+        </div>
 
     </div>
 

resources/views/settings/maintenance.blade.php

@@ -3,7 +3,7 @@
 @section('body')
 <div class="container small">
 
-    @include('settings.parts.navbar-with-version', ['selected' => 'maintenance'])
+    @include('settings.parts.navbar', ['selected' => 'maintenance'])
 
     <div class="card content-wrap auto-height pb-xl">
         <h2 class="list-heading">{{ trans('settings.recycle_bin') }}</h2>

resources/views/settings/parts/navbar-with-version.blade.php

@@ -1,17 +0,0 @@
-{{--
-$selected - String name of the selected tab
-$version - Version of bookstack to display
---}}
-<div class="flex-container-row v-center wrap">
-    <div class="py-m flex fit-content">
-        @include('settings.parts.navbar', ['selected' => $selected])
-    </div>
-</div>
-<div class="px-s">
-    <hr class="darker m-none">
-</div>
-<div class="py-l px-m flex fit-content">
-    <a target="_blank" rel="noopener noreferrer" href="https://github.com/BookStackApp/BookStack/releases">
-        BookStack @if(strpos($version, 'v') !== 0) version @endif {{ $version }}
-    </a>
-</div>

resources/views/settings/parts/navbar.blade.php

@@ -1,5 +1,5 @@
 
-<nav class="active-link-list">
+<nav class="active-link-list py-m flex-container-row justify-center wrap">
     @if(userCan('settings-manage'))
         <a href="{{ url('/settings') }}" @if($selected == 'settings') class="active" @endif>@icon('settings'){{ trans('settings.settings') }}</a>
         <a href="{{ url('/settings/maintenance') }}" @if($selected == 'maintenance') class="active" @endif>@icon('spanner'){{ trans('settings.maint') }}</a>

resources/views/settings/recycle-bin/destroy.blade.php

@@ -3,9 +3,7 @@
 @section('body')
     <div class="container small">
 
-        <div class="py-m">
         @include('settings.parts.navbar', ['selected' => 'maintenance'])
-        </div>
 
         <div class="card content-wrap auto-height">
             <h2 class="list-heading">{{ trans('settings.recycle_bin_permanently_delete') }}</h2>

resources/views/settings/recycle-bin/index.blade.php

@@ -3,9 +3,7 @@
 @section('body')
     <div class="container">
 
-        <div class="py-m">
         @include('settings.parts.navbar', ['selected' => 'maintenance'])
-        </div>
 
         <div class="card content-wrap auto-height">
             <h2 class="list-heading">{{ trans('settings.recycle_bin') }}</h2>

resources/views/settings/recycle-bin/restore.blade.php

@@ -3,9 +3,7 @@
 @section('body')
     <div class="container small">
 
-        <div class="py-m">
         @include('settings.parts.navbar', ['selected' => 'maintenance'])
-        </div>
 
         <div class="card content-wrap auto-height">
             <h2 class="list-heading">{{ trans('settings.recycle_bin_restore') }}</h2>

resources/views/settings/roles/create.blade.php

@@ -4,9 +4,7 @@
 
     <div class="container small">
 
-        <div class="py-m">
         @include('settings.parts.navbar', ['selected' => 'roles'])
-        </div>
 
         <div class="card content-wrap">
             <h1 class="list-heading">{{ trans('settings.role_create') }}</h1>

resources/views/settings/roles/delete.blade.php

@@ -3,9 +3,7 @@
 @section('body')
     <div class="container small">
 
-        <div class="py-m">
         @include('settings.parts.navbar', ['selected' => 'roles'])
-        </div>
 
         <div class="card content-wrap auto-height">
             <h1 class="list-heading"> {{ trans('settings.role_delete') }}</h1>

resources/views/settings/roles/edit.blade.php

@@ -3,9 +3,7 @@
 @section('body')
 
     <div class="container small">
-        <div class="py-m">
         @include('settings.parts.navbar', ['selected' => 'roles'])
-        </div>
 
         <div class="card content-wrap">
             <h1 class="list-heading">{{ trans('settings.role_edit') }}</h1>

resources/views/settings/roles/index.blade.php

@@ -4,9 +4,7 @@
 
     <div class="container small">
 
-        <div class="py-m">
         @include('settings.parts.navbar', ['selected' => 'roles'])
-        </div>
 
         <div class="card content-wrap auto-height">
 

resources/views/settings/webhooks/create.blade.php

@@ -4,9 +4,7 @@
 
     <div class="container small">
 
-        <div class="py-m">
         @include('settings.parts.navbar', ['selected' => 'webhooks'])
-        </div>
 
         <div class="card content-wrap auto-height">
             <h1 class="list-heading">{{ trans('settings.webhooks_create') }}</h1>

resources/views/settings/webhooks/delete.blade.php

@@ -3,9 +3,7 @@
 @section('body')
     <div class="container small">
 
-        <div class="py-m">
         @include('settings.parts.navbar', ['selected' => 'webhooks'])
-        </div>
 
         <div class="card content-wrap auto-height">
             <h1 class="list-heading"> {{ trans('settings.webhooks_delete') }}</h1>

resources/views/settings/webhooks/edit.blade.php

@@ -3,9 +3,7 @@
 @section('body')
 
     <div class="container small">
-        <div class="py-m">
         @include('settings.parts.navbar', ['selected' => 'webhooks'])
-        </div>
 
         <div class="card content-wrap auto-height">
             <h1 class="list-heading">{{ trans('settings.webhooks_edit') }}</h1>

resources/views/settings/webhooks/index.blade.php

@@ -4,9 +4,7 @@
 
     <div class="container small">
 
-        <div class="py-m">
         @include('settings.parts.navbar', ['selected' => 'webhooks'])
-        </div>
 
         <div class="card content-wrap auto-height">
 

resources/views/users/create.blade.php

@@ -4,9 +4,7 @@
 
     <div class="container small">
 
-        <div class="py-m">
         @include('settings.parts.navbar', ['selected' => 'users'])
-        </div>
 
         <main class="card content-wrap">
             <h1 class="list-heading">{{ trans('settings.users_add_new') }}</h1>

resources/views/users/delete.blade.php

@@ -3,9 +3,7 @@
 @section('body')
     <div class="container small">
 
-        <div class="py-m">
         @include('settings.parts.navbar', ['selected' => 'users'])
-        </div>
 
         <div class="card content-wrap auto-height">
             <h1 class="list-heading">{{ trans('settings.users_delete') }}</h1>

resources/views/users/edit.blade.php

@@ -3,9 +3,7 @@
 @section('body')
     <div class="container small">
 
-        <div class="py-m">
         @include('settings.parts.navbar', ['selected' => 'users'])
-        </div>
 
         <section class="card content-wrap">
             <h1 class="list-heading">{{ $user->id === user()->id ? trans('settings.users_edit_profile') : trans('settings.users_edit') }}</h1>

resources/views/users/index.blade.php

@@ -3,9 +3,7 @@
 @section('body')
     <div class="container small">
 
-        <div class="py-m">
         @include('settings.parts.navbar', ['selected' => 'users'])
-        </div>
 
         <main class="card content-wrap">
 

resources/views/users/profile.blade.php

@@ -2,7 +2,7 @@
 
 @section('body')
 
-    <div class="container pt-xl">
+    <div class="container medium pt-xl">
 
         <div class="grid right-focus reverse-collapse">